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

Merge "Create palette preview for color correction."

Browse Source
This commit is contained in:
Jasper Chang
2020-01-07 03:20:54 +00:00
committed by Android (Google) Code Review
parent 263bc8097a 556687661c
commit 875727c2ab
10 changed files with 589 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
res/values/arrays.xml
View File

@@ -23,19 +23,19 @@
strings. --> <skip />
<!-- The time zone picker screen has two levels. The first level allows the user to choose a region. -->
<string-array name="timezone_filters">
<!-- The next level of the time zoner picker should show time zones from the Americas. -->
<!-- The next level of the time zoner picker should show time zones from the Americas. -->
<item>America</item>
<!-- The next level of the time zoner picker should show time zones from Europe. -->
<!-- The next level of the time zoner picker should show time zones from Europe. -->
<item>Europe</item>
<!-- The next level of the time zoner picker should show time zones from Africa. -->
<!-- The next level of the time zoner picker should show time zones from Africa. -->
<item>Africa</item>
<!-- The next level of the time zoner picker should show time zones from Asia. -->
<!-- The next level of the time zoner picker should show time zones from Asia. -->
<item>Asia</item>
<!-- The next level of the time zoner picker should show time zones from Australia. -->
<!-- The next level of the time zoner picker should show time zones from Australia. -->
<item>Australia</item>
<!-- The next level of the time zoner picker should show time zones from Pacific. -->
<!-- The next level of the time zoner picker should show time zones from Pacific. -->
<item>Pacific</item>
<!-- The next level of the time zoner picker should show time zones from ALL regions. -->
<!-- The next level of the time zoner picker should show time zones from ALL regions. -->
<item>All</item>
</string-array>
@@ -274,8 +274,8 @@
<item>Require all non-trusted certificate statuses</item>
</string-array>
<!-- Wi-Fi AP band settings. Either Auto, 2.4GHz or 5GHz. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<!-- Wi-Fi AP band settings. Either Auto, 2.4GHz or 5GHz. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array translatable="false" name="wifi_ap_band_config_full">
<item>1</item>
<item>2</item>
@@ -301,8 +301,8 @@
<item>@string/wifi_ap_choose_2G</item>
</string-array>
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_p2p_wps_setup">
<!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
<item>Push button</item>
@@ -320,7 +320,7 @@
<item>Unsuccessful</item>
<item>Available</item>
<item>Out-of-range</item>
</string-array>
</string-array>
<!-- Bluetooth Settings -->
@@ -410,7 +410,7 @@
</string-array>
<!-- Wi-Fi IP settings. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ip_settings">
<!-- Use DHCP (Dynamic Host Configuration Protocol) for obtaining IP settings [CHAR LIMIT=25] -->
<item>DHCP</item>
@@ -1432,15 +1432,15 @@
<!-- WiFi calling mode array -->
<string-array name="wifi_calling_mode_summaries" translatable="false">
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_only_summary</item>
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_only_summary</item>
</string-array>
<!-- WiFi calling mode array without wifi only mode -->
<string-array name="wifi_calling_mode_summaries_without_wifi_only" translatable="false">
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
</string-array>
<!-- Carrier variant of Enhaced 4G LTE Mode title. [CHAR LIMIT=NONE] -->
@@ -1469,4 +1469,27 @@
<item>"com.google.android.googlequicksearchbox"</item>
</string-array>
</resources>
<!-- Array of titles palette list for accessibility. -->
<string-array name="setting_palette_colors" translatable="false" >
<item>@string/color_red</item>
<item>@string/color_orange</item>
<item>@string/color_yellow</item>
<item>@string/color_green</item>
<item>@string/color_cyan</item>
<item>@string/color_blue</item>
<item>@string/color_purple</item>
<item>@string/color_pink</item>
</string-array>
<!-- Values for palette list view preference. -->
<array name="setting_palette_data" translatable="false" >
<item>@color/palette_list_color_red</item>
<item>@color/palette_list_color_orange</item>
<item>@color/palette_list_color_yellow</item>
<item>@color/palette_list_color_green</item>
<item>@color/palette_list_color_cyan</item>
<item>@color/palette_list_color_blue</item>
<item>@color/palette_list_color_purple</item>
<item>@color/palette_list_color_pink</item>
</array>
</resources>

22
res/values/colors.xml
View File

@@ -148,4 +148,26 @@
<color name="face_intro_outline">#ffdadce0</color>
<color name="back_gesture_indicator">#4182ef</color>
<!-- Palette list preference colors. -->
<color name="palette_list_gradient_background">@android:color/white</color>
<color name="palette_list_color_red">#d93025</color> <!-- Material Red 600 -->
<color name="palette_list_color_orange">#e8710a</color> <!-- Material Orange 600 -->
<color name="palette_list_color_yellow">#f9ab00</color> <!-- Material Yellow 600 -->
<color name="palette_list_color_green">#1e8e3e</color> <!-- Material Green 600 -->
<color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->
<color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->
<color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->
<color name="palette_list_color_pink">#e52592</color> <!-- Material Pink 600 -->
<!-- Palette list preference dark mode colors. -->
<color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->
<color name="palette_list_dark_mode_color_orange">#fcad70</color> <!-- Material Orange 300 -->
<color name="palette_list_dark_mode_color_yellow">#fdd663</color> <!-- Material Yellow 300 -->
<color name="palette_list_dark_mode_color_green">#81c995</color> <!-- Material Green 300 -->
<color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->
<color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->
<color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->
<color name="palette_list_dark_mode_color_pink">#ff8bcb</color> <!-- Material Pink 300 -->
</resources>

2
res/values/strings.xml
View File

@@ -7232,6 +7232,8 @@
<string name="color_orange">Orange</string>
<!-- Purple label. [CHAR LIMIT=40] -->
<string name="color_purple">Purple</string>
<!-- Pink label. [CHAR LIMIT=40] -->
<string name="color_pink">Pink</string>
<!-- Message informing the user that no SIM card is inserted [CHAR LIMIT=60] -->
<string name="sim_no_inserted_msg">No SIM cards inserted</string>
<!-- SIM status title [CHAR LIMIT=40] -->