PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add string for text of bluetooth switch" am: 868a15350a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12797033

Change-Id: I33be40196bf1a193024d758836640a35b2a2870c
This commit is contained in:
TreeHugger Robot
2020-10-19 09:29:47 +00:00
committed by Automerger Merge Worker
parent 695c94c2e3 868a15350a
commit 676db42f51
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -12286,4 +12286,9 @@
<!-- Summary for see all preference when bluetooth is disable [CHAR LIMIT=none]-->
<string name="connected_device_see_all_summary">Bluetooth will turn on</string>
<!-- Switch text for bluetooth feature being on [CHAR LIMIT=NONE] -->
<string name="bluetooth_setting_on">On</string>
<!-- Switch text for bluetooth feature being off [CHAR LIMIT=NONE] -->
<string name="bluetooth_setting_off">Off</string>
</resources>

1
src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
View File

@@ -83,6 +83,7 @@ public class BluetoothDashboardFragment extends DashboardFragment {
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
mSwitchBar.setSwitchBarText(R.string.bluetooth_setting_on, R.string.bluetooth_setting_off);
mController = new BluetoothSwitchPreferenceController(activity,
new SwitchBarController(mSwitchBar), mFooterPreference);
Lifecycle lifecycle = getSettingsLifecycle();