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

Commit 0c2e4d3c authored by Zhen Zhang's avatar Zhen Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add config value to switch between Tether Settings UIs."

parents fae3cf3c 0ccc849d

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -434,4 +434,7 @@ 


    <!-- Package name of dialer supports RTT setting-->

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



    <!--Whether tether settings should be shown in one screen or not-->

    <bool name="config_show_all_in_one_tether_settings">false</bool>

</resources>

src/com/android/settings/AllInOneTetherSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public final class AllInOneTetherSettings extends RestrictedDashboardFragment 
        // Assume we are in a SettingsActivity. This is only safe because we currently use

        // SettingsActivity as base for all preference fragments.

        final SettingsActivity activity = (SettingsActivity) getActivity();

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        if (adapter != null) {

            adapter.getProfileProxy(activity.getApplicationContext(), mProfileServiceListener,

                    BluetoothProfile.PAN);
@@ -404,6 +404,12 @@ public final class AllInOneTetherSettings extends RestrictedDashboardFragment 
                    return keys;

                }



                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return context.getResources().getBoolean(

                            R.bool.config_show_all_in_one_tether_settings);

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

src/com/android/settings/TetherSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -450,6 +450,12 @@ public class TetherSettings extends RestrictedSettingsFragment 
                    return Arrays.asList(sir);

                }



                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return !context.getResources().getBoolean(

                            R.bool.config_show_all_in_one_tether_settings);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);

src/com/android/settings/network/TetherPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ public class TetherPreferenceController extends AbstractPreferenceController imp 


            // Grey out if provisioning is not available.

            mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));



            if (mContext.getResources().getBoolean(R.bool.config_show_all_in_one_tether_settings)) {

                mPreference.setFragment("com.android.settings.AllInOneTetherSettings");

            }

        }

    }

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -257,6 +257,12 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
                    return keys;

                }



                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return !context.getResources().getBoolean(

                            R.bool.config_show_all_in_one_tether_settings);

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {