Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master

                android:value="com.android.settings.TetherSettings" />

        </activity>

        <activity

            android:name="Settings$WifiTetherSettingsActivity"

            android:label="@string/wifi_hotspot_checkbox_text"

            android:icon="@drawable/ic_wifi_tethering"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.wifi.tether.WifiTetherSettings" />

        </activity>

        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"

   <!-- Wi-Fi AP band settings.  Either Auto, 2.4GHz or 5GHz. -->

   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->

    <string-array name="wifi_ap_band_config_full">

    <string-array translatable="false" name="wifi_ap_band_config_full">

        <item>0</item>

        <item>1</item>

    </string-array>

    <string-array translatable="false" name="wifi_ap_band_summary_full">

        <item>@string/wifi_ap_choose_2G</item>

        <item>@string/wifi_ap_choose_5G</item>

    </string-array>

    <string-array name="wifi_ap_band_summary_full">

        <item>@string/wifi_ap_2G</item>

        <item>@string/wifi_ap_5G</item>

    <string-array translatable="false" name="wifi_ap_band_dual_mode">

        <item>0</item>

        <item>-1</item>

    </string-array>

    <string-array translatable="false" name="wifi_ap_band_dual_mode_summary">

        <item>@string/wifi_ap_choose_2G</item>

        <item>@string/wifi_ap_prefer_5G</item>

    </string-array>

    <string-array name="wifi_ap_band_config_2G_only">

    <string-array translatable="false" name="wifi_ap_band_config_2G_only">

        <item>@string/wifi_ap_choose_auto</item>

        <item>@string/wifi_ap_choose_2G</item>

    </string-array>

    <string name="wifi_ap_choose_auto">Auto</string>

    <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->

    <string name="wifi_ap_choose_2G">2.4 GHz Band</string>

    <!-- Label for the radio button to choose wifi ap 5GHz band -->

    <!-- Label for the radio button to only choose wifi ap 5GHz band -->

    <string name="wifi_ap_choose_5G">5.0 GHz Band</string>

    <!-- Label for the radio button to prefer 5GHz wifi ap band  [CHAR LIMIT=80]-->

    <string name="wifi_ap_prefer_5G">5.0 GHz Band preferred</string>

    <!-- Label for adding to the list of selected bands when 2.4 GHz is selected -->

    <string name="wifi_ap_2G">2.4 GHz</string>

    <!-- Label for adding to the list of selected bands when 5.0 GHz is selected -->

    <string name="color_mode_option_boosted">Boosted</string>

    <!-- Display settings screen, Color mode option for "Saturated color"  [CHAR LIMIT=45] -->

    <string name="color_mode_option_saturated">Saturated</string>

    <!-- Display settings screen, Color mode option for "Automatic color"  [CHAR LIMIT=45] -->

    <string name="color_mode_option_automatic">Automatic</string>

    <!-- Display settings screen, Color mode option for "Adaptive color"  [CHAR LIMIT=45] -->

    <string name="color_mode_option_automatic">Adaptive</string>

    <!-- Display settings screen, "natural(sRGB) color" setting option summary [CHAR LIMIT=NONE] -->

    <string name="color_mode_summary_natural">Use accurate colors only</string>

    <!-- Display settings screen, "Automatic color" setting option summary [CHAR LIMIT=NONE] -->

    <!-- Display settings screen, "Adaptive color" setting option summary [CHAR LIMIT=NONE] -->

    <string name="color_mode_summary_automatic">Adjust between vivid and accurate colors</string>

    <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->

    <!-- Do not disturb settings, messages, events and reminders title [CHAR LIMIT=100]-->

    <string name="zen_msg_event_reminder_title">Messages, events &amp; reminders</string>

    <!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->

    <string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>

    <string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>

    <!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->

    <string name="zen_onboarding_ok">Done</string>

    <!-- Help URI, smart battery page [DO NOT TRANSLATE] -->

    <string name="help_uri_smart_battery_settings" translatable="false"></string>

    <!-- Help URI, prevent ringing gesture [DO NOT TRANSLATE] -->

    <string name="help_uri_prevent_ringing_gesture" translatable="false"></string>

    <!-- Title label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->

    <string name="zen_suggestion_title">Update Do Not Disturb</string>

        android:title="@string/wifi_hotspot_auto_off_title"

        android:summary="@string/wifi_hotspot_auto_off_summary" />

    <com.android.settings.widget.HotspotApBandSelectionPreference

    <ListPreference

        android:key="wifi_tether_network_ap_band"

        android:title="@string/wifi_hotspot_ap_band_title"

        android:dialogLayout="@layout/hotspot_ap_band_selection_dialog"

        android:dialogTitle="@string/wifi_hotspot_ap_band_title"

        android:negativeButtonText="@string/cancel"

        android:positiveButtonText="@string/apply" />

        android:title="@string/wifi_hotspot_ap_band_title" />

</PreferenceScreen>

 No newline at end of file

import android.widget.TextView;

import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.users.UserDialogs;

import com.android.settingslib.RestrictedLockUtils;

            mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing);

            EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_ACTIVATED_BY_USER,

                mDeviceAdmin.getActivityInfo().applicationInfo.uid);

            unrestrictAppIfPossible(BatteryUtils.getInstance(this));

            setResult(Activity.RESULT_OK);

        } catch (RuntimeException e) {

            // Something bad happened...  could be that it was

        finish();

    }

    void unrestrictAppIfPossible(BatteryUtils batteryUtils) {

        // Unrestrict admin app if it is already been restricted

        final String packageName = mDeviceAdmin.getComponent().getPackageName();

        final int uid = batteryUtils.getPackageUid(packageName);

        if (batteryUtils.isForceAppStandbyEnabled(uid, packageName)) {

            batteryUtils.setForceAppStandby(uid, packageName, AppOpsManager.MODE_ALLOWED);

        }

    }

    void continueRemoveAction(CharSequence msg) {

        if (!mWaitingForRemoveMsg) {

            return;