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

Move non-theme styles to styles.xml

Browse Source 
1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources

Bug: 111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a
This commit is contained in:
Fan Zhang
2018-07-16 16:28:37 -07:00
parent dec6b8cd38
commit a122be1c35
8 changed files with 488 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -1923,7 +1923,7 @@
<activity android:name=".bluetooth.RequestPermissionActivity"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
android:theme="@style/BluetoothPermission">
android:theme="@style/Theme.BluetoothPermission">
<intent-filter android:priority="1">
<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
<action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -2520,9 +2520,6 @@
<action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="150">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.manageapplications.ManageApplications" />
</activity>

436
color-check-baseline.xml
View File

@@ -1345,22 +1345,6 @@
column="8"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:textColor=&quot;@color/red&quot;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/credentials_dialog.xml"
line="36"
column="17"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -2113,102 +2097,6 @@
column="15"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:textColor=&quot;#ffffb060&quot;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/permission_settings.xml"
line="46"
column="17"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;#000000&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/radio_info.xml"
line="116"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;#000000&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/radio_info.xml"
line="135"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;#000000&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/radio_info.xml"
line="165"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;#000000&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/radio_info.xml"
line="303"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;#000000&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/radio_info.xml"
line="303"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -2445,7 +2333,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rXC/strings.xml"
line="2531"
line="2559"
column="168"/>
</issue>
@@ -2461,7 +2349,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rAU/strings.xml"
line="2532"
line="2560"
column="64"/>
</issue>
@@ -2477,7 +2365,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rCA/strings.xml"
line="2532"
line="2560"
column="64"/>
</issue>
@@ -2493,7 +2381,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rGB/strings.xml"
line="2532"
line="2560"
column="64"/>
</issue>
@@ -2509,7 +2397,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rIN/strings.xml"
line="2532"
line="2560"
column="64"/>
</issue>
@@ -2525,7 +2413,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/strings.xml"
line="5920"
line="5902"
column="36"/>
</issue>
@@ -2541,7 +2429,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
line="248"
line="171"
column="41"/>
</issue>
@@ -2557,7 +2445,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
line="465"
line="425"
column="44"/>
</issue>
@@ -2573,7 +2461,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
line="471"
line="431"
column="44"/>
</issue>
@@ -2589,154 +2477,10 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
line="472"
line="432"
column="44"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="31"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="49"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="67"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="85"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="103"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="121"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:colorPrimary&quot;>@color/material_grey_100&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="197"
column="43"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:colorAccent&quot;>@color/material_blue_700&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="198"
column="42"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:titleTextColor&quot;>@color/material_blue_700&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="199"
column="45"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -2749,7 +2493,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="240"
line="54"
column="39"/>
</issue>
@@ -2765,7 +2509,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="241"
line="55"
column="40"/>
</issue>
@@ -2781,7 +2525,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="242"
line="56"
column="38"/>
</issue>
@@ -2797,7 +2541,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="280"
line="86"
column="47"/>
</issue>
@@ -2813,7 +2557,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="349"
line="147"
column="45"/>
</issue>
@@ -2829,7 +2573,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="350"
line="148"
column="49"/>
</issue>
@@ -2845,7 +2589,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="358"
line="156"
column="45"/>
</issue>
@@ -2861,10 +2605,154 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
line="359"
line="157"
column="49"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="29"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="48"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="67"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="86"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="105"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="124"
column="40"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:colorPrimary&quot;>@color/material_grey_100&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="187"
column="43"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:colorAccent&quot;>@color/material_blue_700&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="188"
column="42"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;item name=&quot;android:titleTextColor&quot;>@color/material_blue_700&lt;/item>"
errorLine2=" ^">
<location
file="res/values/themes_suw.xml"
line="189"
column="45"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"

2
res/layout/fallback_home_finishing_boot.xml
View File

