PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change tab text to sentense text

Browse Source 
- Also remove duplicated string

Bug: 141601408
Test: manual
Change-Id: I840bdf4c12ca6d815d7c54092aa32a40c80d95e0
This commit is contained in:
Raff Tsai
2019-12-11 15:34:47 +08:00
parent 1e00dbf41c
commit c75aea1552
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/preference_list_fragment.xml
View File

@@ -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"

9
res/values/strings.xml
View File

@@ -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>

4
res/values/styles.xml
View File

@@ -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>

4
src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
View File

@@ -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(

4
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -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));