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

Commit e9077748 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Added logs to trace device provisioning and QS not expanding 

Test: build
Bug: 123740529
Bug: 129405675
Change-Id: Ieb7ffb0c339ba3e7cf5a5a458cb8ffc4cbeb2535
parent 6f59ef8a

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

+8 −2
Original line number Diff line number Diff line
@@ -433,6 +433,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
        public void onUserSetupChanged() {

            final boolean userSetup = mDeviceProvisionedController.isUserSetup(

                    mDeviceProvisionedController.getCurrentUser());

            // STOPSHIP(kozynski, b/129405675) Remove log

            Log.d(TAG, "mUserSetupObserver - DeviceProvisionedListener called for user "

                    + mDeviceProvisionedController.getCurrentUser());

            if (MULTIUSER_DEBUG) {

                Log.d(TAG, String.format("User setup changed: userSetup=%s mUserSetup=%s",

                        userSetup, mUserSetup));
@@ -1293,13 +1296,16 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * the user intends to use the lock screen user switcher, QS in not needed.

     */

    private void updateQsExpansionEnabled() {

        mNotificationPanel.setQsExpansionEnabled(mDeviceProvisionedController.isDeviceProvisioned()

        final boolean expandEnabled = mDeviceProvisionedController.isDeviceProvisioned()

                && (mUserSetup || mUserSwitcherController == null

                        || !mUserSwitcherController.isSimpleUserSwitcher())

                && ((mDisabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0)

                && ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)

                && !mDozing

                && !ONLY_CORE_APPS);

                && !ONLY_CORE_APPS;

        mNotificationPanel.setQsExpansionEnabled(expandEnabled);

        // STOPSHIP(kozynski, b/129405675) Remove log

        Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);

    }



    public void addQsTile(ComponentName tile) {

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

+5 −1
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Handler;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.os.Handler;

import android.util.Log;



import com.android.systemui.settings.CurrentUserTracker;
@@ -39,6 +40,7 @@ import javax.inject.Singleton; 
public class DeviceProvisionedControllerImpl extends CurrentUserTracker implements

        DeviceProvisionedController {



    private static final String TAG = DeviceProvisionedControllerImpl.class.getSimpleName();

    private final ArrayList<DeviceProvisionedListener> mListeners = new ArrayList<>();

    private final ContentResolver mContentResolver;

    private final Context mContext;
@@ -59,6 +61,8 @@ public class DeviceProvisionedControllerImpl extends CurrentUserTracker implemen 
        mSettingsObserver = new ContentObserver(mainHandler) {

            @Override

            public void onChange(boolean selfChange, Uri uri, int userId) {

                // STOPSHIP(kozynski, b/129405675) Remove log

                Log.d(TAG, "Setting change: " + uri);

                if (mUserSetupUri.equals(uri)) {

                    notifySetupChanged();

                } else {