cmparts: Cleanup
* Cleanup various crufty things like duplicate strings and
bad identifiers. These were detected by AAPT2, but we
aren't actually using it because it has a ton of bugs.
Change-Id: I10b3657a8f3809b03ab91f12ce2e3a44331fefdd
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e90b5f..4d18333 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -260,23 +260,13 @@
<string name="profile_setup_actions_title">Step 2: Setup actions</string>
<string name="profile_setup_actions_title_config">Reconfigure actions</string>
- <string name="profile_appgroups_manage">App groups</string>
- <string name="profile_appgroup_manage">Manage app group</string>
<string name="wireless_networks_settings_title">Wireless & networks</string>
- <!-- Title for application group setting screen -->
- <string name="profile_appgroups_title">App groups</string>
- <string name="profile_new_appgroup">New app group</string>
- <string name="profile_delete_appgroup">Delete this app group?</string>
- <string name="profile_appgroup_name_prompt">Enter a name for the new app group</string>
- <string name="profile_appgroup_name_title">Name</string>
- <string name="duplicate_appgroup_name">Duplicate app group name!</string>
- <string name="profile_app_delete_confirm">Remove this app?</string>
+ <!-- Profile triggers -->
<string name="no_bluetooth_triggers">No Bluetooth devices paired.\nTap to pair Bluetooth device before configuring triggers.</string>
<string name="no_wifi_triggers">No Wi\u2011Fi access points configured.\nTap to connect Wi\u2011Fi before configuring triggers.</string>
<string name="no_triggers_configured">No triggers configured. Tap to add more.</string>
<string name="no_triggers_configured_nfc">Tap to setup a new NFC trigger.</string>
-
<string name="profile_setup_setup_triggers_description">Please select triggers which will activate this profile</string>
<string name="profile_setup_actions_description">Now configure what happens when the profile is activated</string>
@@ -316,7 +306,6 @@
<!-- Rename Dialog -->
<string name="rename_dialog_title">Rename</string>
<string name="rename_dialog_message">Enter a new name</string>
- <string name="duplicate_appgroup_name">Duplicate app group name!</string>
<string name="rename_dialog_hint">Enter profile name</string>
<!-- Reset Profiles -->
@@ -372,6 +361,7 @@
<string name="profile_delete_appgroup">Delete this app group?</string>
<string name="profile_appgroup_name_prompt">Enter a name for the new app group</string>
<string name="profile_appgroup_name_title">Name</string>
+ <string name="duplicate_appgroup_name">Duplicate app group name!</string>
<!-- Add application dialog box title -->
<string name="profile_choose_app">Choose app</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1920e55..710871a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,10 +19,10 @@
<attr name="wifi_signal_color" format="reference" />
<style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings">
- <item name="@android:preferenceStyle">@style/Preference</item>
- <item name="@android:editTextPreferenceStyle">@style/EditTextPreference</item>
- <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
- <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
+ <item name="preferenceStyle">@style/Preference</item>
+ <item name="editTextPreferenceStyle">@style/EditTextPreference</item>
+ <item name="dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
+ <item name="preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
</style>
<!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate
@@ -33,40 +33,40 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
- <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
- <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
- <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
- <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
- <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+ <item name="preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
+ <item name="preferencePanelStyle">@style/PreferencePanelSinglePane</item>
+ <item name="preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
+ <item name="preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+ <item name="preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
<item name="wifi_signal_color">?android:attr/colorAccent</item>
<item name="side_margin">@dimen/settings_side_margin</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
- <item name="@*android:actionBarSize">@dimen/actionbar_size</item>
+ <item name="android:actionBarSize">@dimen/actionbar_size</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
<!-- For all Alert Dialogs -->
- <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
+ <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">
<!-- Redefine the ActionBar style for contentInsetStart -->
- <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
+ <item name="actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
- <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
+ <item name="contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="Theme.ActionBar.SubSettings" parent="Theme.ActionBar">
- <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
+ <item name="contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style>
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
@@ -83,15 +83,15 @@
<style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
<!-- Redefine the ActionBar style for contentInsetStart -->
- <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
+ <item name="actionBarStyle">@style/Theme.ActionBar</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
<item name="preferenceTheme">@style/PreferenceTheme</item>
- <item name="android:actionBarWidgetTheme">@null</item>
- <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
+ <item name="actionBarWidgetTheme">@null</item>
+ <item name="actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>