Bill Yi
e6a614371f
Import translations. DO NOT MERGE
...
Change-Id: Id2caf9f50ad42134dcfa1648e9460eec7a6a86bf
Auto-generated-cl: translation import
2018-05-16 19:35:08 -07: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
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
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
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
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
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
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
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
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
52e7880544
Merge "Migrate UnrestrictedDataAccess to DashboardFragment"
2018-05-15 18:18:19 +00: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
5229b7c549
Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists"
2018-05-15 17:16:35 +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
55e85694af
Merge "Remove old meta data declarations in manifest" into pi-dev am: 9b7f0e4c5d
...
am: 94f84da552
Change-Id: Ic78f181b03c0ae32fd09f4970c58ce7e0ba03887
2018-05-15 06:56:48 -07: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
70fd54b770
Merge "Delay index job a little bit" into pi-dev am: 5530329da2
...
am: 2d462ea467
Change-Id: I40bd038c46ed428096d8b6e17ba0326d2e98c827
2018-05-15 06:25:26 -07:00