f9ab8ea7bd
- 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
59 lines
2.1 KiB
XML
59 lines
2.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2017 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:id="@+id/instant_app_button_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
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">
|
|
<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_marginBottom="4dp"
|
|
android:text="@string/clear_instant_app_data"/>
|
|
</LinearLayout>
|