Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2289)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java

Issue 1837963003: Remove document mode opt-out promo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java
index 80b9d30cce0a628b40d7a6c350a19cb15ac398a2..ccff3a48f23d3a89b8b4241fb62d3bbcf63c2cd9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java
@@ -6,14 +6,11 @@ package org.chromium.chrome.browser.preferences;
import android.content.Context;
import android.content.SharedPreferences;
-import android.os.Build;
import android.preference.PreferenceManager;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
-import java.util.Locale;
-
/**
* Tracks opt out status for document mode
*/
@@ -27,141 +24,6 @@ public class DocumentModeManager {
public static final String OPT_OUT_SHOWN_COUNT = "opt_out_shown_count";
public static final String OPT_OUT_CLEAN_UP_PENDING = "opt_out_clean_up_pending";
- // Taken from https://support.google.com/googleplay/answer/1727131?hl=en-GB
- private static final String[] DEFAULT_TABBED_MODE_DEVICES = {
- "GT-I9505G", // Galaxy S4 Google Play Edition
- "SC-04E", // Galaxy S4
- "GT-I9500", // Galaxy S4
- "SCH-I959", // Galaxy S4
- "SHV-E300K", // Galaxy S4
- "SHV-E300L", // Galaxy S4
- "SHV-E300S", // Galaxy S4
- "GT-I9505", // Galaxy S4
- "GT-I9508", // Galaxy S4
- "GT-I9508C", // Galaxy S4
- "GT-I9508V", // Galaxy S4
- "SAMSUNG-SGH-I337Z", // Galaxy S4
- "SAMSUNG-SGH-I337", // Galaxy S4
- "SGH-I337M", // Galaxy S4
- "SGH-M919V", // Galaxy S4
- "SGH-M919N", // Galaxy S4
- "SCH-R970C", // Galaxy S4
- "SCH-R970X", // Galaxy S4
- "SCH-I545L", // Galaxy S4
- "SCH-I545PP", // Galaxy S4
- "SPH-L720T", // Galaxy S4
- "SPH-L720", // Galaxy S4
- "SM-S975L", // Galaxy S4
- "SGH-S970G", // Galaxy S4
- "SGH-M919", // Galaxy S4
- "SCH-R970", // Galaxy S4
- "SCH-I545", // Galaxy S4
- "GT-I9507", // Galaxy S4
- "GT-I9507V", // Galaxy S4
- "GT-I9515", // Galaxy S4
- "GT-I9515L", // Galaxy S4
- "GT-I9505X", // Galaxy S4
- "GT-I9506", // Galaxy S4
- "SHV-E330K", // Galaxy S4
- "SHV-E330L", // Galaxy S4
- "GT-I9295", // Galaxy S4 Active
- "SAMSUNG-SGH-I537", // Galaxy S4 Active
- "SGH-I537", // Galaxy S4 Active
- "SHV-E470S", // Galaxy S4 Active
- "GT-I9502", // Galaxy S4 Duos
- "SHV-E330S", // Galaxy S4 LTE-A
- "GT-I9190", // Galaxy S4 Mini
- "GT-I9192", // Galaxy S4 Mini
- "GT-I9195", // Galaxy S4 Mini
- "GT-I9195L", // Galaxy S4 Mini
- "GT-I9195T", // Galaxy S4 Mini
- "GT-I9195X", // Galaxy S4 Mini
- "GT-I9197", // Galaxy S4 Mini
- "SGH-I257M", // Galaxy S4 Mini
- "SHV-E370K", // Galaxy S4 Mini
- "SHV-E370D", // Galaxy S4 Mini
- "SCH-I435L", // Galaxy S4 Mini
- "SPH-L520", // Galaxy S4 Mini
- "SCH-R890", // Galaxy S4 Mini
- "SCH-I435", // Galaxy S4 Mini
- "GT-I9192I", // Galaxy S4 Mini
- "GT-I9195I", // Galaxy S4 Mini
- "SAMSUNG-SGH-I257", // Galaxy S4 Mini
- "SM-C101", // Galaxy S4 Zoom
- "SAMSUNG-SM-C105A", // Galaxy S4 Zoom
- "SM-C105L", // Galaxy S4 Zoom
- "SM-C105S", // Galaxy S4 Zoom
- "SM-C105K", // Galaxy S4 Zoom
- "SM-C105", // Galaxy S4 Zoom
- "SC-02E", // Galaxy Note2
- "GT-N7100", // Galaxy Note2
- "GT-N7100T", // Galaxy Note2
- "GT-N7102", // Galaxy Note2
- "GT-N7108", // Galaxy Note2
- "SCH-N719", // Galaxy Note2
- "GT-N7102", // Galaxy Note2
- "GT-N7102I", // Galaxy Note2
- "GT-N7105", // Galaxy Note2
- "GT-N7105T", // Galaxy Note2
- "SAMSUNG-SGH-I317", // Galaxy Note2
- "SGH-I317M", // Galaxy Note2
- "SGH-T889V", // Galaxy Note2
- "GT-N7108D", // Galaxy Note2
- "SC-02E", // Galaxy Note2
- "SHV-E250K", // Galaxy Note2
- "SHV-E250L", // Galaxy Note2
- "SHV-E250S", // Galaxy Note2
- "SPH-L900", // Galaxy Note2
- "SGH-T889", // Galaxy Note2
- "SCH-R950", // Galaxy Note2
- "SCH-I605", // Galaxy Note2
- "SAMSUNG-SGH-I317", // Galaxy Note2
- "SC-02F", // Galaxy Note3
- "SCL22", // Galaxy Note3
- "SM-N900", // Galaxy Note3
- "SM-N9000Q", // Galaxy Note3
- "SM-N9005", // Galaxy Note3
- "SM-N9006", // Galaxy Note3
- "SM-N9007", // Galaxy Note3
- "SM-N9008V", // Galaxy Note3
- "SM-N9009", // Galaxy Note3
- "SM-N900U", // Galaxy Note3
- "SAMSUNG-SM-N900A", // Galaxy Note3
- "SM-N900W8", // Galaxy Note3
- "SM-N900K", // Galaxy Note3
- "SM-N900L", // Galaxy Note3
- "SM-N900S", // Galaxy Note3
- "SM-N900P", // Galaxy Note3
- "SM-N900T", // Galaxy Note3
- "SM-N900R4", // Galaxy Note3
- "SM-N900V", // Galaxy Note3
- "SM-N9007", // Galaxy Note3
- "SM-N9002", // Galaxy Note3 Duos
- "SM-N9008", // Galaxy Note3 Duos
- "SM-N750K", // Galaxy Note3 Neo
- "SM-N750L", // Galaxy Note3 Neo
- "SM-N750S", // Galaxy Note3 Neo
- "SM-N750", // Galaxy Note3 Neo
- "SM-N7500Q", // Galaxy Note3 Neo
- "SM-N7502", // Galaxy Note3 Neo
- "SM-N7505", // Galaxy Note3 Neo
- "SM-N7505L", // Galaxy Note3 Neo
- "SM-N7507", // Galaxy Note3 Neo
- "HTC ONE DUAL SIM", // HTC ONE
- "HTC 801E", // HTC One
- "HTC ONE", // HTC One
- "HTC ONE 801E", // HTC One
- "HTC_PN071", // HTC One
- "HTC 802T", // HTC One
- "HTC 802T 16GB", // HTC One
- "HTC 802W", // HTC One
- "HTC 802D", // HTC One
- "HTC ONE DUAL 802D", // HTC One
- "HTCONE", // HTC One
- "HTC ONE 801E", // HTC One 801e
- "HTC ONE 801S", // HTC One 801e
- };
-
private static DocumentModeManager sManager;
private final SharedPreferences mSharedPreferences;
@@ -191,13 +53,6 @@ public class DocumentModeManager {
}
/**
- * @return Whether the user dismissed the opt out promo.
- */
- public boolean isOptOutPromoDismissed() {
- return getOptOutState() == OPT_OUT_PROMO_DISMISSED;
- }
-
- /**
* Sets the opt out preference.
* @param state One of OPTED_OUT_OF_DOCUMENT_MODE or OPT_OUT_PROMO_DISMISSED.
*/
@@ -208,23 +63,6 @@ public class DocumentModeManager {
}
/**
- * Increments a preference that keeps track of how many times the opt out message has been
- * shown on home screen.
- */
- public void incrementOptOutShownCount() {
- SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
- sharedPreferencesEditor.putLong(OPT_OUT_SHOWN_COUNT, getOptOutShownCount() + 1);
- sharedPreferencesEditor.apply();
- }
-
- /**
- * @return The number of times the opt out message has been shown so far.
- */
- public long getOptOutShownCount() {
- return mSharedPreferences.getLong(OPT_OUT_SHOWN_COUNT, 0);
- }
-
- /**
* @return Whether we need to clean up old document activity tasks from Recents.
*/
public boolean isOptOutCleanUpPending() {
@@ -242,19 +80,6 @@ public class DocumentModeManager {
sharedPreferencesEditor.apply();
}
- /**
- * @return Whether Chrome should default to Tabbed mode despite Document mode being supported
- * at the platform level. A device will default to Tabbed mode if accessing the
- * platform Overview screen is deemed too difficult to make Document mode user friendly.
- */
- public static boolean isDeviceTabbedModeByDefault() {
- String model = Build.MODEL.toUpperCase(Locale.US);
- for (String device : DEFAULT_TABBED_MODE_DEVICES) {
- if (model.equals(device)) return true;
- }
- return false;
- }
-
private int getOptOutState() {
int optOutState = mSharedPreferences.getInt(OPT_OUT_STATE, OPT_OUT_STATE_UNSET);
if (optOutState == OPT_OUT_STATE_UNSET) {
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698