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

Commit 3b763057 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-f7cf88d3-9ff3-4602-981e-79c555d8aa91-for-git_oc-mr1-release-41... 

release-request-f7cf88d3-9ff3-4602-981e-79c555d8aa91-for-git_oc-mr1-release-4102303 snap-temp-L92600000074342209

Change-Id: Id45f4890ab3e93d7432d82179f6aeffe8dd8ee34
parents 722a5e6a 08f1523a

res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -3091,11 +3091,11 @@ 
















    <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->









    <string name="reset_dashboard_title">Reset</string>









    <string name="reset_dashboard_title">Reset options</string>

















    <!-- Reset Network -->









    <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->









    <string name="reset_network_title">Network settings reset</string>









    <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->









    <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>









    <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->









    <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>









    <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->








@@ -3112,8 +3112,8 @@







    <string name="reset_network_complete_toast">Network settings have been reset</string>

















    <!-- Master Clear -->









    <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->









    <string name="master_clear_title">Factory data reset</string>









    <!-- Button title to factory data reset the entire device -->









    <string name="master_clear_title">Erase all data (Factory reset)</string>









    <!-- Summary text for factory data reset describing what will be reset [CHAR_LIMIT=NONE]-->









    <plurals name="master_clear_with_account_summary">









        <item quantity="one">1 account will be reset</item>
































res/xml/tether_prefs.xml



+8
−2






























Original line number
Diff line number
Diff line







@@ -17,6 +17,12 @@







<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









                  xmlns:settings="http://schemas.android.com/apk/res-auto">



















    <Preference









        android:key="wifi_tether"









        android:title="@string/wifi_tether_checkbox_text"









        android:summary="@string/summary_placeholder"









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



















    <SwitchPreference









        android:key="usb_tether_settings"









        android:title="@string/usb_tethering_button_text"
































res/xml/wifi_tether_settings.xml
0 → 100644



+33
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  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.









  -->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



















    <com.android.settings.widget.ValidatedEditTextPreference









        android:key="wifi_tether_network_name"









        android:title="@string/wifi_ssid"









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



















    <com.android.settings.widget.ValidatedEditTextPreference









        android:key="wifi_tether_network_password"









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



















    <ListPreference









        android:key="wifi_tether_network_ap_band"









        android:title="@string/wifi_ap_band_config"









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









</PreferenceScreen>








 No newline at end of file
























src/com/android/settings/TetherSettings.java



+23
−11






























Original line number
Diff line number
Diff line







@@ -43,6 +43,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;







import com.android.settings.datausage.DataSaverBackend;









import com.android.settings.wifi.WifiApDialog;









import com.android.settings.wifi.WifiApEnabler;









import com.android.settings.wifi.tether.WifiTetherPreferenceController;









import com.android.settings.wifi.tether.WifiTetherSettings;









import com.android.settingslib.TetherUtil;



















import java.lang.ref.WeakReference;








@@ -63,7 +65,6 @@ public class TetherSettings extends RestrictedSettingsFragment







    private static final String USB_TETHER_SETTINGS = "usb_tether_settings";









    private static final String ENABLE_WIFI_AP = "enable_wifi_ap";









    private static final String ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";









    private static final String TETHER_CHOICE = "TETHER_TYPE";









    private static final String DATA_SAVER_FOOTER = "disabled_on_data_saver";



















    private static final int DIALOG_AP_SETTINGS = 1;








@@ -100,17 +101,14 @@ public class TetherSettings extends RestrictedSettingsFragment







    private WifiConfiguration mWifiConfig = null;









    private ConnectivityManager mCm;



















    private WifiTetherPreferenceController mWifiTetherPreferenceController;



















    private boolean mRestartWifiApAfterConfigChange;



















    private boolean mUsbConnected;









    private boolean mMassStorageActive;



















    private boolean mBluetoothEnableForTether;



















    /* Stores the package name and the class name of the provisioning app */









    private String[] mProvisionApp;









    private static final int PROVISION_REQUEST = 0;



















    private boolean mUnavailable;



















    private DataSaverBackend mDataSaverBackend;








