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

Merge "Fix UI to mocks" into lmp-dev

Browse Source
This commit is contained in:
Paul Lawrence
2014-08-11 22:10:46 +00:00
committed by Android (Google) Code Review
parent 581af8cfee 4fd2e5f398
commit ccf49c0206
9 changed files with 111 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout-sw600dp/crypt_keeper_pattern_entry.xml
View File

@@ -18,26 +18,24 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
<include layout="@layout/crypt_keeper_status" /> <include layout="@layout/crypt_keeper_status" />
<RelativeLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="@dimen/crypt_keeper_pattern_size"
android:layout_height="0dip" android:layout_height="@dimen/crypt_keeper_pattern_size"
android:layout_weight="1" android:orientation="horizontal"
android:layout_gravity="center_horizontal"> android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/crypt_keeper_pattern_separator">
<!-- Password entry field --> <include layout="@layout/crypt_keeper_pattern_field" />
<LinearLayout
android:layout_height="@dimen/crypt_keeper_pattern_size" </LinearLayout>
android:layout_width="@dimen/crypt_keeper_pattern_size"
android:layout_centerVertical="true" <include layout="@layout/crypt_keeper_emergency_button" />
android:orientation="horizontal">
<include layout="@layout/crypt_keeper_pattern_field" />
</LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>

33
res/layout/crypt_keeper_emergency_button.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2014, The Android Open Source Project
**
** 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.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- Emergency call button.
Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:textColor="#FFFFFF"
android:layout_weight="1"
android:gravity="bottom"
style="?android:attr/borderlessButtonStyle" />

33
res/layout/crypt_keeper_password_entry.xml
View File

@@ -20,36 +20,23 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
<include layout="@layout/crypt_keeper_status" /> <include layout="@layout/crypt_keeper_status" />
<LinearLayout <LinearLayout
android:layout_height="0dp" android:layout_width="@dimen/crypt_keeper_password_width"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1" android:orientation="horizontal"
android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin" android:layout_marginTop="16dip"
android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin" android:layout_gravity="center_horizontal"
android:orientation="vertical" android:background="@color/crypt_keeper_password_background">
android:gravity="center_vertical">
<LinearLayout <include layout="@layout/crypt_keeper_password_field" />
android:background="@color/crypt_keeper_password_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Emergency call button. <include layout="@layout/crypt_keeper_emergency_button" />
Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
<Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout> </LinearLayout>

29
res/layout/crypt_keeper_pattern_entry.xml
View File

@@ -20,35 +20,22 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
<include layout="@layout/crypt_keeper_status" /> <include layout="@layout/crypt_keeper_status" />
<LinearLayout <LinearLayout
android:layout_height="0dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
android:gravity="center_vertical"> android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
android:orientation="horizontal">
<LinearLayout <include layout="@layout/crypt_keeper_pattern_field" />
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin"
android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin"
android:orientation="horizontal" >
<include layout="@layout/crypt_keeper_pattern_field" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Emergency call button. <include layout="@layout/crypt_keeper_emergency_button" />
Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
<Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout> </LinearLayout>

33
res/layout/crypt_keeper_pin_entry.xml
View File

@@ -20,36 +20,23 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
<include layout="@layout/crypt_keeper_status" /> <include layout="@layout/crypt_keeper_status" />
<LinearLayout <LinearLayout
android:layout_height="0dp" android:layout_width="@dimen/crypt_keeper_password_width"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginTop="16dip"
android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin" android:orientation="horizontal"
android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin" android:layout_gravity="center_horizontal"
android:orientation="vertical" android:background="@color/crypt_keeper_password_background">
android:gravity="center_vertical">
<LinearLayout <include layout="@layout/crypt_keeper_pin_field" />
android:background="@color/crypt_keeper_password_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/crypt_keeper_pin_field" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Emergency call button. <include layout="@layout/crypt_keeper_emergency_button" />
Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
<Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout> </LinearLayout>

10
res/layout/crypt_keeper_status.xml
View File

@@ -31,11 +31,11 @@
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:layout_marginEnd="8dip" android:layout_marginEnd="8dip"
android:textSize="18sp" android:textSize="16sp"
android:textAppearance="?android:attr/textAppearanceLarge" android:fontFamily="sans-serif"
android:textColor="@android:color/white"
android:text="@string/enter_password" android:text="@string/enter_password"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" /> android:gravity="center_horizontal" />
@@ -51,6 +51,8 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:marqueeRepeatLimit ="marquee_forever" android:marqueeRepeatLimit ="marquee_forever"
android:textSize="16sp" android:textSize="16sp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:fontFamily="sans-serif"
android:textColor="#B3FFFFFF"
android:gravity="center_horizontal" />
</LinearLayout> </LinearLayout>

7
res/values-sw600dp-land/dimens.xml
View File

@@ -20,4 +20,11 @@
<dimen name="screen_margin_bottom">48dip</dimen> <dimen name="screen_margin_bottom">48dip</dimen>
<dimen name="appwidget_preview_height">80dip</dimen> <dimen name="appwidget_preview_height">80dip</dimen>
<dimen name="keyguard_appwidget_picker_width">720dip</dimen> <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">116dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">128dip</dimen>
</resources> </resources>

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

@@ -55,6 +55,18 @@
<dimen name="dashboard_tile_image_margin_start">8dp</dimen> <dimen name="dashboard_tile_image_margin_start">8dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen> <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">256dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">256dip</dimen>
<!-- CryptKeeper separation between status and pattern -->
<dimen name="crypt_keeper_pattern_separator">100dip</dimen>
<!-- CryptKeeper password/pin width -->
<dimen name="crypt_keeper_password_width">512dip</dimen>
<!-- SwitchBar margin start / end --> <!-- SwitchBar margin start / end -->
<dimen name="switchbar_margin_start">24dp</dimen> <dimen name="switchbar_margin_start">24dp</dimen>
<dimen name="switchbar_margin_end">24dp</dimen> <dimen name="switchbar_margin_end">24dp</dimen>

13
res/values/dimens.xml
View File

@@ -168,8 +168,14 @@
<dimen name="wifi_assistant_padding">25dp</dimen> <dimen name="wifi_assistant_padding">25dp</dimen>
<dimen name="wifi_assistant_text_padding">16dp</dimen> <dimen name="wifi_assistant_text_padding">16dp</dimen>
<!-- CryptKeeper edit text margin --> <!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_edit_text_margin">16dip</dimen> <dimen name="crypt_keeper_password_top_margin">88dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">88dip</dimen>
<!-- CryptKeeper password/pin width -->
<dimen name="crypt_keeper_password_width">280dip</dimen>
<!-- CryptKeeper emergency call button dimensions --> <!-- CryptKeeper emergency call button dimensions -->
<dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen> <dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen>
@@ -177,6 +183,9 @@
<!-- CryptKeeper edit text ime icon padding --> <!-- CryptKeeper edit text ime icon padding -->
<dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen> <dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
<!-- CryptKeeper pattern margin on phone -->
<dimen name="crypt_keeper_pattern_margin">8dip</dimen>
<!-- CryptKeeper pattern size for tablet --> <!-- CryptKeeper pattern size for tablet -->
<dimen name="crypt_keeper_pattern_size">354dip</dimen> <dimen name="crypt_keeper_pattern_size">354dip</dimen>