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

Commit 2d8d6856 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 02053d1c: Merge "Show mobile data RSSI for devices that support it." into jb-mr1.1-dev 

* commit '02053d1c':
  Show mobile data RSSI for devices that support it.
parents 68395a61 02053d1c

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

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ class QuickSettings { 
        });

        parent.addView(wifiTile);



        if (mModel.deviceSupportsTelephony()) {

        if (mModel.deviceHasMobileData()) {

            // RSSI

            QuickSettingsTileView rssiTile = (QuickSettingsTileView)

                    inflater.inflate(R.layout.quick_settings_tile, parent, false);

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

+12 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.graphics.drawable.Drawable;

import android.hardware.display.WifiDisplayStatus;

import android.net.ConnectivityManager;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;
@@ -171,6 +172,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
    private final BugreportObserver mBugreportObserver;

    private final BrightnessObserver mBrightnessObserver;



    private final boolean mHasMobileData;



    private QuickSettingsTileView mUserTile;

    private RefreshCallback mUserCallback;

    private UserState mUserState = new UserState();
@@ -249,6 +252,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        mBrightnessObserver = new BrightnessObserver(mHandler);

        mBrightnessObserver.startObserving();



        ConnectivityManager cm = (ConnectivityManager)

                context.getSystemService(Context.CONNECTIVITY_SERVICE);

        mHasMobileData = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);



        IntentFilter alarmIntentFilter = new IntentFilter();

        alarmIntentFilter.addAction(Intent.ACTION_ALARM_CHANGED);

        context.registerReceiver(mAlarmIntentReceiver, alarmIntentFilter);
@@ -403,22 +410,22 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        mWifiCallback.refreshView(mWifiTile, mWifiState);

    }



    boolean deviceHasMobileData() {

        return mHasMobileData;

    }



    // RSSI

    void addRSSITile(QuickSettingsTileView view, RefreshCallback cb) {

        mRSSITile = view;

        mRSSICallback = cb;

        mRSSICallback.refreshView(mRSSITile, mRSSIState);

    }

    boolean deviceSupportsTelephony() {

        PackageManager pm = mContext.getPackageManager();

        return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

    }

    // NetworkSignalChanged callback

    @Override

    public void onMobileDataSignalChanged(

            boolean enabled, int mobileSignalIconId, String signalContentDescription,

            int dataTypeIconId, String dataContentDescription, String enabledDesc) {

        if (deviceSupportsTelephony()) {

        if (deviceHasMobileData()) {

            // TODO: If view is in awaiting state, disable

            Resources r = mContext.getResources();

            mRSSIState.signalIconId = enabled && (mobileSignalIconId > 0)