commit 4a01283309f737395a01f0fae68a369dc537a8da
author Doris Ling <dling@google.com> Mon Nov 13 17:58:13 2017 -0800
committer Doris Ling <dling@google.com> Mon Nov 13 17:58:13 2017 -0800
tree c441030bfcfe6e4357e2e493bea67a3104b2a200
parent bbdc72c95a5f21ccd367d1640960bf14a5bef61e

Remove the feature flag for using new title.

- remove all code that check for the feature flag, and use the new logic
by default.

Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6
Fixes: 64564191
Test: make RunSettingsRoboTests

src/com/android/settings/MasterClear.java

diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 96cc390..7a6f966 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -95,9 +95,7 @@
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (usePreferenceScreenTitle()) {
-            getActivity().setTitle(R.string.master_clear_title);
-        }
+        getActivity().setTitle(R.string.master_clear_title);
     }
 
     /**