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

Commit 32f38bde authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "StatusFragment" 

* changes:
  Update to Robolectric 3.4.2
  Convert more of StatusFragment to PreferenceControllers
parents 28a41fd3 f6631bf6

packages/SettingsLib/res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -983,4 +983,14 @@ 
    <!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->

    <string name="direct_boot_unaware_dialog_message">Note: After a reboot, this app can\'t start until you unlock your phone</string>



    <!--Label of IMS registration header -->

    <string name="ims_reg_title">"IMS registration state"</string>

    <!--Used when IMS registration state is registered -->

    <string name="ims_reg_status_registered">"Registered"</string>

    <!--Used when IMS registration state is not registered -->

    <string name="ims_reg_status_not_registered">"Not registered"</string>



    <!-- About phone, status item value if the actual value is not available. -->

    <string name="status_unavailable">Unavailable</string>



</resources>

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java

0 → 100644
+85 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.deviceinfo;



import android.annotation.SuppressLint;

import android.bluetooth.BluetoothAdapter;

import android.content.Context;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.text.TextUtils;



import com.android.settingslib.R;

import com.android.settingslib.core.lifecycle.Lifecycle;



/**

 * Preference controller for bluetooth address

 */

public abstract class AbstractBluetoothAddressPreferenceController

        extends AbstractConnectivityPreferenceController {



    @VisibleForTesting

    static final String KEY_BT_ADDRESS = "bt_address";



    private static final String[] CONNECTIVITY_INTENTS = {

            BluetoothAdapter.ACTION_STATE_CHANGED

    };



    private Preference mBtAddress;



    public AbstractBluetoothAddressPreferenceController(Context context, Lifecycle lifecycle) {

        super(context, lifecycle);

    }



    @Override

    public boolean isAvailable() {

        return BluetoothAdapter.getDefaultAdapter() != null;

    }



    @Override

    public String getPreferenceKey() {

        return KEY_BT_ADDRESS;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mBtAddress = screen.findPreference(KEY_BT_ADDRESS);

        updateConnectivity();

    }



    @Override

    protected String[] getConnectivityIntents() {

        return CONNECTIVITY_INTENTS;

    }



    @SuppressLint("HardwareIds")

    @Override

    protected void updateConnectivity() {

        BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();

        if (bluetooth != null && mBtAddress != null) {

            String address = bluetooth.isEnabled() ? bluetooth.getAddress() : null;

            if (!TextUtils.isEmpty(address)) {

                // Convert the address to lowercase for consistency with the wifi MAC address.

                mBtAddress.setSummary(address.toLowerCase());

            } else {

                mBtAddress.setSummary(R.string.status_unavailable);

            }

        }

    }

}

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java

0 → 100644
+105 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.deviceinfo;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.Handler;

import android.os.Message;



import com.android.internal.util.ArrayUtils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;



import java.lang.ref.WeakReference;



/**

 * Base class for preference controllers which listen to connectivity broadcasts

 */

public abstract class AbstractConnectivityPreferenceController

        extends AbstractPreferenceController implements LifecycleObserver, OnStart, OnStop {



    private final BroadcastReceiver mConnectivityReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (ArrayUtils.contains(getConnectivityIntents(), action)) {

                mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY);

            }

        }

    };



    private static final int EVENT_UPDATE_CONNECTIVITY = 600;



    private final Handler mHandler = new ConnectivityEventHandler(this);



    public AbstractConnectivityPreferenceController(Context context, Lifecycle lifecycle) {

        super(context);

        lifecycle.addObserver(this);

    }



    @Override

    public void onStop() {

        mContext.unregisterReceiver(mConnectivityReceiver);

    }



    @Override

    public void onStart() {

        final IntentFilter connectivityIntentFilter = new IntentFilter();

        final String[] intents = getConnectivityIntents();

        for (String intent : intents) {

            connectivityIntentFilter.addAction(intent);

        }



        mContext.registerReceiver(mConnectivityReceiver, connectivityIntentFilter,

                android.Manifest.permission.CHANGE_NETWORK_STATE, null);

    }



    protected abstract String[] getConnectivityIntents();



    protected abstract void updateConnectivity();



    private static class ConnectivityEventHandler extends Handler {

        private WeakReference<AbstractConnectivityPreferenceController> mPreferenceController;



        public ConnectivityEventHandler(AbstractConnectivityPreferenceController activity) {

            mPreferenceController = new WeakReference<>(activity);

        }



        @Override

        public void handleMessage(Message msg) {

            AbstractConnectivityPreferenceController preferenceController

                    = mPreferenceController.get();

            if (preferenceController == null) {

                return;

            }



            switch (msg.what) {

                case EVENT_UPDATE_CONNECTIVITY:

                    preferenceController.updateConnectivity();

                    break;

                default:

                    throw new IllegalStateException("Unknown message " + msg.what);

            }

        }

    }

}

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.deviceinfo;



