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

Merge "Final touches to material theme for phones" into lmp-dev

Browse Source
This commit is contained in:
Paul Lawrence
2014-07-17 20:58:43 +00:00
committed by Android (Google) Code Review
parent cda76822c4 aa05738cd2
commit eb0628bb02
11 changed files with 108 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/colors.xml
View File

@@ -34,6 +34,7 @@
<color name="crypt_keeper_clock_background">#ff9a9a9a</color>
<color name="crypt_keeper_clock_foreground">#ff666666</color>
<color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
<color name="crypt_keeper_password_background">#70606060</color>
<color name="divider_color">#20ffffff</color>
<color name="title_color">@android:color/holo_blue_light</color>

9
res/values/dimens.xml
View File

@@ -171,4 +171,13 @@
<dimen name="wifi_assistant_padding">25dp</dimen>
<dimen name="wifi_assistant_text_padding">16dp</dimen>
<!-- CryptKeeper edit text margin -->
<dimen name="crypt_keeper_edit_text_margin">16dip</dimen>
<!-- CryptKeeper emergency call button dimensions -->
<dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen>
<!-- CryptKeeper edit text ime icon padding -->
<dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
</resources>

9
res/values/styles.xml
View File

@@ -82,6 +82,15 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:textSize">36sp</item>
<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>

4
res/values/themes.xml
View File

@@ -150,6 +150,10 @@
</style>
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<!-- LockPatternView colors -->
<item name="@*android:regularColor">@color/unlock_pattern_view_regular_color</item>
<item name="@*android:successColor">@color/unlock_pattern_view_success_color</item>