Change CBD layout and texts

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
index 6ed9382e322693e94d5af96189fd69a0b1575596..ceff83e0131f6bdbcfebad9969245240b9447639 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.preferences.privacy;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.browsing_data.TimePeriod;
 
 /**
  * The base class for a clear browsing data tab.
@@ -39,6 +41,25 @@ public class ClearBrowsingDataPreferencesTab extends ClearBrowsingDataPreference
     }
 
     @Override
+    protected TimePeriodSpinnerOption[] getTimePeriodSpinnerOptions() {
+        Activity activity = getActivity();
+
+        TimePeriodSpinnerOption[] options = new TimePeriodSpinnerOption[] {
+                new TimePeriodSpinnerOption(TimePeriod.LAST_HOUR,
+                        activity.getString(R.string.clear_browsing_data_tab_period_hour)),
+                new TimePeriodSpinnerOption(TimePeriod.LAST_DAY,
+                        activity.getString(R.string.clear_browsing_data_tab_period_24_hours)),
+                new TimePeriodSpinnerOption(TimePeriod.LAST_WEEK,
+                        activity.getString(R.string.clear_browsing_data_tab_period_7_days)),
+                new TimePeriodSpinnerOption(TimePeriod.FOUR_WEEKS,
+                        activity.getString(R.string.clear_browsing_data_tab_period_four_weeks)),
+                new TimePeriodSpinnerOption(TimePeriod.ALL_TIME,
+                        activity.getString(R.string.clear_browsing_data_tab_period_everything))};

[Theresa, 2017/03/24 17:15:37]

Can you please ask UX if we can just replace these strings in the existing UI
rather than creating a fork in the code here?

[dullweber, 2017/03/27 14:11:04]

I think that doesn't work because the old ui starts with "Clear data from the"
and then the sentence is completed by an option like "past week" or "beginning
of time". The new text for everything is "All time". The reason to change this
is that in many languages this sentence structure and word order doesn't work.
The German text for example has to use a somewhat weird construction. 
Also the new texts are upper case while the old ones begin with a lower case
because they complete a sentence.

[Theresa, 2017/03/27 15:24:52]

Acknowledged.

+
+        return options;
+    }
+
+    @Override
     protected void initClearButtonPreference() {
         // This view has a Button instead of a ButtonPreference. The Button can only be initialized
         // while or after onCreateView was called.