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

Merge "GLIF theme for settings" into nyc-mr1-dev

Browse Source 
am: 203fbde

* commit '203fbde10d652c10349052d645cf40a76b9d4198':
  GLIF theme for settings

Change-Id: If1330a47f96fba74225e4f8fec8283537c3d5f19
This commit is contained in:
Maurice Lam
2016-04-27 01:20:18 +00:00
committed by android-build-merger
parent f8066f23de 203fbde10d
commit e9841efb18
32 changed files with 254 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -70,6 +70,15 @@
android:accessibilityLiveRegion="polite"
android:visibility="invisible"/>
<Button
android:id="@+id/skip_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/skip_label"
android:visibility="gone" />
</LinearLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

5
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -63,9 +63,8 @@
android:layout_marginBottom="4dp"
android:layout_marginEnd="-12dp"
android:layout_gravity="end"
android:gravity="end|center_vertical"
android:text="@string/fingerprint_enroll_button_next" />
</LinearLayout>
</FrameLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

5
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -91,11 +91,10 @@
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:text="@string/security_settings_fingerprint_enroll_done" />
</LinearLayout>
</LinearLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

6
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -15,10 +15,10 @@
limitations under the License
-->
<com.android.setupwizardlib.SetupWizardRecyclerLayout
<com.android.setupwizardlib.GlifRecyclerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="?attr/fingerprint_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:entries="@xml/fingerprint_enroll_introduction_items"
style="?attr/fingerprint_layout_theme" />
android:entries="@xml/fingerprint_enroll_introduction_items" />

61
res/layout/setup_choose_lock_password.xml
View File

@@ -15,15 +15,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwHeaderText="@string/wifi_setup_wizard_title"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
<LinearLayout
style="@style/SuwContentFrame"
@@ -45,45 +43,42 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="30dip"
android:layout_marginEnd="30dip"
android:gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="end"
android:orientation="horizontal">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_continue_label" />
</LinearLayout>
<!-- Spacer between password entry and keyboard -->
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
style="@style/SecurityPreferenceButtonContainer">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lockpassword_cancel_label"
style="@style/SecurityPreferenceButton"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lockpassword_continue_label"
style="@style/SecurityPreferenceButton"/>
</LinearLayout>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent"
@@ -94,4 +89,4 @@
</LinearLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

66
res/layout/setup_choose_lock_pattern_common.xml
View File

@@ -16,15 +16,13 @@
-->
<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwHeaderText="@string/wifi_setup_wizard_title"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/wifi_setup_wizard_title">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"
@@ -49,19 +47,35 @@
android:minHeight="50dip"
android:textSize="18sp"/>
<Button android:id="@+id/retryButton"
style="@android:style/Widget.Material.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lockpattern_retry_button_text"/>
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="4"
android:background="@color/lock_pattern_background"/>
<!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal">
<!-- left : cancel, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_tutorial_cancel_label" />
<!-- right : confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_tutorial_continue_label" />
</LinearLayout>
</LinearLayout>
<TextView android:id="@+id/footerText"
@@ -72,32 +86,6 @@
android:textSize="14sp"
android:visibility="gone"/>
<!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
style="@style/SecurityPreferenceButtonContainer">
<!-- left : cancel, or re-try -->
<Button android:id="@+id/footerLeftButton"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lockpattern_tutorial_cancel_label"
style="@style/SecurityPreferenceButton"/>
<!-- right : confirm or ok -->
<Button android:id="@+id/footerRightButton"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lockpattern_tutorial_continue_label"
style="@style/SecurityPreferenceButton"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

4
res/layout/setup_fingerprint_enroll_find_sensor_base.xml
View File

@@ -15,7 +15,7 @@
limitations under the License
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -68,4 +68,4 @@
</LinearLayout>
</FrameLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>

7
res/layout/setup_preference.xml
View File

@@ -15,11 +15,8 @@
limitations under the License.
-->
<com.android.setupwizardlib.SetupWizardPreferenceLayout
<com.android.setupwizardlib.GlifPreferenceLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:id="@android:id/list_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile" />
android:layout_height="match_parent" />

27
res/layout/setup_redaction_interstitial.xml
View File

@@ -15,31 +15,25 @@
limitations under the License
-->
<com.android.setupwizardlib.SetupWizardLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
<LinearLayout
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="?attr/side_margin"
android:paddingEnd="?attr/side_margin">
android:orientation="vertical">
<TextView
style="@style/SuwDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lock_screen_notifications_interstitial_message" />
<RadioGroup
@@ -47,8 +41,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:checkedButton="@+id/redact_sensitive">
<com.android.settings.RestrictedRadioButton
@@ -81,8 +73,17 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lockscreen_remote_input" />
</RadioGroup>
<Button
android:id="@+id/redaction_next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/next_label" />
</LinearLayout>
</com.android.setupwizardlib.SetupWizardLayout>
</com.android.setupwizardlib.GlifLayout>