import android.bluetooth.BluetoothAdapter;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.wifi.WifiManager;

import android.os.PersistableBundle;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.settingslib.R;

import com.android.settingslib.core.lifecycle.Lifecycle;



/**

 * Preference controller for IMS status

 */

public abstract class AbstractImsStatusPreferenceController

        extends AbstractConnectivityPreferenceController {



    @VisibleForTesting

    static final String KEY_IMS_REGISTRATION_STATE = "ims_reg_state";



    private static final String[] CONNECTIVITY_INTENTS = {

            BluetoothAdapter.ACTION_STATE_CHANGED,

            ConnectivityManager.CONNECTIVITY_ACTION,

            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

    };



    private Preference mImsStatus;



    public AbstractImsStatusPreferenceController(Context context,

            Lifecycle lifecycle) {

        super(context, lifecycle);

    }



    @Override

    public boolean isAvailable() {

        CarrierConfigManager configManager = mContext.getSystemService(CarrierConfigManager.class);

        int subId = SubscriptionManager.getDefaultDataSubscriptionId();

        PersistableBundle config = null;

        if (configManager != null) {

            config = configManager.getConfigForSubId(subId);

        }

        return config != null && config.getBoolean(

                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

    }



    @Override

    public String getPreferenceKey() {

        return KEY_IMS_REGISTRATION_STATE;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mImsStatus = screen.findPreference(KEY_IMS_REGISTRATION_STATE);

        updateConnectivity();

    }



    @Override

    protected String[] getConnectivityIntents() {

        return CONNECTIVITY_INTENTS;

    }



    @Override

    protected void updateConnectivity() {

        int subId = SubscriptionManager.getDefaultDataSubscriptionId();

        if (mImsStatus != null) {

            TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);

            mImsStatus.setSummary((tm != null && tm.isImsRegistered(subId)) ?

                    R.string.ims_reg_status_registered : R.string.ims_reg_status_not_registered);

        }

    }

}

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java

0 → 100644
+112 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.deviceinfo;



import android.content.Context;

import android.net.ConnectivityManager;

import android.net.LinkProperties;

import android.net.wifi.WifiManager;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settingslib.R;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.net.InetAddress;

import java.util.Iterator;



/**

 * Preference controller for IP address

 */

public abstract class AbstractIpAddressPreferenceController

        extends AbstractConnectivityPreferenceController {



    @VisibleForTesting

    static final String KEY_IP_ADDRESS = "wifi_ip_address";



    private static final String[] CONNECTIVITY_INTENTS = {

            ConnectivityManager.CONNECTIVITY_ACTION,

            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

    };



    private Preference mIpAddress;

    private final ConnectivityManager mCM;



    public AbstractIpAddressPreferenceController(Context context, Lifecycle lifecycle) {

        super(context, lifecycle);

        mCM = context.getSystemService(ConnectivityManager.class);

    }



    @Override

    public boolean isAvailable() {

        return true;

    }



    @Override

    public String getPreferenceKey() {

        return KEY_IP_ADDRESS;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mIpAddress = screen.findPreference(KEY_IP_ADDRESS);

        updateConnectivity();

    }



    @Override

    protected String[] getConnectivityIntents() {

        return CONNECTIVITY_INTENTS;

    }



    @Override

    protected void updateConnectivity() {

        String ipAddress = getDefaultIpAddresses(mCM);

        if (ipAddress != null) {

            mIpAddress.setSummary(ipAddress);

        } else {

            mIpAddress.setSummary(R.string.status_unavailable);

        }

    }



    /**

     * Returns the default link's IP addresses, if any, taking into account IPv4 and IPv6 style

     * addresses.

     * @param cm ConnectivityManager

     * @return the formatted and newline-separated IP addresses, or null if none.

     */

    private static String getDefaultIpAddresses(ConnectivityManager cm) {

        LinkProperties prop = cm.getActiveLinkProperties();

        return formatIpAddresses(prop);

    }



    private static String formatIpAddresses(LinkProperties prop) {

        if (prop == null) return null;

        Iterator<InetAddress> iter = prop.getAllAddresses().iterator();

        // If there are no entries, return null

        if (!iter.hasNext()) return null;

        // Concatenate all available addresses, newline separated

        StringBuilder addresses = new StringBuilder();

        while (iter.hasNext()) {

            addresses.append(iter.next().getHostAddress());

            if (iter.hasNext()) addresses.append("\n");

        }

        return addresses.toString();

    }

}