@@ -38,11 +38,11 @@
android:text="@*android:string/android_start_title"/>
<ProgressBar
android:theme="@style/FallbackHomeProgressBar"
style="@android:style/Widget.Material.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12.75dp"
android:colorControlActivated="?android:attr/textColorPrimary"
android:indeterminate="true"/>
</LinearLayout>

47
res/values/strings.xml
View File

@@ -27,10 +27,7 @@
<!-- Strings for Dialog close button [CHAR LIMIT=20] -->
<string name="dlg_close">Close</string>
<!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
<string name="dlg_switch">Switch</string>
<!-- Device Info --> <skip />
<!-- Device Info screen. Used for a status item's value when the proper value is not known -->
<string name="device_info_default">Unknown</string>
<!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -49,14 +46,6 @@
<!-- Category headings in left-pane header menu --> <skip />
<!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
<string name="header_category_wireless_networks">Wireless &amp; networks</string>
<!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
<string name="header_category_connections">Connections</string>
<!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
<string name="header_category_device">Device</string>
<!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
<string name="header_category_personal">Personal</string>
<!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
<string name="header_category_access">Access</string>
<!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
<string name="header_category_system">System</string>
@@ -269,8 +258,6 @@
<!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
<string name="bluetooth_broadcasting">Broadcasting</string>
<!-- Bluetooth settings. Message when the device state is unknown -->
<string name="bluetooth_unknown" />
<!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
<string name="bluetooth_device">Unnamed Bluetooth device</string>
<!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -347,9 +334,6 @@
<!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
<string name="bluetooth_turning_off">"Turning Bluetooth off\u2026"</string>
<!-- Strings for device profile auto connect setting -->
<string name="bluetooth_auto_connect">Auto-connect</string>
<!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
<string name="bluetooth_connection_permission_request">"Bluetooth connection request"</string>
@@ -419,8 +403,6 @@
<string name="connected_device_connected_title">Currently connected</string>
<!-- Title for connected device group [CHAR LIMIT=none]-->
<string name="connected_device_saved_title">Saved devices</string>
<!-- Title for preference to add a device [CHAR LIMIT=none] [BACKUP_MESSAGE_ID=7803521577708810621] -->
<string name="connected_device_add_device_title">Add device</string>
<!-- Summary for preference to add a device [CHAR LIMIT=none]-->
<string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
<!-- Title for other connection preferences [CHAR LIMIT=none]-->
@@ -662,10 +644,6 @@
<!-- The title of the activity to adjust proxy settings -->
<string name="proxy_settings_label">Proxy settings</string>
<!-- ======================================================================================= -->
<!-- NEW STUFF -->
<!-- ======================================================================================= -->
<!-- Button label for generic cancel action [CHAR LIMIT=20] -->
<string name="cancel">Cancel</string>
<!-- Button label for generic OK action [CHAR LIMIT=20] -->
@@ -687,8 +665,6 @@
<string name="settings_shortcut">Settings shortcut</string>
<!-- Wireless controls settings screen, setting check box label -->
<string name="airplane_mode">Airplane mode</string>
<!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. [CHAR LIMIT=30] -->
<string name="radio_controls_title">More</string>
<!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
<string name="wireless_networks_settings_title">Wireless &amp; networks</string>
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
@@ -727,7 +703,6 @@
<!-- mobile network settings screen, setting option summary text -->
<string name="sum_carrier_select">Choose a network operator</string>
<!-- Date and time settings --><skip />
<!-- Main Settings screen setting option name to go into the date and time settings-->
<string name="date_and_time_settings_title">Date &amp; time</string>
<!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -4089,12 +4064,6 @@
<string name="no_applications">No apps.</string>
<!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
<string name="internal_storage">Internal storage</string>
<!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
<string name="internal_storage_sentence">internal storage</string>
<!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
<string name="sd_card_storage" product="nosdcard">USB storage</string>
<!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
<string name="sd_card_storage" product="default">SD card storage</string>
<!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
<string name="recompute_size">Recomputing size\u2026</string>
<!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
@@ -4117,8 +4086,6 @@
<string name="join_two_unrelated_items"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="second_item">%2$s</xliff:g></string>
<string name="computing_size">Computing\u2026</string>
<string name="invalid_size_value">Couldn\u2019t compute package size.</string>
<!-- String displayed when list is empty -->
<string name="empty_list_msg">You don\u2019t have any third-party apps installed.</string>
<!-- Manage applications, version string displayed in app snippet -->
<string name="version_text">version <xliff:g id="version_num">%1$s</xliff:g></string>
<!-- Manage applications, text for Move button -->
@@ -4131,9 +4098,6 @@
<string name="move_app_to_sdcard" product="nosdcard">Move to USB storage</string>
<!-- Manage applications, text for Move button to move app to sdcard -->
<string name="move_app_to_sdcard" product="default">Move to SD card</string>
<!-- Manage applications, title for dialog when killing persistent apps-->
<!-- Manage applications, text for Move button when move is in progress -->
<string name="moving">Moving</string>
<!-- Text of pop up message if the request for a "migrate primary storage" operation
(see storage_menu_migrate) is denied as another is already in progress. [CHAR LIMIT=75] -->
@@ -4151,16 +4115,10 @@
<string name="force_stop_dlg_title">Force stop?</string>
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
<string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
<!-- Manage applications, text for dialog when moving an app -->
<string name="move_app_failed_dlg_title"></string>
<!-- Manage applications, text for dialog moving an app -->
<string name="move_app_failed_dlg_text">Couldn\u2019t move app. <xliff:g id="reason">%1$s</xliff:g></string>
<!-- Manage applications, application installation location title -->
<string name="app_install_location_title">Preferred install location</string>
<!-- Manage applications. application installation location summary -->
<string name="app_install_location_summary">Change the preferred installation location for new apps</string>
<!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
<string name="app_disable_dlg_title">Disable built-in app?</string>
<!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
<string name="app_disable_dlg_positive">Disable app</string>
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
@@ -4171,11 +4129,6 @@
<string name="app_special_disable_dlg_text">If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted.</string>
<!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
<string name="app_disable_notifications_dlg_title">Turn off notifications?</string>
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
<string name="app_disable_notifications_dlg_text">
If you turn off notifications for this app, you may miss important alerts and updates.
</string>
<!-- Manage applications, individual application info screen, section heading for information about the app installer [CHAR_LIMIT=25] -->
<string name="app_install_details_group_title">Store</string>
<!-- Manage applications, individual application info screen, title for the option which will trigger application info in it's installer [CHAR_LIMIT=25] -->

