openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NIU Actions: Hide button captions when feature is disabled 

Previously, only the buttons themselves were hidden when the feature was flagged off at build time. This adds the rest of the relevant layout UI (captions, spaces) to that logic.

Bug: 192692326
Test: Manual (Pixel 3A, enable_niu_actions on and off)
Change-Id: Ic58d9891887e3e0eb10d38af80b73f04cf66ea79
This commit is contained in:
Jon Spivack 2021-07-13 13:54:02 -07:00
parent ccd3026485
commit de28038e64
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
go/quickstep/res/layout/overview_actions_container.xml
View File

@ -34,6 +34,7 @@
android:layout_weight="1" /> android:layout_weight="1" />
<LinearLayout <LinearLayout
android:id="@+id/layout_translate"
style="@style/GoOverviewActionButtonContainer"> style="@style/GoOverviewActionButtonContainer">
<ImageButton <ImageButton
android:id="@+id/action_translate" android:id="@+id/action_translate"
@ -46,10 +47,12 @@
</LinearLayout> </LinearLayout>
<Space <Space
android:id="@+id/spacer_translate"
android:layout_width="@dimen/go_overview_button_container_margin" android:layout_width="@dimen/go_overview_button_container_margin"
android:layout_height="1dp" /> android:layout_height="1dp" />
<LinearLayout <LinearLayout
android:id="@+id/layout_listen"
style="@style/GoOverviewActionButtonContainer"> style="@style/GoOverviewActionButtonContainer">
<ImageButton <ImageButton
android:id="@+id/action_listen" android:id="@+id/action_listen"
@ -63,10 +66,12 @@
</LinearLayout> </LinearLayout>
<Space <Space
android:id="@+id/spacer_listen"
android:layout_width="@dimen/go_overview_button_container_margin" android:layout_width="@dimen/go_overview_button_container_margin"
android:layout_height="1dp" /> android:layout_height="1dp" />
<LinearLayout <LinearLayout
android:id="@+id/layout_screenshot"
style="@style/GoOverviewActionButtonContainer"> style="@style/GoOverviewActionButtonContainer">
<ImageButton <ImageButton
android:id="@+id/action_screenshot" android:id="@+id/action_screenshot"

10
go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
View File

@ -16,6 +16,8 @@
package com.android.quickstep.views; package com.android.quickstep.views;
import static android.view.View.GONE;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@ -54,11 +56,11 @@ public class GoOverviewActionsView extends OverviewActionsView<OverlayUICallback
if (getResources().getBoolean(R.bool.enable_niu_actions)) { if (getResources().getBoolean(R.bool.enable_niu_actions)) {
findViewById(R.id.action_listen).setOnClickListener(this); findViewById(R.id.action_listen).setOnClickListener(this);
findViewById(R.id.action_translate).setOnClickListener(this); findViewById(R.id.action_translate).setOnClickListener(this);
findViewById(R.id.action_search).setOnClickListener(this);
} else { } else {
findViewById(R.id.action_listen).setVisibility(View.GONE); findViewById(R.id.layout_listen).setVisibility(GONE);
findViewById(R.id.action_translate).setVisibility(View.GONE); findViewById(R.id.spacer_listen).setVisibility(GONE);
findViewById(R.id.action_search).setVisibility(View.GONE); findViewById(R.id.layout_translate).setVisibility(GONE);
findViewById(R.id.spacer_translate).setVisibility(GONE);
} }
} }