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

Merge "Apply new action buttons style for instant app"

Browse Source
This commit is contained in:
Fan Zhang
2018-11-19 18:59:29 +00:00
committed by Android (Google) Code Review
parent 84a1acbcc7 787cfb34c8
commit 1f8e60b1c5
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
res/layout/instant_app_buttons.xml
View File

@@ -20,44 +20,48 @@
android:id="@+id/instant_app_button_container" android:id="@+id/instant_app_button_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:paddingStart="8dp"
android:paddingTop="24dp" android:paddingEnd="8dp">
android:paddingStart="68dp"
android:paddingEnd="24dp"
android:orientation="horizontal">
<FrameLayout <FrameLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
android:id="@+id/install" android:id="@+id/install"
style="@style/ActionPrimaryButton" style="@style/SettingsActionButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:paddingTop="20dp"
android:text="@string/install_text"/> android:paddingBottom="20dp"
android:text="@string/install_text"
android:drawableTop="@drawable/ic_settings_install"/>
<Button <Button
android:id="@+id/launch" android:id="@+id/launch"
style="@style/ActionPrimaryButton" style="@style/SettingsActionButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:paddingTop="20dp"
android:text="@string/launch_instant_app"/> android:paddingBottom="20dp"
android:text="@string/launch_instant_app"
android:drawableTop="@drawable/ic_settings_open"/>
</FrameLayout> </FrameLayout>
<Space <Space
android:layout_width="16dp" android:layout_width="8dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<FrameLayout
<Button
android:id="@+id/clear_data"
style="@style/SettingsActionButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:paddingTop="20dp"
<Button android:paddingBottom="20dp"
android:id="@+id/clear_data" android:text="@string/clear_instant_app_data"
style="@style/ActionSecondaryButton" android:drawableTop="@drawable/ic_settings_delete"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="@string/clear_instant_app_data"/>
</FrameLayout>
</LinearLayout> </LinearLayout>