Merge "Putting Overview Share button behind flag" into ub-launcher3-rvc-dev (065c84cb) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.quickstep.views;

		import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE;
		import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;

		import android.content.Context;
		@@ -92,8 +93,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		findViewById(R.id.action_share).setOnClickListener(this);
		View share = findViewById(R.id.action_share);
		share.setOnClickListener(this);
		findViewById(R.id.action_screenshot).setOnClickListener(this);
		if (ENABLE_OVERVIEW_SHARE.get()) {
		share.setVisibility(VISIBLE);
		findViewById(R.id.share_space).setVisibility(VISIBLE);
		}
		}

		/**

quickstep/res/layout/overview_actions_container.xml

+16 −13

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.android.quickstep.views.OverviewActionsView
		xmlns:android="http://schemas.android.com/apk/res/android"
		<com.android.quickstep.views.OverviewActionsView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="@dimen/overview_actions_height"
		android:layout_gravity="center_horizontal\|bottom"
		@@ -28,38 +27,42 @@
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="horizontal">

		<Space
		android:layout_width="0dp"
		android:layout_height="1dp"
		android:layout_weight="1" >
		</Space>
		android:layout_weight="1" />

		<Button
		android:id="@+id/action_screenshot"
		android:theme="@style/ThemeControlHighlightWorkspaceColor"
		style="@style/OverviewActionButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawableTop="@drawable/ic_screenshot"
		android:text="@string/action_screenshot" />
		android:text="@string/action_screenshot"
		android:theme="@style/ThemeControlHighlightWorkspaceColor" />

		<Space
		android:layout_width="0dp"
		android:layout_height="1dp"
		android:layout_weight="1" >
		</Space>
		android:layout_weight="1" />

		<Button
		android:id="@+id/action_share"
		android:theme="@style/ThemeControlHighlightWorkspaceColor"
		style="@style/OverviewActionButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawableTop="@drawable/ic_share"
		android:text="@string/action_share" />
		android:text="@string/action_share"
		android:theme="@style/ThemeControlHighlightWorkspaceColor"
		android:visibility="gone" />

		<Space
		android:id="@+id/share_space"
		android:layout_width="0dp"
		android:layout_height="1dp"
		android:layout_weight="1" >
		</Space>
		android:layout_weight="1"
		android:visibility="gone" />
		</LinearLayout>

		</com.android.quickstep.views.OverviewActionsView>
		No newline at end of file

src/com/android/launcher3/config/FeatureFlags.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,9 @@ public final class FeatureFlags {
		public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag(
		"ENABLE_OVERVIEW_SELECTIONS", true, "Show Select Mode button in Overview Actions");

		public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
		"ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");

		public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(
		"ENABLE_DATABASE_RESTORE", true,
		"Enable database restore when new restore session is created");