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

Merge "Remove inline suggestion styling API from the framework now that they are available in the support library"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-16 02:23:34 +00:00
committed by Android (Google) Code Review
parent fb4128e0dd 35d9d4468e
commit 4d07258e6f
8 changed files with 1 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -289,7 +289,7 @@ package android {
field public static final int allowBackup = 16843392; // 0x1010280
field public static final int allowClearUserData = 16842757; // 0x1010005
field public static final int allowEmbedded = 16843765; // 0x10103f5
field public static final int allowNativeHeapPointerTagging = 16844311; // 0x1010617
field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613
field public static final int allowParallelSyncs = 16843570; // 0x1010332
field public static final int allowSingleTap = 16843353; // 0x1010259
field public static final int allowTaskReparenting = 16843268; // 0x1010204
@@ -335,9 +335,6 @@ package android {
field public static final int autoUrlDetect = 16843404; // 0x101028c
field public static final int autoVerify = 16844014; // 0x10104ee
field public static final int autofillHints = 16844118; // 0x1010556
field public static final int autofillInlineSuggestionChip = 16844307; // 0x1010613
field public static final int autofillInlineSuggestionSubtitle = 16844309; // 0x1010615
field public static final int autofillInlineSuggestionTitle = 16844308; // 0x1010614
field public static final int autofilledHighlight = 16844136; // 0x1010568
field public static final int background = 16842964; // 0x10100d4
field public static final int backgroundDimAmount = 16842802; // 0x1010032
@@ -2260,7 +2257,6 @@ package android {
field public static final int ThemeOverlay_Material_Dialog = 16974550; // 0x10302d6
field public static final int ThemeOverlay_Material_Dialog_Alert = 16974551; // 0x10302d7
field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a
field public static final int Theme_AutofillInlineSuggestion = 16974565; // 0x10302e5
field public static final int Theme_Black = 16973832; // 0x1030008
field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a

1
api/system-current.txt
View File

@@ -257,7 +257,6 @@ package android {
public static final class R.attr {
field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600
field public static final int isAutofillInlineSuggestionTheme = 16844310; // 0x1010616
field public static final int isVrOnly = 16844152; // 0x1010578
field public static final int minExtensionVersion = 16844306; // 0x1010612
field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

69
core/res/res/layout/autofill_inline_suggestion.xml
View File

@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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"
style="?android:attr/autofillInlineSuggestionChip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/autofill_inline_suggestion_start_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:scaleType="fitCenter"
android:contentDescription="autofill_inline_suggestion_start_icon" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:orientation="vertical"
android:gravity="center">
<TextView
style="?android:attr/autofillInlineSuggestionTitle"
android:id="@+id/autofill_inline_suggestion_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"/>
<TextView
style="?android:attr/autofillInlineSuggestionSubtitle"
android:id="@+id/autofill_inline_suggestion_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"/>
</LinearLayout>
<ImageView
android:id="@+id/autofill_inline_suggestion_end_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:scaleType="fitCenter"
android:contentDescription="autofill_inline_suggestion_end_icon" />
</LinearLayout>

8
core/res/res/values/attrs.xml
View File

@@ -9207,12 +9207,4 @@
</declare-styleable>
<attr name="autoSizePresetSizes" />
<declare-styleable name="AutofillInlineSuggestion">
<!-- @hide @SystemApi -->
<attr name="isAutofillInlineSuggestionTheme" format="boolean" />
<attr name="autofillInlineSuggestionChip" format="reference" />
<attr name="autofillInlineSuggestionTitle" format="reference" />
<attr name="autofillInlineSuggestionSubtitle" format="reference" />
</declare-styleable>
</resources>

6
core/res/res/values/public.xml
View File

@@ -3012,11 +3012,6 @@
<public name="sdkVersion" />
<!-- @hide @SystemApi -->
<public name="minExtensionVersion" />
<public name="autofillInlineSuggestionChip" />
<public name="autofillInlineSuggestionTitle" />
<public name="autofillInlineSuggestionSubtitle" />
<!-- @hide @SystemApi -->
<public name="isAutofillInlineSuggestionTheme" />
<public name="allowNativeHeapPointerTagging" />
<public name="preserveLegacyExternalStorage" />
</public-group>
@@ -3025,7 +3020,6 @@
</public-group>
<public-group type="style" first-id="0x010302e5">
<public name="Theme.AutofillInlineSuggestion" />
</public-group>
<public-group type="id" first-id="0x0102004a">

16
core/res/res/values/styles.xml
View File

@@ -1482,22 +1482,6 @@ please see styles_device_defaults.xml.
<item name="android:windowExitAnimation">@anim/slide_out_down</item>
</style>
<!-- The style for the Autofill inline suggestion chip. -->
<!-- @hide -->
<style name="AutofillInlineSuggestionChip">
<item name="background">@drawable/autofill_dataset_picker_background</item>
</style>
<!-- @hide -->
<style name="AutofillInlineSuggestionTitle">
<item name="android:textAppearance">@style/TextAppearance</item>
</style>
<!-- @hide -->
<style name="AutofillInlineSuggestionSubtitle">
<item name="android:textAppearance">@style/TextAppearance.Small</item>
</style>
<!-- The style for the container of media actions in a notification. -->
<!-- @hide -->
<style name="NotificationMediaActionContainer">

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

@@ -3261,7 +3261,6 @@
<java-symbol type="layout" name="autofill_dataset_picker"/>
<java-symbol type="layout" name="autofill_dataset_picker_fullscreen"/>
<java-symbol type="layout" name="autofill_dataset_picker_header_footer"/>
<java-symbol type="layout" name="autofill_inline_suggestion" />
<java-symbol type="id" name="autofill" />
<java-symbol type="id" name="autofill_dataset_footer"/>
<java-symbol type="id" name="autofill_dataset_header"/>
@@ -3269,10 +3268,6 @@
<java-symbol type="id" name="autofill_dataset_list"/>
<java-symbol type="id" name="autofill_dataset_picker"/>
<java-symbol type="id" name="autofill_dataset_title" />
<java-symbol type="id" name="autofill_inline_suggestion_end_icon" />
<java-symbol type="id" name="autofill_inline_suggestion_start_icon" />
<java-symbol type="id" name="autofill_inline_suggestion_subtitle" />
<java-symbol type="id" name="autofill_inline_suggestion_title" />
<java-symbol type="id" name="autofill_save_custom_subtitle" />
<java-symbol type="id" name="autofill_save_icon" />
<java-symbol type="id" name="autofill_save_no" />

8
core/res/res/values/themes.xml
View File

@@ -892,12 +892,4 @@ please see themes_device_defaults.xml.
<item name="windowContentTransitions">false</item>
<item name="windowActivityTransitions">false</item>
</style>
<!-- Theme for the Autofill inline suggestion on IME -->
<style name="Theme.AutofillInlineSuggestion" parent="Theme.DeviceDefault">
<item name="isAutofillInlineSuggestionTheme">true</item>
<item name="autofillInlineSuggestionChip">@style/AutofillInlineSuggestionChip</item>
<item name="autofillInlineSuggestionTitle">@style/AutofillInlineSuggestionTitle</item>
<item name="autofillInlineSuggestionSubtitle">@style/AutofillInlineSuggestionSubtitle</item>
</style>
</resources>