Commit Graph

45793 Commits

Author SHA1 Message Date
Joshua Mccloskey
c7123d4b0e Merge "Fixed accessibility bug in choose_lock_pattern_common.xml where title was not always read" into pi-dev
am: d819dbacb6

Change-Id: I4041083c976c506ed1848c91c6a19e470b4d2766
2018-05-16 10:03:45 -07:00
hughchen
52feedf354 Bluetooth and NFC added back to Connection preferences
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
Merged-In: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 17:03:31 +00:00
Joshua Mccloskey
d819dbacb6 Merge "Fixed accessibility bug in choose_lock_pattern_common.xml where title was not always read" into pi-dev 2018-05-16 16:49:14 +00:00
hjchangliao
a92271c26d Convert Magnify controller to TogglePrefController
Convert below to TogglePreferenceController:
MagnificationNavbarPreferenceController
(Magnify with Button)
MagnificationGesturesPreferenceController
(Magnify with triple-tap)

The two controllers share the same fragment,
Add static method for set/get state in fragment,
And use them in controllers and fragment.

Change-Id: I2bdbdb36be71e1a3ffb557abc5a6115d48de53cf
Merged-In: I2bdbdb36be71e1a3ffb557abc5a6115d48de53cf
Fixes: 67997698
Fixes: 67997726
Test: make RunSettingsRoboTests
2018-05-16 16:45:47 +00:00
Matthew Fritze
7d565e97a3 Clean-up settings slices
- Set TTL to Infinity
- Set color of each slice to color accent

Change-Id: I7de4530880725ba3282602135bdc1fa85d786905
Fixes: 79780418
Test: robotests
2018-05-16 08:20:05 -07:00
Matthew Fritze
f9c13fc305 Set slice summary text to screentitle first
To improve context on search surfaces where the
setting may be ambiguous, we set the screentitle
as the summary text as the top priority. If there is
no screentitle or the it matches the title, then we
try to use the controller summary. If the controller
summary is not valid, then we show nothing.

Bug: 79780762
Test: robotests
Change-Id: If4f7f8d4a072125604ede14e3df2afd667fa24b7
2018-05-16 08:13:22 -07:00
Beverly
df1614f7f1 Merge "DO NOT MERGE Update zen onboarding" into pi-dev
am: b7b355a1c5

Change-Id: Ia5360d8576f97db9b2eb8db6b3b9dff029811e2b
2018-05-16 06:33:05 -07:00
TreeHugger Robot
b7b355a1c5 Merge "DO NOT MERGE Update zen onboarding" into pi-dev 2018-05-16 13:24:39 +00:00
hughchen
4e0e3c83e8 Change string from "Add device" to "Pair new device"
Change string from "Add device" to "Pair new device"

Bug: 79298886
Test: Build pass
Change-Id: Iac4e251d5fab794f90e98911208f026d62b91659
2018-05-16 19:17:06 +08:00
android-build-team Robot
f7979d6f53 Snap for 4784261 from 37a6a91444 to pi-release
Change-Id: I13ea5ca9538b24c344030bf20f206a8d9399267c
2018-05-16 07:24:20 +00:00
joeshih
a025eb2b35 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: Ib06126324516826411a7d50a2bd8a790bfd477c7
Merged-In: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-16 11:36:45 +08:00
Fan Zhang
c3669d8971 Update sound setting icons
am: 37a6a91444

Change-Id: I81addc754a5fbb17a31d15cc1d001de72a50f15e
2018-05-15 18:35:04 -07:00
Lei Yu
1254049038 Update method isSmartBatteryEnabled()
Check the config value from framework.

Bug: 79698191
Test: RunSettingsRoboTests
Change-Id: I14424e2a96fb3ef3bb7d0f10218266d53e86370d
2018-05-15 18:24:13 -07:00
Mehdi Alizadeh
7c69ec7cfe Moves Swipe Up overlay from Settings app to android.internal
Bug: 79778025
Test: Robo tests
Change-Id: I0cfe5876c5d15552bd4a8e6a96931056846c880d
2018-05-15 18:11:32 -07:00
Fan Zhang
37a6a91444 Update sound setting icons
- icon for sound setting in Settings homepage
- icon on phone muted condition card
- icon on DND condition card and DND suggestion

