Commit Graph

46307 Commits

Author SHA1 Message Date
joeshih
36b7896f5d [automerger skipped] Merge "Support Vibrate for calls in Settings Slices" into pi-dev am: a0f9241400
am: 421b0cf526  -s ours

Change-Id: Ic9af669b55b53de669270e6bdc695d2587700462
2018-05-16 12:26:27 -07:00
TreeHugger Robot
77d9076158 Merge "Merge Ambient display into Lockscreen settings." 2018-05-16 19:15:40 +00:00
joeshih
421b0cf526 Merge "Support Vibrate for calls in Settings Slices" into pi-dev
am: a0f9241400

Change-Id: Ib77fc8257bfb4a00368735504558c6b27a95ec17
2018-05-16 11:58:11 -07:00
Mehdi Alizadeh
5ab8077f44 Adds two overlay settings fields for Swipe Up gesture
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.

Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-16 11:54:27 -07:00
TreeHugger Robot
a0f9241400 Merge "Support Vibrate for calls in Settings Slices" into pi-dev 2018-05-16 18:48:14 +00:00
TreeHugger Robot
35d3b2549f Merge "Convert Magnify controller to TogglePrefController" 2018-05-16 18:39:29 +00:00
TreeHugger Robot
9f31b4803b Merge "Update zen onboarding" 2018-05-16 18:38:41 +00:00
Beverly
3f42a23816 Get rid of divider above ringtone selector
Change-Id: I939d1ab061fb55853fbc0505b8d9025715b9df97
Fixes: 79480349
Test: manual
2018-05-16 14:28:15 -04:00
Fan Zhang
30d4d015b5 Merge Ambient display into Lockscreen settings.
And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
2018-05-16 11:24:32 -07:00
hughchen
8f553c0459 Merge "Change string from "Add device" to "Pair new device"" into pi-dev am: 46338558e1
am: 14ce329377

Change-Id: I2e7bdff197a17b7d7f6582f99594aa916fd79181
2018-05-16 10:56:32 -07:00
Fan Zhang
e2346643c7 Move app setting link from Entity header to pref controller
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 10:51:31 -07:00
hughchen
14ce329377 Merge "Change string from "Add device" to "Pair new device"" into pi-dev
am: 46338558e1

Change-Id: I5fa291ba3677398efcfe0f5b89f10df24463a3fa
2018-05-16 10:47:40 -07:00
TreeHugger Robot
46338558e1 Merge "Change string from "Add device" to "Pair new device"" into pi-dev 2018-05-16 17:32:38 +00:00
Fan Zhang
7d6539d09b Merge "Support Vibrate for calls in Settings Slices" 2018-05-16 17:22:29 +00:00
Joshua Mccloskey
e483bf7f92 Merge "Fixed accessibility bug in choose_lock_pattern_common.xml where title was not always read" into pi-dev am: d819dbacb6
am: c7123d4b0e

Change-Id: Ic81675cb203edbb9e762a05f2b91c38251061ec0
2018-05-16 10:09:01 -07:00
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
TreeHugger Robot
365fdea087 Merge "Bluetooth and NFC added back to Connection preferences" 2018-05-16 17:03:30 +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
hughchen
acb6e89c52 Update DialogFragment UI when BT device is add/remove/rename
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/3937781 in
  master. Change android.support.* to androidx.*
* 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
2018-05-16 22:13:24 +08:00
Beverly
414b7034f1 Update zen onboarding
- Update text
- Update buttons
- Update style

Fixes: 79702414
Fixes: 78447976
Fixes: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
(cherry picked from commit e3a66fc16d)
2018-05-16 13:40:56 +00:00
Beverly
82e7aa8975 [automerger skipped] Merge "DO NOT MERGE Update zen onboarding" into pi-dev am: b7b355a1c5
am: df1614f7f1  -s ours

Change-Id: I4e201d8e5b0a2570bc539d5bb8b87b1e58749239
2018-05-16 06:36:51 -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
hjchangliao
2f73a6646f 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
Fixes: 67997698
Fixes: 67997726
Test: make RunSettingsRoboTests
2018-05-16 16:05:41 +08:00
hughchen
4bf7c3a921 Bluetooth and NFC added back to Connection preferences
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 08:03:00 +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
5de68ea81a Update sound setting icons am: 37a6a91444
am: c3669d8971

Change-Id: Id6d6393f8fb754dd98f756601ddf97d1a5fabf23
2018-05-15 19:05:04 -07: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
9648d5799e Merge "Convert Smart Storage to BasePrefController" 2018-05-16 00:21:51 +00:00
TreeHugger Robot
b976044f57 Merge "Show mute icon in sound settings page" 2018-05-15 23:13:34 +00:00
Beverly
a9ce0e9463 [automerger skipped] Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev am: 69ec1673df
am: 7f53974cbd  -s ours

Change-Id: Icfd2c6328fac65e8a72770dff2d240df7a6e5dae
2018-05-15 15:46:29 -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
Beverly
2aa4e12145 Show mute icon in sound settings page
Cherry-picked from pi-dev ag/4057627
- 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
Fixes: 78330194
2018-05-15 21:54:34 +00: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
richard chou
4f893b29c7 [automerger skipped] Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev am: 034e39679d
am: baadcabd04  -s ours

Change-Id: I160dbfe42d56c05ea02ca2a41a8df4f16f7438ec
2018-05-15 13:47:31 -07: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
Rajeev Kumar
0494ba84c9 Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev am: e3813863b7
am: 1378ebfcca

Change-Id: Ib0f7223226bfe4b5cc95672d1f2efe1b7ce4c009
2018-05-15 13:12:20 -07:00
hughchen
cf48c439b7 Merge "Add and update string" into pi-dev am: ef9b8cda82
am: 5487984da5

Change-Id: I2844fcdf4bf053434d4f5a57e367dfe1a3bf7b97
2018-05-15 12:32:16 -07:00
Jeff Gaston
d9cdfcdbe8 Merge "Update for support library prebuilt drop" into pi-dev am: 72f57a7c99
am: 77122cf150

Change-Id: I0ba9f459736e597e08dddaa72aff86598082937d
2018-05-15 12:09:33 -07: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