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

Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-08-16 23:17:57 +00:00
committed by Android (Google) Code Review
parent 22f95dbdc0 05deaf54cc
commit 08ca3cc7e8
3 changed files with 62 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
core/res/res/layout/autofill_save.xml
View File

@@ -14,94 +14,91 @@
limitations under the License.
-->
<!-- NOTE: outer layout is required to provide proper shadow. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/autofill_save"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:paddingTop="16dp"
android:elevation="32dp"
android:background="?android:attr/colorBackground"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/autofill_save"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_marginTop="32dp"
android:paddingTop="16dp"
android:elevation="32dp"
android:background="?android:attr/colorBackground"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical">
<TextView
android:id="@+id/autofill_save_title"
android:layout_width="0dp"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/autofill_save_title"
android:textSize="16sp"
android:textColor="?android:attr/textColorPrimary"
android:layout_weight="1">
</TextView>
android:orientation="horizontal">
<ImageView
android:id="@+id/autofill_save_close"
android:layout_width="wrap_content"
<TextView
android:id="@+id/autofill_save_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/autofill_save_title"
android:textSize="16sp"
android:textColor="?android:attr/textColorPrimary"
android:layout_weight="1">
</TextView>
</LinearLayout>
<com.android.server.autofill.ui.CustomScrollView
android:id="@+id/autofill_save_custom_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:src="@android:drawable/ic_close"
android:alpha="0.54"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@android:string/close_button_text">
</ImageView>
android:layout_marginTop="4dp"
android:visibility="gone"/>
</LinearLayout>
<com.android.server.autofill.ui.CustomScrollView
android:id="@+id/autofill_save_custom_subtitle"
android:layout_width="match_parent"
<com.android.internal.widget.ButtonBarLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:visibility="gone"/>
android:layout_gravity="end"
android:padding="16dp"
android:clipToPadding="false"
android:layout_weight="1"
android:orientation="horizontal">
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="invisible">
</Space>
<Button
android:id="@+id/autofill_save_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonBarButtonStyle"
android:text="@string/autofill_save_no">
</Button>
<Button
android:id="@+id/autofill_save_yes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.Material.Button.Colored"
android:text="@string/autofill_save_yes">
</Button>
</com.android.internal.widget.ButtonBarLayout>
</LinearLayout>
<com.android.internal.widget.ButtonBarLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:padding="16dp"
android:clipToPadding="false"
android:layout_weight="1"
android:orientation="horizontal">
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="invisible">
</Space>
<Button
android:id="@+id/autofill_save_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonBarButtonStyle"
android:text="@string/autofill_save_no">
</Button>
<Button
android:id="@+id/autofill_save_yes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.Material.Button.Colored"
android:text="@string/autofill_save_yes">
<requestFocus />
</Button>
</com.android.internal.widget.ButtonBarLayout>
</LinearLayout>

1
core/res/res/values/symbols.xml
View File

@@ -2900,7 +2900,6 @@
<java-symbol type="id" name="autofill_save_title" />
<java-symbol type="id" name="autofill_save_no" />
<java-symbol type="id" name="autofill_save_yes" />
<java-symbol type="id" name="autofill_save_close" />
<java-symbol type="string" name="autofill_error_cannot_autofill" />
<java-symbol type="string" name="autofill_picker_no_suggestions" />
<java-symbol type="plurals" name="autofill_picker_some_suggestions" />

3
services/autofill/java/com/android/server/autofill/ui/SaveUi.java
View File

@@ -209,9 +209,6 @@ final class SaveUi {
final View yesButton = view.findViewById(R.id.autofill_save_yes);
yesButton.setOnClickListener((v) -> mListener.onSave());
final View closeButton = view.findViewById(R.id.autofill_save_close);
closeButton.setOnClickListener(cancelListener);
mDialog = new Dialog(context, R.style.Theme_DeviceDefault_Light_Panel);
mDialog.setContentView(view);