Commit Graph

46794 Commits

Author SHA1 Message Date
Daniel Nishi
4e9d52791b Make the night display suggestion depend on a flag.
This allows it to be enabled/disabled on certain devices.

Change-Id: I7b73bb866b05b92588e15ef7ffc2834cdde041ce
Fixes: 78601616
Test: Settings robotest
2018-05-17 10:29:59 -07:00
Doris Ling
431a506a8f Merge "Add resource for Backup summary." 2018-05-17 17:27:46 +00:00
Matthew Fritze
6feddd6954 Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.

The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework

This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.

Bug: 70622039
Bug: 67997332
Test: robotests
Change-Id: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
2018-05-17 10:16:55 -07:00
Matthew Fritze
46aa586610 Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.

The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework

This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.

Fixes: 70622039
Fixes: 67997332
Test: robotests
Change-Id: Ia76738dd6baacd5522d52df2c61ebad86a600282
Merged-In: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
2018-05-17 09:58:19 -07:00
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

Change-Id: If38b79abb72a10cc7f42c5b8e8359682c3a0dc1d
2018-05-17 07:00:36 -07:00
Rubin Xu
71560fcba1 Setting should handle android.settings.SYNC_SETTINGS from managed profile
When android.settings.SYNC_SETTINGS is fired from a managed profile, Settings
should handle it properly and displays the UI to manage accounts in the profile.
Since Settings uses a unified page to display both personal and work accounts,
it should redirect the intent to the UserAndAccountDashboardActivity in user 0

Bug: 79561138
Test: adb shell am start -a android.settings.SYNC_SETTINGS --user 10
      verifies the UI is showing work accounts

Change-Id: Ib82a04ad0ec72d58d60569e38538c5dbd6181bf0
2018-05-17 14:55:58 +01:00
Beverly
976c1d9dd3 Merge "Get rid of divider above ringtone selector" into pi-dev
am: 24bbc4bfe1

Change-Id: I3d94d0cc0f7c6ea6c38f4dffed92af9f73d9ebc1
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

Change-Id: Ibc9a0adc76de9c411391d612238fa39d42d1ddc3
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  -s ours

Change-Id: If29cfc933d69a6db92ab7317323ff338bb0366ec
2018-05-17 02:17:20 -07:00
hughchen
5783578aad Merge "Add Rename device on Bluetooth screen" into pi-dev
am: 667cbc5846

Change-Id: Ib44bc3f768769dc9089a33543912faf871fafab5
2018-05-17 02:13:56 -07:00
hughchen
32b1a4129e Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
am: 273faa216e

Change-Id: I01c054196b04b66677708711be0d298ef2c24041
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  -s ours

Change-Id: I65ec6ba68390c05dc75d50cf5b3ee2eaa156f281
2018-05-17 01:45:08 -07:00
hughchen
1e1b265e9c Update DialogFragment UI when BT device is add/remove/rename
am: b6ac12eed4

Change-Id: I788ef736d4d44d7224add9e2cfbd4a3fa9febc73
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

Change-Id: If69966f603c87a07e506f82bf5d8eabda22e70ae
2018-05-16 22:11:50 -07:00
Nathan Harold
518dd7f2cb [Telephony Debug Menu] Add Physical Channel Config am: 433ca4427c
am: 1c99f9bb7e

Change-Id: I3df4739097f9394178b99ee963f4004bcf877b9c
2018-05-16 22:11:15 -07:00
Nathan Harold
59482d093c [Telephony Debug Menu] LTE BW and Serving CellInfo am: 6e16fdf399
am: 5b861ee7d0

Change-Id: Ibc75df4f98b3820b330b21bd2fd38d51a58f7202
2018-05-16 22:10:39 -07:00
Nathan Harold
16f37ed5f0 Merge changes from topic "pi-telephonydebugmenu" into pi-dev
am: 0cf2e41bf8

Change-Id: I21d57ebf1930cf69fed2525c5b0f12e2bc3b1953
2018-05-16 22:02:33 -07:00
Nathan Harold
1c99f9bb7e [Telephony Debug Menu] Add Physical Channel Config
am: 433ca4427c

Change-Id: I38b16e9cf6f96fd6a508141fcd8f45ccf79e25d5
2018-05-16 22:01:50 -07:00
Nathan Harold
5b861ee7d0 [Telephony Debug Menu] LTE BW and Serving CellInfo
am: 6e16fdf399

Change-Id: I9a258017786483a8c7b1f463b3ddf2468738f294
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
hughchen
615becb392 Update UI when BT device is rename
* Using getAliasName() instead of getName()
* Add BluetoothDevice isConnected check, when BluetoothDevice is
  disconnected. Do not add to the show list.

Bug: 77783217
Test: make -j50 RunSettingsRoboTests
Change-Id: I183fc693eaefd690568ba2f1ec740258b2bb62c8
2018-05-17 11:29:54 +08:00
Lei Yu
3b807021bb Merge "Update method isSmartBatteryEnabled()" into pi-dev am: 3feb2f87ff
am: c409db681d

Change-Id: I10d9b63f1a61a10c31bf5c07b8a3192accfe18b1
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  -s ours

Change-Id: Idae4f0ea79c3b732cd355994dba55622da1aa4de
2018-05-16 20:03:24 -07:00
Lei Yu
c409db681d Merge "Update method isSmartBatteryEnabled()" into pi-dev
am: 3feb2f87ff

Change-Id: Ia4a5ca96a43eb4b9c2ad03f1f89c3bb4e6dfa632
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  -s ours

Change-Id: Ia68afc7be0c8a2cdb0c4cc977e7f2735cf4b9c8a
2018-05-16 19:53:26 -07:00
Nitin Shivpure
606f1d02eb Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
am: 2d523f4e99

Change-Id: I792ff3b090d59851c459066dd00d6fdbcb6e3a26
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
Bill Yi
e6a614371f Import translations. DO NOT MERGE
Change-Id: Id2caf9f50ad42134dcfa1648e9460eec7a6a86bf
Auto-generated-cl: translation import
2018-05-16 19:35:08 -07:00
Kunhung Li
38438a975a Rename the Utils class in settingslib.bluetooth
Make it more unique to speficy related bluetooth, so change class name from Utils to BluetoothUtils.

Bug: 78676509
Test: atest RunSettingsRoboTests
Change-Id: Ic3627ce44627be39fbc010ad5ef630ad3c429836
2018-05-17 10:32:26 +08: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  -s ours

Change-Id: I8b0c3b9ab0136fd321c32face60cdd419d8fe125
2018-05-16 18:19:20 -07:00
hjchangliao
55e51376b1 Merge "Convert Magnify controller to TogglePrefController" into pi-dev
am: cd28a977ca

Change-Id: Ic118ddc1915e26c9317f0c53edbf60539fc78534
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

Change-Id: I234bf03c66af2f7bdd9247ca101fe387b7f8e002
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

Change-Id: I3d010e745d6d195f5ada0d941a8ec54f4d74ca4c
2018-05-16 17:39:12 -07:00
Matthew Fritze
4381e162f2 Merge "Clean-up settings slices" into pi-dev
am: d0888e9e5b

Change-Id: I673981e5f200b0d97649d4efcfbe69eb73bbd765
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

Change-Id: Ie3b9acaa9b4390ecb4ec21e3bc19a4456b8b31cb
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

Change-Id: I0be752cc63cf48b89faa94ce822374ac40a70f97
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

Change-Id: Ic2818dc965defb3b2df3192604cedbfcddf36714
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

Change-Id: I0451cda170f6e286dda1213ebaec3bc846e49022
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