Bug: 77982107
Test: visual
Change-Id: I22b5223029d67de0bcb2466a45075835453a2b5f
2018-05-15 15:35:37 -07:00
Beverly
7f53974cbd Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev
am: 69ec1673df

Change-Id: I825f94150e349465d4dd9168ab18d8f03fc9ed73
2018-05-15 14:58:21 -07:00
TreeHugger Robot
69ec1673df Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev 2018-05-15 21:39:55 +00:00
Beverly
90ebab0650 DO NOT MERGE Show mute icon in sound settings page
- Show mute icon when ringer is muted
- Show vibrate icon when ringer is on vibrate
- Show ringer icon when ringer is on ring

Test: visual inspection
Change-Id: I662e0d4fd33ac2284378c2f558509c93c907fbe3
Bug: 78330194
2018-05-15 20:35:50 +00:00
Jason Monk
284ca4f356 Hook up slice deep links
Device indexing might launch them on occassion.

Test: existing test passes
Test: launch deep link
Change-Id: Ie4d3cef2cc384ca809e74b27638d2c5a1d4d98a2
Fixes: 79435996
2018-05-15 16:23:49 -04:00
richard chou
baadcabd04 Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev
am: 034e39679d

Change-Id: I79ba64918f591c28067b10a09c3844824f7a9278
2018-05-15 11:57:59 -07:00
Rajeev Kumar
1378ebfcca Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev
am: e3813863b7

Change-Id: Iba013ff7a6983b7544b5194ff3480f1b1aa28025
2018-05-15 11:42:07 -07:00
hughchen
5487984da5 Merge "Add and update string" into pi-dev
am: ef9b8cda82

Change-Id: Ibb97f897a9564a03598c56e5e1514c9b645106ed
2018-05-15 11:28:37 -07:00
TreeHugger Robot
034e39679d Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev 2018-05-15 18:16:25 +00:00
Jeff Gaston
77122cf150 Merge "Update for support library prebuilt drop" into pi-dev
am: 72f57a7c99

Change-Id: I4256831e69c3a61ce18a22afcec0cec845da2e93
2018-05-15 11:16:02 -07:00
TreeHugger Robot
e3813863b7 Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev 2018-05-15 18:07:56 +00:00
richard chou
4eb9e542c1 Suppress NewDeviceIntroSuggestionActivity if Tips application exists
NewDeviceIntroSuggestionActivity should not show if Tips application exists.

Bug: 77652536
Test: atest SettingsRoboTests
Change-Id: I0aa19a5bc79c8b1497f42372d293299509d897b2
Merged-In: I85575e8eb92a8a620f0af9e5ad3ebd5b8dd05323
2018-05-15 17:17:21 +00:00
TreeHugger Robot
ef9b8cda82 Merge "Add and update string" into pi-dev 2018-05-15 17:04:10 +00:00
Beverly
e3a66fc16d DO NOT MERGE Update zen onboarding
- Update text
- Update buttons
- Update style

Bug: 79702414
Bug: 78447976
Bug: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
2018-05-15 12:43:55 -04:00
Jeff Gaston
72f57a7c99 Merge "Update for support library prebuilt drop" into pi-dev 2018-05-15 16:37:55 +00:00
Jeff Gaston
3e76e17c15 Update for support library prebuilt drop
Bug: 79267345
Test: m -j checkbuild

Change-Id: I086a2253a1c94af6f7c4dca04d2644a4f9e54ef5
2018-05-15 11:21:26 -04:00
Matthew Fritze
94f84da552 Merge "Remove old meta data declarations in manifest" into pi-dev
am: 9b7f0e4c5d

Change-Id: I5c28d032d6ca39be4ec9a239ff0637d3806ae74f
2018-05-15 06:52:41 -07:00
TreeHugger Robot
9b7f0e4c5d Merge "Remove old meta data declarations in manifest" into pi-dev 2018-05-15 13:45:32 +00:00
Jason Monk
2d462ea467 Merge "Delay index job a little bit" into pi-dev
am: 5530329da2

