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

Misc UI fixes for settings (mostly cryptkeeper)

Browse Source 
- fix padding issues in a lot of cryptkeeper screens
- fix sizing of clock that didn't fit anymore with the new font
- change titles from green to the new holo blue

Bug: 5247866
Change-Id: Ib934e9661c32cce26e1af40eaff133bae11f78dc
This commit is contained in:
Ben Komalo
2011-09-01 10:30:13 -07:00
parent 24e073071d
commit 9cec1becd6
11 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/crypt_keeper_progress.xml
View File

@@ -30,7 +30,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="#ff99cc00"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>

2
res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -47,7 +47,7 @@
android:layout_marginLeft="16dip"
android:layout_below="@id/top_padding_layout"
android:textSize="32dip"
android:textColor="#ff99cc00"
android:textColor="@color/title_color"
android:text="@string/wifi_setup_title"
android:gravity="bottom"/>

3
res/layout-sw600dp/crypt_keeper_password_entry.xml
View File

@@ -20,6 +20,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<include layout="@layout/crypt_keeper_status" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -38,6 +40,7 @@
android:layout_width="wrap_content"
android:layout_toRightOf="@+id/encroid"
android:layout_marginTop="37dip"
android:paddingLeft="17dip"
android:paddingRight="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"

9
res/layout-sw600dp/crypt_keeper_progress.xml
View File

@@ -23,6 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="64dip"
>
<ImageView
android:id="@+id/encroid"
@@ -42,8 +43,9 @@
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:textSize="30dip"
android:textColor="#ff99cc00"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>
@@ -68,8 +70,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:paddingLeft="152dip"
android:paddingTop="21dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -78,7 +81,6 @@
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="152dip"
android:layout_above="@+id/factory_reset"
android:visibility="gone"
>
@@ -96,6 +98,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="80dip"
android:layout_marginRight="16dip"
android:text="@string/master_clear_button_text"
android:visibility="gone"
/>

2
res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -47,7 +47,7 @@
android:layout_marginLeft="16dip"
android:layout_below="@id/top_padding_layout"
android:textSize="32dip"
android:textColor="#ff99cc00"
android:textColor="@color/title_color"
android:text="@string/wifi_setup_title"
android:gravity="bottom"/>

2
res/layout-sw720dp/date_time_settings_setupwizard.xml
View File

@@ -34,7 +34,7 @@
android:layout_marginLeft="16dip"
android:layout_alignParentTop="true"
android:textSize="32dip"
android:textColor="#FF99cc00"
android:textColor="@color/title_color"
android:text="@string/date_and_time_settings_title_setup_wizard"
android:gravity="bottom" />

2
res/layout/crypt_keeper_progress.xml
View File

@@ -30,7 +30,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="#ff99cc00"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>

12
res/layout/crypt_keeper_status.xml
View File

@@ -19,10 +19,10 @@
<!-- Status to show on the left side of lock screen -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<com.android.internal.widget.DigitalClock android:id="@+id/time"
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="none"
android:textSize="120sp"
android:textSize="@dimen/crypt_clock_size"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/crypt_keeper_clock_background"
android:layout_marginBottom="6dip"
@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="none"
android:textSize="120sp"
android:textSize="@dimen/crypt_clock_size"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/crypt_keeper_clock_foreground"
android:layout_alignLeft="@*android:id/timeDisplayBackground"

1
res/values-sw600dp/dimens.xml
View File

@@ -24,4 +24,5 @@
<dimen name="title_height">48dip</dimen>
<dimen name="content_margin_left">16dip</dimen>
<dimen name="description_margin_top">26dip</dimen>
<dimen name="crypt_clock_size">120sp</dimen>
</resources>

11
res/values/colors.xml
View File

@@ -4,9 +4,9 @@
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.
@@ -25,12 +25,11 @@
<color name="memory_dcim">#793A7F</color>
<color name="memory_music">#8E562A</color>
<color name="memory_misc">#7C3030</color>
<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="divider_color">#20ffffff</color>
<color name="title_color">#ff99cc00</color>
</resources>
<color name="title_color">@android:color/holo_blue_light</color>
</resources>

2
res/values/dimens.xml
View File

@@ -32,4 +32,6 @@
<dimen name="data_usage_chart_optimalWidth">440dip</dimen>
<dimen name="volume_seekbar_side_margin">8dip</dimen>
<dimen name="crypt_clock_size">100sp</dimen>
</resources>