@@ -126,6 +124,13 @@ public class TetherSettings extends RestrictedSettingsFragment







        super(UserManager.DISALLOW_CONFIG_TETHERING);









    }



















    @Override









    public void onAttach(Context context) {









        super.onAttach(context);









        mWifiTetherPreferenceController =









                new WifiTetherPreferenceController(context, getLifecycle());









    }



















    @Override









    public void onCreate(Bundle icicle) {









        super.onCreate(icicle);








@@ -154,6 +159,7 @@ public class TetherSettings extends RestrictedSettingsFragment

















        mEnableWifiAp =









                (SwitchPreference) findPreference(ENABLE_WIFI_AP);



















        Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY);









        mUsbTether = (SwitchPreference) findPreference(USB_TETHER_SETTINGS);









        mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);








@@ -175,6 +181,11 @@ public class TetherSettings extends RestrictedSettingsFragment







            getPreferenceScreen().removePreference(mUsbTether);









        }



















        mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());









        if (WifiTetherSettings.isTetherSettingPageEnabled()) {









            removePreference(ENABLE_WIFI_AP);









            removePreference(WIFI_AP_SSID_AND_SECURITY);









        } else {









            if (wifiAvailable && !Utils.isMonkeyRunning()) {









                mWifiApEnabler = new WifiApEnabler(activity, mDataSaverBackend, mEnableWifiAp);









                initWifiTethering();








@@ -182,6 +193,7 @@ public class TetherSettings extends RestrictedSettingsFragment







                getPreferenceScreen().removePreference(mEnableWifiAp);









                getPreferenceScreen().removePreference(wifiApSettings);









            }









        }



















        if (!bluetoothAvailable) {









            getPreferenceScreen().removePreference(mBluetoothTether);
































src/com/android/settings/accounts/AccountPreferenceController.java



+8
−8






























Original line number
Diff line number
Diff line







@@ -16,6 +16,12 @@

















package com.android.settings.accounts;



















import static android.content.Intent.EXTRA_USER;









import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;









import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;









import static android.provider.Settings.ACTION_ADD_ACCOUNT;









import static android.provider.Settings.EXTRA_AUTHORITIES;



















import android.accounts.Account;









import android.accounts.AccountManager;









import android.content.BroadcastReceiver;








@@ -48,8 +54,8 @@ import com.android.settings.Utils;







import com.android.settings.core.PreferenceController;









import com.android.settings.core.instrumentation.MetricsFeatureProvider;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.SearchIndexableRaw;









import com.android.settings.search.SearchFeatureProviderImpl;









import com.android.settings.search.SearchIndexableRaw;









import com.android.settingslib.RestrictedPreference;









import com.android.settingslib.accounts.AuthenticatorHelper;









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








@@ -61,17 +67,11 @@ import java.util.Collections;







import java.util.Comparator;









import java.util.List;



















import static android.content.Intent.EXTRA_USER;









import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;









import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;









import static android.provider.Settings.EXTRA_AUTHORITIES;



















public class AccountPreferenceController extends PreferenceController









        implements AuthenticatorHelper.OnAccountsUpdateListener,









        OnPreferenceClickListener, LifecycleObserver, OnPause, OnResume {



















    private static final String TAG = "AccountPrefController";









    private static final String ADD_ACCOUNT_ACTION = "android.settings.ADD_ACCOUNT_SETTINGS";



















    private static final int ORDER_ACCOUNT_PROFILES = 1;









    private static final int ORDER_LAST = 1002;








@@ -232,7 +232,7 @@ public class AccountPreferenceController extends PreferenceController







        for (int i = 0; i < count; i++) {









            ProfileData profileData = mProfiles.valueAt(i);









            if (preference == profileData.addAccountPreference) {









                Intent intent = new Intent(ADD_ACCOUNT_ACTION);









                Intent intent = new Intent(ACTION_ADD_ACCOUNT);









                intent.putExtra(EXTRA_USER, profileData.userInfo.getUserHandle());









                intent.putExtra(EXTRA_AUTHORITIES, mAuthorities);









                mContext.startActivity(intent);