Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e42d392d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NIU Actions: Hide button captions when feature is disabled" into sc-dev am: 2d12f205 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15276138

Change-Id: I605117ff22f5d7fe596eea00f9396e686052e07c
parents 38a6d462 2d12f205

go/quickstep/res/layout/overview_actions_container.xml

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
            android:layout_weight="1" />



        <LinearLayout

            android:id="@+id/layout_translate"

            style="@style/GoOverviewActionButtonContainer">

            <ImageButton

                android:id="@+id/action_translate"
@@ -46,10 +47,12 @@ 
        </LinearLayout>



        <Space

            android:id="@+id/spacer_translate"

            android:layout_width="@dimen/go_overview_button_container_margin"

            android:layout_height="1dp" />



        <LinearLayout

            android:id="@+id/layout_listen"

            style="@style/GoOverviewActionButtonContainer">

            <ImageButton

                android:id="@+id/action_listen"
@@ -63,10 +66,12 @@ 
        </LinearLayout>



        <Space

            android:id="@+id/spacer_listen"

            android:layout_width="@dimen/go_overview_button_container_margin"

            android:layout_height="1dp" />



        <LinearLayout

            android:id="@+id/layout_screenshot"

            style="@style/GoOverviewActionButtonContainer">

            <ImageButton

                android:id="@+id/action_screenshot"

go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java

+6 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.quickstep.views;



import static android.view.View.GONE;



import android.content.Context;

import android.util.AttributeSet;

import android.view.View;
@@ -54,11 +56,11 @@ public class GoOverviewActionsView extends OverviewActionsView<OverlayUICallback 
        if (getResources().getBoolean(R.bool.enable_niu_actions)) {

            findViewById(R.id.action_listen).setOnClickListener(this);

            findViewById(R.id.action_translate).setOnClickListener(this);

            findViewById(R.id.action_search).setOnClickListener(this);

        } else {

            findViewById(R.id.action_listen).setVisibility(View.GONE);

            findViewById(R.id.action_translate).setVisibility(View.GONE);

            findViewById(R.id.action_search).setVisibility(View.GONE);

            findViewById(R.id.layout_listen).setVisibility(GONE);

            findViewById(R.id.spacer_listen).setVisibility(GONE);

            findViewById(R.id.layout_translate).setVisibility(GONE);

            findViewById(R.id.spacer_translate).setVisibility(GONE);

        }

    }