Change tab text to sentense text
- Also remove duplicated string Bug: 141601408 Test: manual Change-Id: I840bdf4c12ca6d815d7c54092aa32a40c80d95e0
This commit is contained in:
@@ -71,6 +71,7 @@
|
|||||||
app:tabMode="fixed"
|
app:tabMode="fixed"
|
||||||
app:tabIndicatorColor="@*android:color/accent_device_default"
|
app:tabIndicatorColor="@*android:color/accent_device_default"
|
||||||
app:tabSelectedTextColor="@*android:color/accent_device_default"
|
app:tabSelectedTextColor="@*android:color/accent_device_default"
|
||||||
|
app:tabTextAppearance="@style/TextAppearance.Tab"
|
||||||
app:tabTextColor="?android:attr/textColorSecondary"/>
|
app:tabTextColor="?android:attr/textColorSecondary"/>
|
||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@@ -6016,11 +6016,6 @@
|
|||||||
|
|
||||||
<!-- Message when there are no available device admin apps to display -->
|
<!-- Message when there are no available device admin apps to display -->
|
||||||
<string name="no_device_admins">No device admin apps available</string>
|
<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 -->
|
<!-- Message when there are no available trust agents to display -->
|
||||||
<string name="no_trust_agents">No available trust agents</string>
|
<string name="no_trust_agents">No available trust agents</string>
|
||||||
@@ -8864,10 +8859,6 @@
|
|||||||
<string name="filter_enabled_apps">Installed apps</string>
|
<string name="filter_enabled_apps">Installed apps</string>
|
||||||
<!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
|
<!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
|
||||||
<string name="filter_instant_apps">Instant apps</string>
|
<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] -->
|
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
|
||||||
<string name="filter_notif_all_apps">Apps: All</string>
|
<string name="filter_notif_all_apps">Apps: All</string>
|
||||||
|
@@ -572,6 +572,10 @@
|
|||||||
<item name="android:showDividers">middle</item>
|
<item name="android:showDividers">middle</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
|
||||||
|
<item name="android:textAllCaps">false</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="AccessibilityDialogServiceIcon">
|
<style name="AccessibilityDialogServiceIcon">
|
||||||
<item name="android:layout_width">36dp</item>
|
<item name="android:layout_width">36dp</item>
|
||||||
<item name="android:layout_height">36dp</item>
|
<item name="android:layout_height">36dp</item>
|
||||||
|
@@ -136,13 +136,13 @@ public class AppFilterRegistry {
|
|||||||
mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
|
mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
|
||||||
ApplicationsState.FILTER_PERSONAL,
|
ApplicationsState.FILTER_PERSONAL,
|
||||||
FILTER_APPS_PERSONAL,
|
FILTER_APPS_PERSONAL,
|
||||||
R.string.filter_personal_apps);
|
R.string.category_personal);
|
||||||
|
|
||||||
// Work
|
// Work
|
||||||
mFilters[FILTER_APPS_WORK] = new AppFilterItem(
|
mFilters[FILTER_APPS_WORK] = new AppFilterItem(
|
||||||
ApplicationsState.FILTER_WORK,
|
ApplicationsState.FILTER_WORK,
|
||||||
FILTER_APPS_WORK,
|
FILTER_APPS_WORK,
|
||||||
R.string.filter_work_apps);
|
R.string.category_work);
|
||||||
|
|
||||||
// Usage access screen, never displayed.
|
// Usage access screen, never displayed.
|
||||||
mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
|
mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
|
||||||
|
@@ -128,9 +128,9 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
|
|||||||
final PreferenceCategory category = new PreferenceCategory(prefContext);
|
final PreferenceCategory category = new PreferenceCategory(prefContext);
|
||||||
screen.addPreference(category);
|
screen.addPreference(category);
|
||||||
if (userInfo.isManagedProfile()) {
|
if (userInfo.isManagedProfile()) {
|
||||||
category.setTitle(R.string.managed_device_admin_title);
|
category.setTitle(R.string.category_work);
|
||||||
} else {
|
} else {
|
||||||
category.setTitle(R.string.personal_device_admin_title);
|
category.setTitle(R.string.category_personal);
|
||||||
}
|
}
|
||||||
category.setOrder(i);
|
category.setOrder(i);
|
||||||
createPreferences(prefContext, category, mApps.get(i));
|
createPreferences(prefContext, category, mApps.get(i));
|
||||||
|
Reference in New Issue
Block a user