TreeHugger Robot
4050d35c9f
Merge "Grey the previously connected device preference"
2018-05-17 16:30:39 +00:00
TreeHugger Robot
e593ab2f45
Merge "Fuelgauge update comment for StatsManager API"
2018-05-17 15:52:57 +00:00
Beverly
7e99c0d595
Merge "Get rid of divider above ringtone selector" into pi-dev am: 24bbc4bfe1
...
am: 976c1d9dd3
2018-05-17 07:00:36 -07:00
Beverly
976c1d9dd3
Merge "Get rid of divider above ringtone selector" into pi-dev
...
am: 24bbc4bfe1
2018-05-17 06:51:31 -07:00
TreeHugger Robot
24bbc4bfe1
Merge "Get rid of divider above ringtone selector" into pi-dev
2018-05-17 13:34:34 +00:00
hughchen
fc6030983f
Merge "Add Rename device on Bluetooth screen" into pi-dev am: 667cbc5846
...
am: 5783578aad
2018-05-17 02:17:55 -07:00
hughchen
b96c346f13
[automerger skipped] Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev am: 273faa216e
...
am: 32b1a4129e
2018-05-17 02:17:20 -07:00
hughchen
5783578aad
Merge "Add Rename device on Bluetooth screen" into pi-dev
...
am: 667cbc5846
2018-05-17 02:13:56 -07:00
hughchen
32b1a4129e
Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
...
am: 273faa216e
2018-05-17 02:13:22 -07:00
TreeHugger Robot
667cbc5846
Merge "Add “Rename device” on Bluetooth screen" into pi-dev
2018-05-17 09:08:30 +00:00
TreeHugger Robot
273faa216e
Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
2018-05-17 09:06:18 +00:00
hughchen
0404968d8b
Grey the previously connected device preference
...
* For fix the TreeHugger error in pi-dev, cherry pick the ag/3935357 in
master and fix TreeHugger error.
* Add PreviouslyConnectedDevicePreferenceController to handle the preference should be
enable or disable.
Example: If there are no previously connected devices disable the preference otherwise
enable it.
* Add PreviouslyConnectedDevicePreferenceControllerTest
1. Verify the callback can be registered and unregistered
2. Verify the preference is enable when there
have more than 1 previously connected device
3. Verify the preference is disable when there
have no previously connected device
Bug: 78250052
Test: make -j50 RunSettingsRoboTests
Change-Id: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
2018-05-17 16:55:31 +08:00
hughchen
1aa4a78374
[automerger skipped] Update DialogFragment UI when BT device is add/remove/rename am: b6ac12eed4
...
am: 1e1b265e9c
2018-05-17 01:45:08 -07:00
hughchen
1e1b265e9c
Update DialogFragment UI when BT device is add/remove/rename
...
am: b6ac12eed4
2018-05-17 01:41:01 -07:00
hughchen
b6ac12eed4
Update DialogFragment UI when BT device is add/remove/rename
...
* Add AudioSwitchCallback() in AudioSwitchPreferenceController.
This callback is used to notify SoudSettings to update the dialogFragment UI.
* Add UpdatableListPreferenceDialogFragment that updates the available
options when dialog is shown
* Add test to verify the adapter count when
onListPreferenceUpdated() is called.
Bug: 77783217
Test: make -j50 RunSettingsRoboTests
Change-Id: I8cac1b30ec50df026f4b7722dd1cd2f69e77a4cb
Merged-In: I8cac1b30ec50df026f4b7722dd1cd2f69e77a4cb
2018-05-17 07:40:52 +00:00
Nathan Harold
68300f5a0f
Merge changes from topic "pi-telephonydebugmenu" into pi-dev am: 0cf2e41bf8
...
am: 16f37ed5f0
2018-05-16 22:11:50 -07:00
Nathan Harold
518dd7f2cb
[Telephony Debug Menu] Add Physical Channel Config am: 433ca4427c
...
am: 1c99f9bb7e
2018-05-16 22:11:15 -07:00
Nathan Harold
59482d093c
[Telephony Debug Menu] LTE BW and Serving CellInfo am: 6e16fdf399
...
am: 5b861ee7d0
2018-05-16 22:10:39 -07:00
Nathan Harold
16f37ed5f0
Merge changes from topic "pi-telephonydebugmenu" into pi-dev
...
am: 0cf2e41bf8
2018-05-16 22:02:33 -07:00
Nathan Harold
1c99f9bb7e
[Telephony Debug Menu] Add Physical Channel Config
...
am: 433ca4427c
2018-05-16 22:01:50 -07:00
Nathan Harold
5b861ee7d0
[Telephony Debug Menu] LTE BW and Serving CellInfo
...
am: 6e16fdf399
2018-05-16 22:00:56 -07:00
TreeHugger Robot
0cf2e41bf8
Merge changes from topic "pi-telephonydebugmenu" into pi-dev
...
* changes:
[Telephony Debug Menu] Add Link Capacity Estimate
[Telephony Debug Menu] Add Physical Channel Config
[Telephony Debug Menu] LTE BW and Serving CellInfo
2018-05-17 04:45:41 +00:00
Lei Yu
3b807021bb
Merge "Update method isSmartBatteryEnabled()" into pi-dev am: 3feb2f87ff
...
am: c409db681d
2018-05-16 20:13:29 -07:00
Nitin Shivpure
82241d0d48
[automerger skipped] Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" am: 2d523f4e99 am: 606f1d02eb -s ours
...
am: a7914f54df
2018-05-16 20:03:24 -07:00
Lei Yu
c409db681d
Merge "Update method isSmartBatteryEnabled()" into pi-dev
...
am: 3feb2f87ff
2018-05-16 19:56:01 -07:00
Nitin Shivpure
a7914f54df
[automerger skipped] Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" am: 2d523f4e99
...
am: 606f1d02eb
2018-05-16 19:53:26 -07:00
Nitin Shivpure
606f1d02eb
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
...
am: 2d523f4e99
2018-05-16 19:44:41 -07:00
TreeHugger Robot
3feb2f87ff
Merge "Update method isSmartBatteryEnabled()" into pi-dev
2018-05-17 02:43:22 +00:00
Treehugger Robot
2d523f4e99
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
2018-05-17 01:28:02 +00:00
hjchangliao
5bb780195d
[automerger skipped] Merge "Convert Magnify controller to TogglePrefController" into pi-dev am: cd28a977ca
...
am: 55e51376b1
2018-05-16 18:19:20 -07:00
hjchangliao
55e51376b1
Merge "Convert Magnify controller to TogglePrefController" into pi-dev
...
am: cd28a977ca
2018-05-16 18:10:56 -07:00
TreeHugger Robot
cd28a977ca
Merge "Convert Magnify controller to TogglePrefController" into pi-dev
2018-05-17 00:43:04 +00:00
Matthew Fritze
d9738d81c1
Merge "Clean-up settings slices" into pi-dev am: d0888e9e5b
...
am: 4381e162f2
2018-05-16 17:41:27 -07:00
Daniel Nishi
e84eced513
Merge "Darken the secondary text on storage items." into pi-dev am: 0226c4d39d
...
am: a224cb4aaa
2018-05-16 17:39:12 -07:00
Matthew Fritze
4381e162f2
Merge "Clean-up settings slices" into pi-dev
...
am: d0888e9e5b
2018-05-16 17:33:28 -07:00
TreeHugger Robot
d0888e9e5b
Merge "Clean-up settings slices" into pi-dev
2018-05-17 00:26:32 +00:00
Daniel Nishi
a224cb4aaa
Merge "Darken the secondary text on storage items." into pi-dev
...
am: 0226c4d39d
2018-05-16 17:25:09 -07:00
TreeHugger Robot
0226c4d39d
Merge "Darken the secondary text on storage items." into pi-dev
2018-05-17 00:13:05 +00:00
Andreas Terzis
b0ba614c4c
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev am: 6eb1d9ed90
...
am: 4b31e19522
2018-05-16 16:58:55 -07:00
Mehdi Alizadeh
6ed77203e8
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9
...
am: 84586334b2
2018-05-16 16:53:44 -07:00
Andreas Terzis
4b31e19522
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev
...
am: 6eb1d9ed90
2018-05-16 16:49:50 -07:00
Andreas Terzis
6eb1d9ed90
Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev
2018-05-16 23:44:35 +00:00
Nitin Shivpure
ec5a3f9c01
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev am: d924894652
...
am: 75787c8a77
2018-05-16 16:43:00 -07:00
Mehdi Alizadeh
84586334b2
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev
...
am: 9a93a1dbe9
2018-05-16 16:42:52 -07:00
Nitin Shivpure
75787c8a77
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev
...
am: d924894652
2018-05-16 16:41:43 -07:00
Matthew Fritze
11916e00ab
Merge "Set slice summary text to screentitle first" into pi-dev am: e7f321c3c0
...
am: caf745ea13
2018-05-16 16:39:05 -07:00
TreeHugger Robot
9a93a1dbe9
Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev
2018-05-16 23:38:31 +00:00
TreeHugger Robot
d924894652
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" into pi-dev
2018-05-16 23:28:28 +00:00
Matthew Fritze
caf745ea13
Merge "Set slice summary text to screentitle first" into pi-dev
...
am: e7f321c3c0
2018-05-16 16:08:00 -07:00
TreeHugger Robot
e7f321c3c0
Merge "Set slice summary text to screentitle first" into pi-dev
2018-05-16 22:51:55 +00:00
