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

Commit 21161a34 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

QuickSettings : Cleanup 

Change-Id: I044f8c0914c725af5894ffb70e8ac54b6e19dc43

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java
parent 3a2105fb

packages/SystemUI/src/com/android/systemui/quicksettings/NfcTile.java

+9 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.android.systemui.quicksettings; 
import android.content.Context;

import android.content.Intent;

import android.nfc.NfcAdapter;

import android.nfc.NfcManager;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;
@@ -23,7 +24,7 @@ public class NfcTile extends QuickSettingsTile { 
            QuickSettingsController qsc) {

        super(context, inflater, container, qsc);



        setTileState(NFC_ADAPTER_UNKNOWN);

        setTileState(getNfcState());



        mOnClick = new View.OnClickListener() {

            @Override
@@ -90,11 +91,13 @@ public class NfcTile extends QuickSettingsTile { 
    }



    private int getNfcState() {

        if (mNfcAdapter != null || (mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext)) != null) {

            return mNfcAdapter.getAdapterState();

        } else {

            Log.d(TAG, "No NFC adapter available");

        if (mNfcAdapter == null) {

            try {

                mNfcAdapter = NfcAdapter.getNfcAdapter(mContext);

            } catch (UnsupportedOperationException e) {

                return NFC_ADAPTER_UNKNOWN;

            }

        }

        return mNfcAdapter.getAdapterState();

    }

}

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

+1 −5
Original line number Diff line number Diff line
@@ -740,7 +740,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
                }

                mQS.setService(this);

                mQS.setBar(mStatusBarView);

                mQS.setupQuickSettings();



                // Start observing for changes

                mTilesChangedObserver = new TilesChangedObserver(mHandler);
@@ -3099,10 +3098,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        @Override

        public void onChange(boolean selfChange) {

            if (mSettingsContainer != null) {

                // Refresh the container

                mSettingsContainer.removeAllViews();

                mQS.setupQuickSettings();

                mSettingsContainer.requestLayout();

                mQS.updateResources();

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public class QuickSettingsController { 
        }

    }



    void setupQuickSettings() {

    private void setupQuickSettings() {

        LayoutInflater inflater = LayoutInflater.from(mContext);

        // Clear out old receiver

        if (mReceiver != null) {

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

+0 −18
Original line number Diff line number Diff line
@@ -80,24 +80,6 @@ public class SettingsPanelView extends PanelView { 
        }

    }



    public void setup(NetworkController networkController, BluetoothController bluetoothController,

            BatteryController batteryController, LocationController locationController,

            RotationLockController rotationLockController) {

        if (mQS != null) {

            mQS.setupQuickSettings();

        }

    }



    void updateResources() {

        if (mQS != null) {

            mQS.updateResources();

        }

        if (mQSContainer != null) {

            mQSContainer.updateResources();

        }

        requestLayout();

    }



    @Override

    public void fling(float vel, boolean always) {

        GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder();