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

Add Open button to launch instant app.

Browse Source 
- move logic from InstantAppButtonsController into
InstantAppButtonsPreferenceController, as it is not really necessary to
have separate control to be in different class.
- add logic to check if the instant app provides a default launch uri.
If so, show a Open button to launch the uri, and move the Install
button into option menu. If not, Install button remains as is.
- also update the instant app button layout to match the regular 2
buttons layout.

Change-Id: Ibcae780ad697ca93a48604b03c8f4600dd3c0472
Fixes: 69562807
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2018-02-20 13:36:40 -08:00
parent c85e701b3d
commit f9ab8ea7bd
8 changed files with 350 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
res/layout/instant_app_buttons.xml
View File

@@ -20,24 +20,39 @@
android:id="@+id/instant_app_button_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:visibility="gone">
<Button
android:id="@+id/install"
style="@style/ActionPrimaryButton"
android:enabled="false"
android:gravity="center"
android:paddingTop="24dp"
android:paddingStart="68dp"
android:paddingEnd="24dp"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/install_text"/>
android:layout_height="wrap_content">
<Button
android:id="@+id/install"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="@string/install_text"/>
<Button
android:id="@+id/launch"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="@string/launch_instant_app"/>
</FrameLayout>
<Space
android:layout_width="16dp"
android:layout_height="wrap_content" />
<Button
android:id="@+id/clear_data"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="4dp"
android:text="@string/clear_instant_app_data"/>
</LinearLayout>