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

am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev

Browse Source 
* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
  Settings: Add zen rule name warning text.
This commit is contained in:
John Spurlock
2015-06-04 15:51:05 +00:00
committed by Android Git Automerger
parent 06840b31f6 1a1181edde
commit afa64f45ab
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/zen_rule_name.xml
View File

@@ -32,13 +32,23 @@
</EditText>
<TextView
android:id="@+id/rule_name_warning"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_marginLeft="26dp"
android:layout_marginRight="26dp"
android:textColor="@color/zen_rule_name_warning"
android:text="@string/zen_mode_rule_name_warning" />
<RadioGroup
android:id="@+id/rule_types"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="22dp"
android:layout_marginRight="22dp"
android:layout_marginTop="16dp"
android:orientation="vertical"
android:checkedButton="@+id/rule_type_schedule" >

6
res/values/colors.xml
View File

@@ -50,6 +50,8 @@
<color name="setup_wizard_wifi_color_dark">#89ffffff</color>
<color name="setup_wizard_wifi_color_light">#89000000</color>
<color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
<color name="lock_pattern_view_error_color">@color/warning</color>
@@ -57,7 +59,7 @@
<color name="lock_pattern_view_regular_color_dark">#ffffff</color>
<color name="unlock_pattern_view_regular_color">@android:color/white</color>
<color name="unlock_pattern_view_error_color">#fff4511e</color>
<color name="unlock_pattern_view_error_color">@color/system_warning_color</color>
<color name="fingerprint_title_area_bg">#ff009688</color>
<color name="fingerprint_title_color">#ffffffff</color>
@@ -96,4 +98,6 @@
<color name="memory_max_use">#ff009587</color>
<color name="memory_remaining">#ffced7db</color>
<color name="zen_rule_name_warning">@color/system_warning_color</color>
</resources>

3
res/values/strings.xml
View File

@@ -6104,6 +6104,9 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
<string name="zen_mode_rule_name_hint">Enter rule name</string>
<!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
<string name="zen_mode_rule_name_warning">Rule name already in use</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
<string name="zen_mode_add_rule">Add rule</string>