From c75aea1552d6584289746e0b284a1fa60ba701d4 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Wed, 11 Dec 2019 15:34:47 +0800
Subject: [PATCH] Change tab text to sentense text

- Also remove duplicated string

Bug: 141601408
Test: manual
Change-Id: I840bdf4c12ca6d815d7c54092aa32a40c80d95e0
---
 res/layout/preference_list_fragment.xml                  | 1 +
 res/values/strings.xml                                   | 9 ---------
 res/values/styles.xml                                    | 4 ++++
 .../manageapplications/AppFilterRegistry.java            | 4 ++--
 ...EnterpriseSetDefaultAppsListPreferenceController.java | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 27c67fdbf5c..edf9a7c8fbe 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -71,6 +71,7 @@
             app:tabMode="fixed"
             app:tabIndicatorColor="@*android:color/accent_device_default"
             app:tabSelectedTextColor="@*android:color/accent_device_default"
+            app:tabTextAppearance="@style/TextAppearance.Tab"
             app:tabTextColor="?android:attr/textColorSecondary"/>
         <View
             android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bb180df31f2..89d2bd18a41 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6016,11 +6016,6 @@
 
     <!-- Message when there are no available device admin apps to display -->
     <string name="no_device_admins">No device admin apps available</string>
-    <!-- Title for personal device admin apps on the list [CHAR_LIMIT=25] -->
-    <string name="personal_device_admin_title">Personal</string>
-    <!-- Title for managed device admin apps on the list [CHAR_LIMIT=25] -->
-    <string name="managed_device_admin_title">Work</string>
-
 
     <!-- Message when there are no available trust agents to display -->
     <string name="no_trust_agents">No available trust agents</string>
@@ -8864,10 +8859,6 @@
     <string name="filter_enabled_apps">Installed apps</string>
     <!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
     <string name="filter_instant_apps">Instant apps</string>
-    <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
-    <string name="filter_personal_apps">Personal</string>
-    <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
-    <string name="filter_work_apps">Work</string>
 
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_all_apps">Apps: All</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 68fa764fa96..4cbf2c3ba71 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -572,6 +572,10 @@
         <item name="android:showDividers">middle</item>
     </style>
 
+    <style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
+        <item name="android:textAllCaps">false</item>
+    </style>
+
     <style name="AccessibilityDialogServiceIcon">
         <item name="android:layout_width">36dp</item>
         <item name="android:layout_height">36dp</item>
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 0d2bcab3129..250dce07f31 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -136,13 +136,13 @@ public class AppFilterRegistry {
         mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
                 ApplicationsState.FILTER_PERSONAL,
                 FILTER_APPS_PERSONAL,
-                R.string.filter_personal_apps);
+                R.string.category_personal);
 
         // Work
         mFilters[FILTER_APPS_WORK] = new AppFilterItem(
                 ApplicationsState.FILTER_WORK,
                 FILTER_APPS_WORK,
-                R.string.filter_work_apps);
+                R.string.category_work);
 
         // Usage access screen, never displayed.
         mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index e3136f4a5c1..c878058a649 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -128,9 +128,9 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
                 final PreferenceCategory category = new PreferenceCategory(prefContext);
                 screen.addPreference(category);
                 if (userInfo.isManagedProfile()) {
-                    category.setTitle(R.string.managed_device_admin_title);
+                    category.setTitle(R.string.category_work);
                 } else {
-                    category.setTitle(R.string.personal_device_admin_title);
+                    category.setTitle(R.string.category_personal);
                 }
                 category.setOrder(i);
                 createPreferences(prefContext, category, mApps.get(i));