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

Commit 31a37ed7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev

parents 3bb43660 ad79049c

packages/SystemUI/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ 
    <!-- The tiles to display in QuickSettings -->

    <string name="quick_settings_tiles" translatable="false">default</string>



    <!-- The tiles to display in QuickSettings in retail mode -->

    <string name="quick_settings_tiles_retail_mode" translatable="false">

        cell,battery,dnd,flashlight,rotation,location

    </string>



    <!-- Whether or not the RSSI tile is capitalized or not. -->

    <bool name="quick_settings_rssi_tile_capitalization">true</bool>

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.HandlerThread; 
import android.os.Looper;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings.Secure;

import android.text.TextUtils;
@@ -320,6 +321,9 @@ public class QSTileHost implements QSTile.Host, Tunable { 
            return;

        }

        if (DEBUG) Log.d(TAG, "Recreating tiles");

        if (newValue == null && UserManager.isDeviceInDemoMode(mContext)) {

            newValue = mContext.getResources().getString(R.string.quick_settings_tiles_retail_mode);

        }

        final List<String> tileSpecs = loadTileSpecs(mContext, newValue);

        int currentUser = ActivityManager.getCurrentUser();

        if (tileSpecs.equals(mTileSpecs) && currentUser == mCurrentUser) return;

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.content.res.Configuration;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.RippleDrawable;

import android.os.UserManager;

import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;
@@ -283,8 +284,10 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
                ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

                TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE);

        mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers()

        final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);

        mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers() && !isDemo

                ? View.VISIBLE : View.INVISIBLE);

        mEdit.setVisibility(isDemo ? View.INVISIBLE : View.VISIBLE);

    }



    private void updateListeners() {