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

Merge "Fix 4686480: Cleanup LockScreen settings"

Browse Source
This commit is contained in:
Jim Miller
2011-06-28 12:58:14 -07:00
committed by Android (Google) Code Review
parent 22559fcac9 212fc5650a
commit d1a22ec0a2
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout-land/choose_lock_pattern.xml
View File

@@ -82,10 +82,11 @@
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

5
res/layout-land/confirm_lock_pattern.xml
View File

@@ -56,10 +56,11 @@
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

5
res/layout/choose_lock_pattern.xml
View File

@@ -39,9 +39,10 @@
android:background="@*android:drawable/code_lock_top"
android:layout_width="match_parent"
android:layout_height="2dip" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- bottom line looks bad when button bar is their too, omit in this case -->
<!--View

13
res/layout/choose_lock_pattern_tutorial.xml
View File

@@ -54,16 +54,11 @@
</ScrollView>
<!-- bottom: lock pattern -->
<!-- bottom: lock pattern. Note the size is match_parent in both axis since requested aspect
is square and the pattern view will choose the smaller of the two. -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="300dip"
android:layout_height="300dip"
aspect="square"/>
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"

6
res/layout/confirm_lock_pattern.xml
View File

@@ -32,9 +32,11 @@
android:background="@*android:drawable/code_lock_top"
android:layout_width="match_parent"
android:layout_height="2dip" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:background="@*android:drawable/code_lock_bottom"
android:layout_width="match_parent"

6
res/values/styles.xml
View File

@@ -126,13 +126,15 @@
</style>
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:weightSum">2</item>
<item name="android:dividerPadding">8dip</item>
</style>
<style name="SecurityPreferenceButton" parent="@android:style/Widget.Holo.Button.Borderless">
<item name="android:layout_width">140dip</item>
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>