223
res/values/styles.xml
View File

@@ -16,6 +16,14 @@
<resources>
<style name="Theme.ActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="Theme.ActionBar.SubSettings" parent="Theme.ActionBar">
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style>
<style name="info_label">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
@@ -56,42 +64,6 @@
<item name="android:layout_width">match_parent</item>
</style>
<style name="TextAppearance" parent="android:TextAppearance.Material"/>
<style name="TextAppearance.info_label">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.info_small">
<item name="android:textSize">12sp</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.info_value">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center_horizontal</item>
<item name="android:background">@null</item>
<item name="android:textCursorDrawable">@null</item>
<item name="android:singleLine">true</item>
<item name="android:imeOptions">flagForceAscii|actionDone</item>
</style>
<style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
<item name="android:paddingStart">@dimen/settings_side_margin</item>
<item name="android:paddingEnd">@dimen/settings_side_margin</item>
@@ -195,13 +167,6 @@
<item name="android:activityOpenExitAnimation">@anim/confirm_credential_open_exit</item>
</style>
<style name="Transparent">
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
</style>
<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.NoActionBar">
<item name="android:background">#ff000000</item>
</style>
@@ -255,7 +220,37 @@
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
</style>
<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Widget.TabWidget" />
<style name="TextAppearance" parent="android:TextAppearance.Material"/>
<style name="TextAppearance.info_label">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.info_small">
<item name="android:textSize">12sp</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.info_value">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center_horizontal</item>
<item name="android:background">@null</item>
<item name="android:textCursorDrawable">@null</item>
<item name="android:singleLine">true</item>
<item name="android:imeOptions">flagForceAscii|actionDone</item>
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
@@ -269,12 +264,79 @@
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead" />
<style name="TextAppearance.SuggestionTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.FingerprintErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.FaceErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.Small.SwitchBar">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.RemoveDialogContent" parent="@android:style/TextAppearance.Material">
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
<item name="android:textSize">@dimen/search_bar_text_size</item>
</style>
<style name="TextAppearance.SuggestionHeader"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
<style name="TextAppearance.EntityHeaderTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.EntityHeaderSummary"
parent="@android:style/TextAppearance.Material.Body1">
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:gravity">start</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
</style>
<style name="TextAppearance.ZenOnboardingButton">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/colorAccent</item>
<item name="android:background">@drawable/btn_borderless_rect</item>
<item name="android:gravity">center</item>
<item name="android:focusable">true</item>
<item name="android:padding">8dp</item>
</style>
<style name="SuggestionConditionStyle">
<item name="android:background">?android:attr/colorPrimary</item>
</style>
<style name="SuggestionCardText">
<item name="android:textAlignment">viewStart</item>
</style>
@@ -294,48 +356,14 @@
<item name="android:layout_marginBottom">@dimen/suggestion_card_button_bottom_margin</item>
</style>
<style name="TextAppearance.SuggestionTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.FingerprintErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="FingerprintLayoutTheme">
<item name="android:icon">@drawable/ic_fingerprint_header</item>
</style>
<style name="TextAppearance.FaceErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="FaceLayoutTheme">
<item name="android:icon">@drawable/ic_face_header</item>
</style>
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.Small.SwitchBar">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.RemoveDialogContent" parent="@android:style/TextAppearance.Material">
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="PreviewPagerPageIndicator">
<item name="dotGap">8dp</item>
<item name="pageIndicatorColor">?android:attr/colorControlNormal</item>
@@ -351,12 +379,6 @@
<item name="android:gravity">center_vertical</item>
</style>
<style name="RedactionItemAndLabel">
<item name="android:layout_marginTop">@dimen/redaction_vertical_margins</item>
<item name="android:paddingStart">@dimen/redaction_padding_start</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
</style>
<style name="FingerprintHeaderStyle" parent="android:style/TextAppearance.Material.Subhead">
<item name="android:paddingTop">16dp</item>
<item name="android:textColor">@color/primary_dark_material_light</item>
@@ -385,31 +407,6 @@
<item name="android:paddingBottom">8dp</item>
</style>
<style name="TextAppearance.EntityHeaderTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.EntityHeaderSummary"
parent="@android:style/TextAppearance.Material.Body1">
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:gravity">start</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
</style>
<style name="TextAppearance.ZenOnboardingButton">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/colorAccent</item>
<item name="android:background">@drawable/btn_borderless_rect</item>
<item name="android:gravity">center</item>
<item name="android:focusable">true</item>
<item name="android:padding">8dp</item>
</style>
<style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
@@ -449,14 +446,6 @@
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
</style>
<style name="SuggestionConditionStyle">
<item name="android:background">?android:attr/colorPrimary</item>
</style>
<style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
<item name="android:textSize">@dimen/search_bar_text_size</item>
</style>
<style name="device_info_dialog_label">
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>

