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

Commit 8b8a0451 authored by Bryce Lee's avatar Bryce Lee Committed by Android Git Automerger
Browse files

am 8bc23e82: Merge "Add Assist global action for wear to different from... 

am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev

* commit '8bc23e82':
  Add Assist global action for wear to different from VOICE_ASSIST
parents 23c7cef2 8bc23e82

core/res/res/values-watch/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


    <!-- Only show settings item due to smaller real estate. -->

    <string-array translatable="false" name="config_globalActionsList">

        <item>voiceassist</item>

        <item>assist</item>

    </string-array>



    <!-- Base "touch slop" value used by ViewConfiguration as a

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -482,6 +482,9 @@ 
    <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->

    <string name="global_action_settings">Settings</string>



    <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->

    <string name="global_action_assist">Assist</string>



    <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->

    <string name="global_action_voice_assist">Voice Assist</string>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,7 @@ 
  <java-symbol type="string" name="global_action_toggle_silent_mode" />

  <java-symbol type="string" name="global_action_lockdown" />

  <java-symbol type="string" name="global_action_voice_assist" />

  <java-symbol type="string" name="global_action_assist" />

  <java-symbol type="string" name="invalidPuk" />

  <java-symbol type="string" name="lockscreen_carrier_default" />

  <java-symbol type="style" name="Animation.LockScreen" />
@@ -1611,6 +1612,7 @@ 
  <java-symbol type="drawable" name="ic_menu_refresh" />

  <java-symbol type="drawable" name="ic_settings" />

  <java-symbol type="drawable" name="ic_voice_search" />

  <java-symbol type="drawable" name="ic_action_assist_focused" />

  <java-symbol type="drawable" name="stat_notify_car_mode" />

  <java-symbol type="drawable" name="stat_notify_disabled_data" />

  <java-symbol type="drawable" name="stat_notify_disk_full" />

policy/src/com/android/internal/policy/impl/GlobalActions.java

+25 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
    private static final String GLOBAL_ACTION_KEY_SETTINGS = "settings";

    private static final String GLOBAL_ACTION_KEY_LOCKDOWN = "lockdown";

    private static final String GLOBAL_ACTION_KEY_VOICEASSIST = "voiceassist";

    private static final String GLOBAL_ACTION_KEY_ASSIST = "assist";



    private final Context mContext;

    private final WindowManagerFuncs mWindowManagerFuncs;
@@ -294,6 +295,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
                mItems.add(getLockdownAction());

            } else if (GLOBAL_ACTION_KEY_VOICEASSIST.equals(actionKey)) {

                mItems.add(getVoiceAssistAction());

            } else if (GLOBAL_ACTION_KEY_ASSIST.equals(actionKey)) {

                mItems.add(getAssistAction());

            } else {

                Log.e(TAG, "Invalid global action key " + actionKey);

            }
@@ -439,6 +442,28 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
        };

    }



    private Action getAssistAction() {

        return new SinglePressAction(com.android.internal.R.drawable.ic_action_assist_focused,

                R.string.global_action_assist) {

            @Override

            public void onPress() {

                Intent intent = new Intent(Intent.ACTION_ASSIST);

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

                mContext.startActivity(intent);

            }



            @Override

            public boolean showDuringKeyguard() {

                return true;

            }



            @Override

            public boolean showBeforeProvisioning() {

                return true;

            }

        };

    }



    private Action getVoiceAssistAction() {

        return new SinglePressAction(com.android.internal.R.drawable.ic_voice_search,

                R.string.global_action_voice_assist) {