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

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

Merge "Allow QS detail panels to change text of settings button" into sc-dev am: d1f955b2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13975047

Change-Id: I514ddf0bfb73f0718f9b21bf16e1f4aeb7531459
parents 93c91b58 d1f955b2

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/DetailAdapter.java

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package com.android.systemui.plugins.qs; 


import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.view.View;

import android.view.ViewGroup;
@@ -34,7 +35,22 @@ public interface DetailAdapter { 
    }



    View createDetailView(Context context, View convertView, ViewGroup parent);



    /**

     * @return intent for opening more settings related to this detail panel. If null, the more

     * settings button will not be shown

     */

    Intent getSettingsIntent();



    /**

     * @return resource id of the string to use for opening the settings intent. If

     * {@code Resources.ID_NULL}, then use the default string:

     * {@code com.android.systemui.R.string.quick_settings_more_settings}

     */

    default int getSettingsText() {

        return Resources.ID_NULL;

    }



    void setToggleState(boolean state);

    int getMetricsCategory();

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -889,6 +889,8 @@ 
    <string name="quick_settings_color_space_label">Color correction mode</string>

    <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_more_settings">More settings</string>

    <!-- QuickSettings: Control panel: Label for button that navigates to user settings. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_more_user_settings">User settings</string>

    <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_done">Done</string>

    <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/QSDetail.java

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.drawable.Animatable;

import android.util.AttributeSet;

import android.util.SparseArray;
@@ -140,7 +141,10 @@ public class QSDetail extends LinearLayout { 


    private void updateDetailText() {

        mDetailDoneButton.setText(R.string.quick_settings_done);

        mDetailSettingsButton.setText(R.string.quick_settings_more_settings);

        final int resId =

                mDetailAdapter != null ? mDetailAdapter.getSettingsText() : Resources.ID_NULL;

        mDetailSettingsButton.setText(

                (resId != Resources.ID_NULL) ? resId : R.string.quick_settings_more_settings);

    }



    public void updateResources() {
@@ -218,6 +222,7 @@ public class QSDetail extends LinearLayout { 
            mQsPanelController.setGridContentVisibility(true);

            mQsPanelCallback.onScanStateChanged(false);

        }

        updateDetailText();

        sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);



        if (mShouldAnimate) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+5 −0
Original line number Diff line number Diff line
@@ -821,6 +821,11 @@ public class UserSwitcherController implements Dumpable { 
            return USER_SETTINGS_INTENT;

        }



        @Override

        public int getSettingsText() {

            return R.string.quick_settings_more_user_settings;

        }



        @Override

        public Boolean getToggleState() {

            return null;