15
res/values/styles_preference.xml
View File

@@ -19,6 +19,17 @@
<!-- Things unrelated to preference framework UI customization should go to other styles files -->
<resources>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
</style>
<style name="PreferenceTheme.SetupWizard">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item>
</style>
<style name="ApnPreference" parent="@style/Preference.Material">
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
@@ -40,4 +51,8 @@
<item name="android:negativeButtonText">@android:string/cancel</item>
</style>
<style name="SetupWizardPreferenceFragmentStyle" parent="PreferenceFragment.Material">
<item name="android:layout">@layout/setup_preference</item>
</style>
</resources>

218
res/values/themes.xml
View File

@@ -16,191 +16,13 @@
<resources>
<style name="GlifTheme" parent="SuwThemeGlif">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifTheme.Light" parent="SuwThemeGlif.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme" parent="SuwThemeGlifV2">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV3Theme" parent="SuwThemeGlifV3">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifV3Theme.Light" parent="SuwThemeGlifV3.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="SetupWizardTheme.Transparent" parent="GlifTheme">
<style name="Transparent">
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV2Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV2Theme.Light.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV3Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV3Theme.Light.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
</style>
<style name="PreferenceTheme.SetupWizard" parent="PreferenceTheme">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item>
</style>
<style name="SetupWizardPreferenceFragmentStyle" parent="PreferenceFragment.Material">
<item name="android:layout">@layout/setup_preference</item>
</style>
<!-- Accessibility portion of Setup Wizard -->
<style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
<item name="android:windowLightStatusBar">false</item>
<item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
<!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate
layouts against a remote context using our local theme colors. Due to the implementation
details of Theme, we can't reference any local resources and MUST instead use the values
directly. So use #ff263238 instead of @color/theme_primary and so on. -->
<style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
<style name="Theme.Settings" parent="Theme.SettingsBase">
@@ -234,6 +56,12 @@
<item name="batteryBadColor">@color/battery_bad_color_light</item>
</style>
<!-- Variant of the settings theme with no action bar. -->
<style name="Theme.Settings.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
@@ -241,12 +69,6 @@
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
<!-- Variant of the settings theme with no action bar. -->
<style name="Theme.Settings.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
<item name="android:windowAnimationStyle">@null</item>
<item name="android:windowIsTranslucent">true</item>
@@ -257,14 +79,6 @@
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="Theme.ActionBar.SubSettings" parent="Theme.ActionBar">
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style>
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
<item name="android:textColorPrimary">@android:color/white</item>
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
@@ -292,14 +106,6 @@
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="GlifV2ThemeAlertDialog" parent="SuwAlertDialogTheme">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="GlifV2ThemeAlertDialog.Light" parent="SuwAlertDialogTheme.Light">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
@@ -351,16 +157,12 @@
<item name="android:navigationBarColor">#00000000</item>
</style>
<style name="FallbackHomeProgressBar" parent="FallbackHome">
<item name="android:colorControlActivated">?android:attr/textColorPrimary</item>
</style>
<style name="BluetoothPermission" parent="@android:style/Theme.Material.Light.Dialog.Alert">
<style name="Theme.BluetoothPermission" parent="@android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowNoTitle">true</item>
</style>
<style name="Theme.Settings.Home" parent="Theme.AppCompat.Light.NoActionBar">
<!-- copied from frameworks/base/core/res/res/values/themes_device_defaults.xml -->
<!-- Color names copied from frameworks/base/core/res/res/values/themes_device_defaults.xml -->
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>

193
res/values/themes_suw.xml Normal file
View File

@@ -0,0 +1,193 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- SUW related themes -->
<resources>
<style name="GlifTheme" parent="SuwThemeGlif">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifTheme.Light" parent="SuwThemeGlif.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme" parent="SuwThemeGlifV2">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV3Theme" parent="SuwThemeGlifV3">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="GlifV3Theme.Light" parent="SuwThemeGlifV3.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV2Theme.Light.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV2ThemeAlertDialog" parent="SuwAlertDialogTheme">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="GlifV2ThemeAlertDialog.Light" parent="SuwAlertDialogTheme.Light">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="GlifV3Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV3Theme.Light.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="SetupWizardTheme.Transparent" parent="GlifTheme">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<!-- Accessibility portion of Setup Wizard -->
<style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
<item name="android:windowLightStatusBar">false</item>
<item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
</resources>