Change-Id: Ifd278179f6c5527bdd19dcc656459525ac403cd1
2018-05-15 06:21:25 -07:00
Beverly
e385ab21a3 Merge "Gets rid of dividers in sound settings" into pi-dev
am: e6f66a3c9a

Change-Id: Iaaa2ea0ba1f37b1c477a18000e49724b5162288a
2018-05-15 06:20:34 -07:00
TreeHugger Robot
5530329da2 Merge "Delay index job a little bit" into pi-dev 2018-05-15 13:18:42 +00:00
TreeHugger Robot
e6f66a3c9a Merge "Gets rid of dividers in sound settings" into pi-dev 2018-05-15 13:16:22 +00:00
android-build-team Robot
264e7474c2 Snap for 4781566 from bafae44cb2 to pi-release
Change-Id: Id9ce3e224b118ec93aeaa90ebe324a56020d8380
2018-05-15 07:25:02 +00:00
hughchen
1b2b83968e Add and update string
* Change the string from "cast" to "driving mode"
* Add string "Bluetooth, NFC" and "Bluetooth"

Bug: 79299421
Test: build pass
Change-Id: I6da7e54545f209110fca8e7a107f3b20066c7623
2018-05-15 15:24:17 +08:00
timhypeng
5248e0cfd9 Click left side of list in "previously connected devices" should connect to the device
am: bafae44cb2

Change-Id: I8663afa58fe1cb5210575c8966e7430885d19f49
2018-05-14 23:15:50 -07:00
timhypeng
bafae44cb2 Click left side of list in "previously connected devices" should connect to the device
* In "previously connected devices", to connect device
* In "Available media devices", to activate device

Bug: 77607104
Test: make -j50 RunSettingsRoboTests
Change-Id: If5005031bd3f5dc4950abf2c77575785cd6f67b1
Merged-In: If5005031bd3f5dc4950abf2c77575785cd6f67b1
2018-05-15 06:07:28 +00:00
Lei Yu
ca5296446d Merge "Add string for disabled FAS toggle." into pi-dev
am: cbf68188ff

Change-Id: If82cb65870b876462d9aff7cd5630db8186129cb
2018-05-14 20:15:11 -07:00
TreeHugger Robot
cbf68188ff Merge "Add string for disabled FAS toggle." into pi-dev 2018-05-15 03:09:19 +00:00
Lei Yu
bb975a5751 Merge "Remove the dynamic summary for bt preference." into pi-dev
am: 912af577ab

Change-Id: I7f14345e55d15e50c3bd16ad234d1f31edd5ffc2
2018-05-14 18:37:21 -07:00
TreeHugger Robot
912af577ab Merge "Remove the dynamic summary for bt preference." into pi-dev 2018-05-15 01:15:18 +00:00
Rajeev Kumar
549a188efe Make sure we do not make UI calls from background thread in DashboardSummary class.
Bug: 79705354
Test: make RunSettingsRoboTests -j40 and manual testing.
Change-Id: I08a08e05f3424f4a6d2100aed32d32bb15997c86
2018-05-14 17:59:59 -07:00
Lei Yu
dae3c912d7 Add string for disabled FAS toggle.
If FAS toggle is disabled because app is in doze whitelist(not optimized), show
a dialog that has this string.

Bug: 77924141
Test: Manual
Change-Id: I30518cd887125bff00b7c567e26204d5b1814858
2018-05-14 17:55:21 -07:00
Naina Nalluri
86818604ac Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
am: 15602b3f48

Change-Id: I8e8db64e099f0fc06363b1c91c0108285e025e45
2018-05-14 16:12:42 -07:00
Naina Nalluri
15602b3f48 Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev 2018-05-14 22:59:11 +00:00
Lei Yu
ea1d9d17d1 Merge "Add cancel button for private dns dialog" into pi-dev
am: 7fe599f542

Change-Id: I7a866a68c27503f174b7aa4fa3101264c9174ff5
2018-05-14 14:53:37 -07:00
Lei Yu
73328b182a Merge "Update the battery broadcast receiver." into pi-dev
am: a924a1e2ae

Change-Id: I69b4ae6fbdb4baf56b331d8c0fcd0f11a73bbf54
2018-05-14 14:31:45 -07:00