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

am de9b70f4: am a34279fb: Fix 3383575: use styled attribs and update layout

Browse Source 
* commit 'de9b70f4df471a5548b9ee6779fcb1509d4e9f03':
  Fix 3383575: use styled attribs and update layout
This commit is contained in:
Jim Miller
2011-01-25 12:43:44 -08:00
committed by Android Git Automerger
parent fe6aae82a2 de9b70f4df
commit 786f62159f
9 changed files with 40 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/layout-xlarge-land/choose_lock_password.xml
View File

@@ -64,26 +64,19 @@
<!-- confirm / restart buttons --> <!-- confirm / restart buttons -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/> android:text="@string/lockpassword_cancel_label"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_continue_label"/> android:text="@string/lockpassword_continue_label"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge-land/choose_lock_pattern.xml
View File

@@ -59,26 +59,19 @@
<!-- confirm / restart buttons --> <!-- confirm / restart buttons -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerLeftButton"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/> android:text="@string/lockpattern_restart_button_text"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_confirm_button_text"/> android:text="@string/lockpattern_confirm_button_text"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge-land/choose_lock_pattern_tutorial.xml
View File

@@ -48,26 +48,19 @@
android:textSize="22sp"/> android:textSize="22sp"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/skip_button" <Button android:id="@+id/skip_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_tutorial_cancel_label"/> android:text="@string/lockpattern_tutorial_cancel_label"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_tutorial_continue_label"/> android:text="@string/lockpattern_tutorial_continue_label"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge-land/confirm_lock_password.xml
View File

@@ -65,26 +65,19 @@
<!-- confirm / restart buttons --> <!-- confirm / restart buttons -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/> android:text="@string/lockpassword_cancel_label"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_continue_label"/> android:text="@string/lockpassword_continue_label"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge/choose_lock_password.xml
View File

@@ -84,23 +84,16 @@
android:layout_width="match_parent"> android:layout_width="match_parent">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:orientation="horizontal"> android:orientation="horizontal">
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/> android:text="@string/lockpassword_cancel_label"/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_continue_label"/> android:text="@string/lockpassword_continue_label"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge/choose_lock_pattern.xml
View File

@@ -54,25 +54,18 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerLeftButton"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/> android:text="@string/lockpattern_restart_button_text"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_confirm_button_text"/> android:text="@string/lockpattern_confirm_button_text"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge/choose_lock_pattern_tutorial.xml
View File

@@ -47,25 +47,18 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/skip_button" <Button android:id="@+id/skip_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_tutorial_cancel_label"/> android:text="@string/lockpattern_tutorial_cancel_label"/>
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_tutorial_continue_label"/> android:text="@string/lockpattern_tutorial_continue_label"/>
</LinearLayout> </LinearLayout>

13
res/layout-xlarge/confirm_lock_password.xml
View File

@@ -87,23 +87,16 @@
android:layout_width="match_parent"> android:layout_width="match_parent">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" style="@style/SecurityPreferenceButtonContainer"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:orientation="horizontal"> android:orientation="horizontal">
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/> android:text="@string/lockpassword_cancel_label"/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="140dip" style="@style/SecurityPreferenceButton"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_continue_label"/> android:text="@string/lockpassword_continue_label"/>
</LinearLayout> </LinearLayout>

14
res/values/styles.xml
View File

@@ -132,4 +132,18 @@
<style name="CryptKeeperAnimation"> <style name="CryptKeeperAnimation">
<item name="android:windowExitAnimation">@anim/crypt_keeper_exit</item> <item name="android:windowExitAnimation">@anim/crypt_keeper_exit</item>
</style> </style>
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</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_height">wrap_content</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
</style>
</resources> </resources>