Snap for 5354487 from 3ab55d42a7dd5c7f23297e670bcddc30073ce6a0 to qt-release
Change-Id: I55523302d8a719302ebbe4a1f97d22d45e637804
diff --git a/Android.bp b/Android.bp
index 5688407..c583244 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,54 +13,19 @@
// limitations under the License.
java_library_static {
- name: "launcher-log-proto-nano",
- proto: {
- type: "nano",
- output_params: [
- "store_unknown_fields=true",
- "enum_style=java",
- ],
- local_include_dirs: [
- "protos",
- "proto_overrides",
- ],
- },
- srcs: [
- "protos/**/*.proto",
- "proto_overrides/**/*.proto",
- ],
-}
-
-android_library{
name: "launcher-aosp-tapl",
static_libs: [
"androidx.annotation_annotation",
- "androidx.dynamicanimation_dynamicanimation",
- "androidx.recyclerview_recyclerview",
- "androidx.preference_preference",
"androidx.test.runner",
"androidx.test.rules",
"androidx.test.uiautomator_uiautomator",
- "iconloader_base",
- "launcher-log-proto-nano",
- "launcherprotosnano",
"SystemUISharedLib",
],
srcs: [
"tests/tapl/**/*.java",
- "quickstep/src/**/*.java",
- "quickstep/recents_ui_overrides/src/**/*.java",
- "src/**/*.java",
- "src_build_config/**/*.java",
- "src_flags/**/*.java",
- "src_plugins/**/*.java",
- "src_shortcuts_overrides/**/*.java",
- ],
- dxflags: ["--multi-dex"],
- resource_dirs: [
- "res",
- "quickstep/res",
- "quickstep/recents_ui_overrides/res",
+ "quickstep/src/com/android/quickstep/SwipeUpSetting.java",
+ "src/com/android/launcher3/util/SecureSettingsObserver.java",
+ "src/com/android/launcher3/TestProtocol.java",
],
platform_apis: true,
}
diff --git a/res/drawable/horizontal_ellipsis.xml b/res/drawable/horizontal_ellipsis.xml
index ad08529..65e958d 100644
--- a/res/drawable/horizontal_ellipsis.xml
+++ b/res/drawable/horizontal_ellipsis.xml
@@ -22,6 +22,6 @@
android:tint="?android:attr/textColorSecondary" >
<path
- android:pathData="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"
+ android:pathData="M6 10c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2zm12 0c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2zm-6 0c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2z"
android:fillColor="@android:color/white" />
</vector>
\ No newline at end of file