diff options
author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-07 13:43:59 +0100 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-07 13:43:59 +0100 |
commit | 0007a046cf4f4bfed563aa52ffab9ec5e94ee6f0 (patch) | |
tree | 2bc4acf2f54df560a34dcc7b7844d9d18cc58131 /res/values | |
parent | 744d192669a148bde24d36bef02deb05c2f7a1fa (diff) | |
parent | 02826bbe04d9dc1e6111f5d6ffd8706ac1f8f908 (diff) | |
download | android_packages_apps_Trebuchet-0007a046cf4f4bfed563aa52ffab9ec5e94ee6f0.tar.gz android_packages_apps_Trebuchet-0007a046cf4f4bfed563aa52ffab9ec5e94ee6f0.tar.bz2 android_packages_apps_Trebuchet-0007a046cf4f4bfed563aa52ffab9ec5e94ee6f0.zip |
Merge tag 'android-10.0.0_r31' into HEAD
Android 10.0.0 release 31
* tag 'android-10.0.0_r31': (218 commits)
Increase drag distance threshold when drag starts from deep press
Fix shortcut componentname in workspace layout logging
Fix shortcut componentname in workspace layout logging
perform accessbility focus when the recyclerview doesn't gain focus after fragment replacement in SettingsActivity
Persist predicted items when dragged to workspace
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Align badging logic with platform IconDrawableFactory.
Fix bug where icon remains invisible after returning home.
Fix quick switch from home biased towards returning home
Fix recents scale sometimes lagging behind window scale
Fix folder open/close animation when grid size is small.
fix custom shortcut test
Improve quick switch from home by tracking both x and y motion
Move shelf peeking anim code to ShelfPeekAnim class
Fix folder available height calculation
Tapl: AllApps: ensuring a minimal vertical size of an icon
Enable a11y scrolling with item drag
disable custom shortcut test in oop
include predicted_rank in app launch logging
...
Change-Id: Id824c350cd133c4c8fa91de0f8793faed9003393
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 16 | ||||
-rw-r--r-- | res/values/strings.xml | 5 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 7 insertions, 18 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 69b8c8a22..de17eb7b4 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -115,7 +115,6 @@ <attr name="numFolderColumns" format="integer" /> <!-- numHotseatIcons defaults to numColumns, if not specified --> <attr name="numHotseatIcons" format="integer" /> - <attr name="defaultLayoutId" format="reference" /> <attr name="demoModeLayoutId" format="reference" /> </declare-styleable> @@ -152,21 +151,6 @@ <attr name="canThumbDetach" format="boolean" /> </declare-styleable> - <declare-styleable name="CustomAppWidgetProviderInfo"> - <attr name="providerId" format="integer" /> - - <attr name="android:label" /> - <attr name="android:initialLayout" /> - <attr name="android:icon" /> - <attr name="android:previewImage" /> - <attr name="android:resizeMode" /> - - <attr name="numRows" /> - <attr name="numColumns" /> - <attr name="numMinRows" format="integer" /> - <attr name="numMinColumns" format="integer" /> - </declare-styleable> - <declare-styleable name="PreviewFragment"> <attr name="android:name" /> <attr name="android:id" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 13e096c95..9d9c2e8de 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -23,8 +23,6 @@ <!-- Application name --> <string name="app_name">Launcher3</string> - <!-- Default folder name --> - <string name="folder_name"></string> <!-- Work folder name --> <string name="work_folder_name">Work</string> <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]--> @@ -105,6 +103,9 @@ <!-- Label for install drop target. [CHAR_LIMIT=20] --> <string name="install_drop_target_label">Install</string> + <!-- Label for install dismiss prediction. --> + <string translatable="false" name="dismiss_prediction_label">Dismiss prediction</string> + <!-- Permissions: --> <skip /> <!-- Permission short label --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 339aef5b6..80c791c58 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -130,6 +130,10 @@ <item name="widgetsTheme">@style/WidgetContainerTheme</item> </style> + <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings"> + <item name="android:navigationBarColor">@android:color/transparent</item> + </style> + <!-- Theme overrides to element on homescreen, i.e., which are drawn on top on wallpaper. Various foreground colors are overridden to be workspaceTextColor so that they are properly |