Merging from ub-launcher3-master @ build 6356169 am: df83c9026d (789deeff) · Commits · e / os / android_packages_apps_Trebuchet

AndroidManifest-common.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -137,14 +137,6 @@
		</intent-filter>
		</activity>

		<!--
		Should point to the content provider which can be used to dump Launcher3 compatible
		worspace configuration to the dump's file descriptor by using launcher_dump.proto
		-->
		<meta-data
		android:name="com.android.launcher3.launcher_dump_provider"
		android:value="com.android.launcher3.LauncherProvider" />

		<!--
		The settings provider contains Home's data, like the workspace favorites. The permissions
		should be changed to what is defined above. The authorities should also be changed to

protos/launcher_atom.proto

0 → 100644

+108 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/
		syntax = "proto2";

		option java_package = "com.android.launcher3.logger";
		option java_outer_classname = "LauncherAtom";

		//
		// ItemInfos
		message ItemInfo {
		oneof Item {
		Application application = 1;
		Task task= 2;
		Shortcut shortcut = 3;
		Widget widget = 4;
		}
		// When used for launch event, stores the global predictive rank
		optional int32 rank = 5;

		// Stores whether the Item belows to non primary user
		optional bool is_work = 6;

		// Item can be child node to parent container or parent containers (nested)
		oneof Container {
		WorkspaceContainer workspace = 7;
		HotseatContainer hotseat = 8;
		FolderContainer folder = 9;
		}
		// Stores the origin of the Item
		optional Origin source = 10;
		}

		enum Origin {
		UNKNOWN = 0;
		DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat
		BACKUP_RESTORE = 2; // icon layout restored from backup
		PINITEM = 3; // from another app (e.g., Chrome's "Add to Home screen")
		ALLAPPS_ATOZ = 4; // within launcher surface, all aps a-z
		WIDGETS = 5; // within launcher, widgets tray
		ADD_TO_HOMESCREEN = 6; // play install + launcher home setting
		ALLAPPS_PREDICTION = 7; // from prediction bar in all apps container
		HOTSEAT_PREDICTION = 8; // from prediction bar in hotseat container
		}

		// Main app icons
		message Application {
		optional string package_name = 1;
		optional string component_name = 2;
		}

		// Legacy shortcuts and shortcuts handled by ShortcutManager
		message Shortcut {
		optional string shortcut_name = 1;
		}

		// AppWidgets handled by AppWidgetManager
		message Widget {
		optional int32 span_x = 1;
		optional int32 span_y = 2;
		optional int32 app_widget_id = 3;
		optional string package_name = 4; // only populated during snapshot if from workspace
		optional string component_name = 5; // only populated during snapshot if from workspace
		}

		// Tasks handled by PackageManager
		message Task {
		optional string package_name = 1;
		optional string component_name = 2;
		optional int32 index = 3;
		}

		//////////////////////////////////////////////
		// Containers

		message WorkspaceContainer {
		optional int32 page_index = 1; // range [-1, l], 0 is the index of the main homescreen
		optional int32 grid_x = 2; // [0, m], m varies based on the display density and resolution
		optional int32 grid_y = 3; // [0, n], n varies based on the display density and resolution
		}

		message HotseatContainer {
		optional int32 index = 1;
		}

		message FolderContainer {
		optional int32 page_index = 1;
		optional int32 grid_x = 2;
		optional int32 grid_y = 3;
		oneof Container {
		WorkspaceContainer workspace = 4;
		HotseatContainer hotseat = 5;
		}
		}

protos/launcher_dump.proto

deleted100644 → 0

+0 −75

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/
		syntax = "proto2";

		option java_package = "com.android.launcher3.model";
		option java_outer_classname = "LauncherDumpProto";

		package model;

		message DumpTarget {
		enum Type {
		NONE = 0;
		ITEM = 1;
		CONTAINER = 2;
		}

		optional Type type = 1;
		optional int32 page_id = 2;
		optional int32 grid_x = 3;
		optional int32 grid_y = 4;

		// For container types only
		optional ContainerType container_type = 5;

		// For item types only
		optional ItemType item_type = 6;

		optional string package_name = 7; // All ItemTypes except UNKNOWN type
		optional string component = 8; // All ItemTypes except UNKNOWN type
		optional string item_id = 9; // For Pinned Shortcuts and appWidgetId

		optional int32 span_x = 10 [default = 1];// Used for ItemType.WIDGET
		optional int32 span_y = 11 [default = 1];// Used for ItemType.WIDGET
		optional UserType user_type = 12;
		}

		// Used to define what type of item a Target would represent.
		enum ItemType {
		UNKNOWN_ITEMTYPE = 0; // Launcher specific items
		APP_ICON = 1; // Regular app icons
		WIDGET = 2; // Elements from AppWidgetManager
		SHORTCUT = 3; // ShortcutManager
		}

		// Used to define what type of container a Target would represent.
		enum ContainerType {
		UNKNOWN_CONTAINERTYPE = 0;
		WORKSPACE = 1;
		HOTSEAT = 2;
		FOLDER = 3;
		}

		// Used to define what type of control a Target would represent.
		enum UserType {
		DEFAULT = 0;
		WORK = 1;
		}

		// Main message;
		message LauncherImpression {
		repeated DumpTarget targets = 1;
		}

quickstep/AndroidManifest.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,17 @@
		</intent-filter>
		</provider>

		<!-- FileProvider used for sharing images. -->
		<provider
		android:name="androidx.core.content.FileProvider"
		android:authorities="${packageName}.overview.fileprovider"
		android:exported="false"
		android:grantUriPermissions="true">
		<meta-data
		android:name="android.support.FILE_PROVIDER_PATHS"
		android:resource="@xml/overview_file_provider_paths" />
		</provider>

		<service
		android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
		tools:node="remove" />

quickstep/recents_ui_overrides/res/values/dimens.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -31,9 +31,6 @@
		<dimen name="all_apps_label_top_padding">16dp</dimen>
		<dimen name="all_apps_label_bottom_padding">8dp</dimen>
		<dimen name="all_apps_label_text_size">14sp</dimen>
		<dimen name="all_apps_tip_bottom_margin">8dp</dimen>
		<!-- The size of corner radius of the arrow in the arrow toast. -->
		<dimen name="arrow_toast_corner_radius">2dp</dimen>

		<!-- Minimum distance to swipe to trigger accessibility gesture -->
		<dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>