Commit Graph

45957 Commits

Author SHA1 Message Date
Lei Yu
c81da687a0 Merge "Fix tethering summary when airplane mode is off" into pi-dev am: a07b1f83a8
am: 8ed6b5dabf

Change-Id: I27bd8d85f0c22207336f8bf632280a5bfd243658
2018-05-17 19:21:49 -07:00
Lei Yu
8f6eef907e Merge "Adjust wifi dialog for better accessibility" into pi-dev am: e2d14d409e
am: 9959944faf

Change-Id: I9da6925b538c8ff527a3501df16471d5462a8eec
2018-05-17 19:14:53 -07:00
Fan Zhang
7f683e8252 Merge "Misc style updates to fix some GAR issues" into pi-dev am: 2200308554
am: 7a6a3b28a9

Change-Id: Ia249bbcced52acb9b0316f218472f53ef3868993
2018-05-17 18:41:39 -07:00
Lei Yu
8ed6b5dabf Merge "Fix tethering summary when airplane mode is off" into pi-dev
am: a07b1f83a8

Change-Id: I2f200d8f70e4f84906d0db4b9a3dd831d3278bfc
2018-05-17 18:30:48 -07:00
Lei Yu
9959944faf Merge "Adjust wifi dialog for better accessibility" into pi-dev
am: e2d14d409e

Change-Id: I5dc74f51fdbcd00d0dd71d632313c60f200a639d
2018-05-17 18:19:25 -07:00
Fan Zhang
7a6a3b28a9 Merge "Misc style updates to fix some GAR issues" into pi-dev
am: 2200308554

Change-Id: Ia3ed8b5a46ec3be2a718af8e31a0ef6af64ab541
2018-05-17 18:13:41 -07:00
TreeHugger Robot
a07b1f83a8 Merge "Fix tethering summary when airplane mode is off" into pi-dev 2018-05-18 00:49:50 +00:00
TreeHugger Robot
e2d14d409e Merge "Adjust wifi dialog for better accessibility" into pi-dev 2018-05-18 00:12:44 +00:00
TreeHugger Robot
2200308554 Merge "Misc style updates to fix some GAR issues" into pi-dev 2018-05-18 00:09:44 +00:00
Lei Yu
e7dd4197b0 Adjust wifi dialog for better accessibility
For some items, change the minHeight to 48dp. Also update text size
a little bit to fit the new height.

Change-Id: I87d3067c29d0d87eff6eadc4332984171e9fe4b6
Fixes: 79722015
Test: Build
2018-05-17 16:05:09 -07:00
Fan Zhang
36e61e191a Misc style updates to fix some GAR issues
- Increase tap target height for add wifi dialog entries.
- Increase tap height for vpn editor fields
- Tap target area for switchbar toggle

Change-Id: I0d0e350dd4236cd4fe73fa190fb79ca50de2da60
Fixes: 79871635
Fixes: 79887410
Test: visual
2018-05-17 15:03:18 -07:00
Lei Yu
4fec12cbbf Fix tethering summary when airplane mode is off
When airplane mode is off, fall back to default summary
(tether off summary). It should be fine because once tether
state get updated again, it will go through original listener
to update the summary.

Change-Id: Iba9b56f452e72365ea964d841ee156a2625c0ae1
Fixes: 79721162
Test: RunSettingsRoboTests
2018-05-17 14:38:22 -07:00
Andrew Sapperstein
d497de27c1 Merge "Make the night display suggestion depend on a flag." into pi-dev am: 96294df2f0
am: 95e789dc58

Change-Id: I732a4d92f23354db44ce294096ad1e38ae0f198b
2018-05-17 13:59:26 -07:00
Jason Monk
2443a96fde Merge "Hook up slice deep links" into pi-dev am: 7e6d495cec
am: 9f6028edde

Change-Id: Ie8ccce9eb7e880c8764a2ce3cb6d1151770c9393
2018-05-17 13:56:03 -07:00
Andrew Sapperstein
95e789dc58 Merge "Make the night display suggestion depend on a flag." into pi-dev
am: 96294df2f0

Change-Id: I1463f360f286e7770d0e7ecd5e7d3ab69ecff837
2018-05-17 13:42:38 -07:00
Jason Monk
9f6028edde Merge "Hook up slice deep links" into pi-dev
am: 7e6d495cec

Change-Id: I0a0bd515a5b43828092ca4ec50ef9d20c660a4da
2018-05-17 13:41:27 -07:00
Andrew Sapperstein
96294df2f0 Merge "Make the night display suggestion depend on a flag." into pi-dev 2018-05-17 20:40:21 +00:00
TreeHugger Robot
7e6d495cec Merge "Hook up slice deep links" into pi-dev 2018-05-17 20:15:39 +00:00
Fan Zhang
fc6ce6de32 Merge "Do not perform device index before device provision." into pi-dev am: 1fe4512596
am: 8a8b58d381

Change-Id: Ie111e38c79735090a0cedae253d97d638f974209
2018-05-17 12:56:44 -07:00
Fan Zhang
8a8b58d381 Merge "Do not perform device index before device provision." into pi-dev
am: 1fe4512596

Change-Id: I2cc6689cd6c80df36c4565fc48b396abb4b16288
2018-05-17 12:50:17 -07:00
TreeHugger Robot
1fe4512596 Merge "Do not perform device index before device provision." into pi-dev 2018-05-17 19:41:43 +00:00
Rubin Xu
785ea86507 Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am: ef088843ae
am: 7ff1a26d03

Change-Id: I19586d174fe2b6b2eac8f68525a81e7cb6039fc0
2018-05-17 12:25:28 -07:00
Rubin Xu
7ff1a26d03 Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev
am: ef088843ae

Change-Id: I0b0e7912fcbdcb819a6b7f2e50f91eef18b8092a
2018-05-17 12:14:17 -07:00
Rubin Xu
ef088843ae Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev 2018-05-17 18:57:46 +00:00
Matthew Fritze
d9e19a554f [automerger skipped] Add Wifi Slice am: 46aa586610
am: b877c174a6  -s ours

Change-Id: I409a86b3ed0f76e5df9f5d9734a1f8fc286fe710
2018-05-17 11:44:59 -07:00
Matthew Fritze
b877c174a6 Add Wifi Slice
am: 46aa586610

Change-Id: If12651655b7b360ee3ed886a111f35e614a2c818
2018-05-17 11:35:43 -07:00
TreeHugger Robot
f868f86672 Merge "Add Wifi Slice" 2018-05-17 18:21:16 +00:00
TreeHugger Robot
4131e0581f Merge "Import translations. DO NOT MERGE" 2018-05-17 18:18:29 +00:00
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