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

Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev

Browse Source 
am: eef9dbcdb9

Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d
This commit is contained in:
Fan Zhang
2016-07-01 18:31:18 +00:00
committed by android-build-merger
parent 19aa60b67a eef9dbcdb9
commit 0e2e738400
8 changed files with 233 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
res/layout/support_escalation_options.xml
View File

@@ -17,51 +17,71 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SupportEscalationCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_background_grey"
android:gravity="center_horizontal"
android:paddingBottom="40dp">
<LinearLayout
android:layout_width="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tile_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@android:id/text1"
style="@style/SupportPrimaryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"/>
<TextView
android:id="@+id/summary1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:textAppearance="@style/TextAppearance.SupportTitle"/>
<TextView
android:id="@+id/tile_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@android:id/text2"
style="@style/SupportPrimaryButton"
android:paddingTop="8dp"
android:paddingBottom="30dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"/>
<TextView
android:id="@+id/summary2"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@android:id/text1"
style="@style/SupportPrimaryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"/>
<TextView
android:id="@+id/summary1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@android:id/text2"
style="@style/SupportPrimaryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"/>
<TextView
android:id="@+id/summary2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

42
res/layout/support_item_title.xml
View File

@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_background_grey"
android:paddingTop="40dp"
android:paddingBottom="42dp"
android:paddingStart="56dp"
android:paddingEnd="56dp"
android:orientation="vertical">
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.SupportTitle"/>
<TextView
android:id="@android:id/text2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingTop="8dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>

21
res/layout/support_offline_escalation_options.xml
View File

@@ -17,13 +17,25 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SupportEscalationCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_background_grey"
android:gravity="center_horizontal"
android:paddingBottom="40dp"
android:orientation="vertical">
<TextView
android:id="@+id/tile_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.SupportTitle"/>
<TextView
android:id="@+id/tile_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingTop="8dp"
android:paddingBottom="10dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -31,6 +43,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="8dp"
android:text="@string/support_country_list_title"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>

18
res/layout/support_sign_in_button.xml
View File

@@ -17,11 +17,25 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SupportEscalationCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_background_grey"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tile_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.SupportTitle"/>
<TextView
android:id="@+id/tile_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingTop="8dp"
android:paddingBottom="30dp"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary"/>
<Button
android:id="@android:id/text1"
style="@style/SupportPrimaryButton"

2
res/layout/support_tile.xml
View File

@@ -31,7 +31,7 @@
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
<TextView
android:id="@android:id/text1"
android:id="@+id/tile_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"