Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only use padding for the multi-user empty state screens." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-07 14:11:01 +00:00
committed by Android (Google) Code Review
parent 4552718e95 3af1e867d3
commit 1f659da696
1 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
core/res/res/layout/resolver_empty_states.xml
View File

@@ -19,62 +19,66 @@
android:id="@+id/resolver_empty_state" android:id="@+id/resolver_empty_state"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:visibility="gone" android:visibility="gone"
android:paddingTop="48dp"
android:paddingBottom="48dp"
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp"> android:paddingEnd="24dp">
<ImageView <RelativeLayout
android:id="@+id/resolver_empty_state_icon" android:layout_width="match_parent"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/resolver_empty_state_title"
android:layout_below="@+id/resolver_empty_state_icon"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@string/config_headlineFontFamilyMedium" android:paddingTop="48dp"
android:textColor="@color/resolver_empty_state_text" android:paddingBottom="48dp"
android:textSize="14sp" android:gravity="center_horizontal">
android:layout_centerHorizontal="true" /> <ImageView
<TextView android:id="@+id/resolver_empty_state_icon"
android:id="@+id/resolver_empty_state_subtitle" android:layout_width="24dp"
android:layout_below="@+id/resolver_empty_state_title" android:layout_height="24dp"
android:layout_marginTop="4dp" android:layout_centerHorizontal="true" />
android:layout_width="wrap_content" <TextView
android:layout_height="wrap_content" android:id="@+id/resolver_empty_state_title"
android:textColor="@color/resolver_empty_state_text" android:layout_below="@+id/resolver_empty_state_icon"
android:textSize="12sp" android:layout_marginTop="8dp"
android:gravity="center_horizontal" android:layout_width="wrap_content"
android:layout_centerHorizontal="true" /> android:layout_height="wrap_content"
<Button android:fontFamily="@string/config_headlineFontFamilyMedium"
android:id="@+id/resolver_empty_state_button" android:textColor="@color/resolver_empty_state_text"
android:layout_below="@+id/resolver_empty_state_subtitle" android:textSize="14sp"
android:layout_marginTop="16dp" android:layout_centerHorizontal="true" />
android:text="@string/resolver_switch_on_work" <TextView
android:layout_width="wrap_content" android:id="@+id/resolver_empty_state_subtitle"
android:layout_height="wrap_content" android:layout_below="@+id/resolver_empty_state_title"
android:fontFamily="@string/config_headlineFontFamilyMedium" android:layout_marginTop="4dp"
android:textSize="14sp" android:layout_width="wrap_content"
android:textColor="?attr/colorAccent" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:textColor="@color/resolver_empty_state_text"
android:background="@drawable/resolver_turn_on_work_button_ripple_background"/> android:textSize="12sp"
<ProgressBar android:gravity="center_horizontal"
android:id="@+id/resolver_empty_state_progress" android:layout_centerHorizontal="true" />
style="@style/Widget.Material.Light.ProgressBar" <Button
android:visibility="gone" android:id="@+id/resolver_empty_state_button"
android:layout_width="wrap_content" android:layout_below="@+id/resolver_empty_state_subtitle"
android:layout_height="match_parent" android:layout_marginTop="16dp"
android:indeterminate="true" android:text="@string/resolver_switch_on_work"
android:layout_alignTop="@+id/resolver_empty_state_icon" android:layout_width="wrap_content"
android:layout_alignBottom="@+id/resolver_empty_state_button" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:fontFamily="@string/config_headlineFontFamilyMedium"
android:layout_below="@+id/resolver_empty_state_subtitle" android:textSize="14sp"
android:indeterminateTint="?attr/colorAccent"/> android:textColor="?attr/colorAccent"
android:layout_centerHorizontal="true"
android:background="@drawable/resolver_turn_on_work_button_ripple_background"/>
<ProgressBar
android:id="@+id/resolver_empty_state_progress"
style="@style/Widget.Material.Light.ProgressBar"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:indeterminate="true"
android:layout_alignTop="@+id/resolver_empty_state_icon"
android:layout_alignBottom="@+id/resolver_empty_state_button"
android:layout_centerHorizontal="true"
android:layout_below="@+id/resolver_empty_state_subtitle"
android:indeterminateTint="?attr/colorAccent"/>
</RelativeLayout>
<TextView android:id="@+id/empty" <TextView android:id="@+id/empty"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"