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

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

Merge "Modify connectivty related strings" into pi-dev

parents 10420706 e0588456

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ 
    <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->

    <string name="bluetooth_preference_paired_devices">Paired devices</string>

    <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->

    <string name="bluetooth_preference_found_devices">Available devices</string>

    <string name="bluetooth_preference_found_media_devices">Available media devices</string>

    <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->

    <string name="bluetooth_preference_no_found_devices">No devices available</string>

    <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
@@ -9561,4 +9561,7 @@ 
    <!--  Summary for battery Suggestion. [CHAR LIMIT=55] -->

    <string name="battery_suggestion_summary"></string>









    <!-- Title for detail page of wifi network [CHAR LIMIT=30] -->









    <string name="pref_title_network_details">Network details</string>

















</resources>

























src/com/android/settings/bluetooth/BluetoothPairingDetail.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -148,7 +148,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme







                mLocalAdapter.setBluetoothEnabled(true);



















                addDeviceCategory(mAvailableDevicesCategory,









                        R.string.bluetooth_preference_found_devices,









                        R.string.bluetooth_preference_found_media_devices,









                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);









                updateFooterPreference(mFooterPreference);









                mAlwaysDiscoverable.start();
































src/com/android/settings/wifi/WifiSettings.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -876,7 +876,7 @@ public class WifiSettings extends RestrictedSettingsFragment

















    private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {









        new SubSettingLauncher(getContext())









                .setTitle(pref.getTitle())









                .setTitle(getContext().getString(R.string.pref_title_network_details))









                .setDestination(WifiNetworkDetailsFragment.class.getName())









                .setArguments(pref.getExtras())









                .setSourceMetricsCategory(getMetricsCategory())
































tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -114,7 +114,7 @@ public class BluetoothPairingDetailTest {







        mFragment.updateContent(BluetoothAdapter.STATE_ON);



















        verify(mFragment).addDeviceCategory(mAvailableDevicesCategory,









                R.string.bluetooth_preference_found_devices,









                R.string.bluetooth_preference_found_media_devices,









                BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false);









        verify(mLocalAdapter).setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);









    }