Commit Graph

47350 Commits

Author SHA1 Message Date
Xin Li
23c549b996 Merge "Merge Android Pie into master" am: eae6f13389 am: b745578205 am: ffc0419e4f
am: ecad848947

Change-Id: I2475353f2b7ff64ccd05c85b35d2eb0170f16fe6
2018-08-08 03:45:20 -07:00
Zhaoyu Su
0a9f87667f Fix ACTION_NFC_SETTINGS doesn't show connection preference
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.

Test: send intent with action "android.settings.NFC_SETTINGS"
Bug: 111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
2018-08-08 18:42:27 +09:00
Xin Li
ecad848947 Merge "Merge Android Pie into master" am: eae6f13389 am: b745578205
am: ffc0419e4f

Change-Id: If8a871860b5af69788ffecd79a3a4f38c4b764ef
2018-08-07 22:54:42 -07:00
TreeHugger Robot
0d9f3abc55 Merge "Convert ProfileSelectDialog to androidx verison" 2018-08-08 04:53:54 +00:00
TreeHugger Robot
f177af7f9d Merge "Fix failed test cases" 2018-08-08 04:31:40 +00:00
TreeHugger Robot
05bec1d1d3 Merge "Remove the function that not used in BluetoothCallback" 2018-08-08 04:17:53 +00:00
Raff Tsai
72cfe1a17a Fix failed test cases
It looks like robolectric need some change to fit current
support library or framework. We add shadow to replace
some crashed function.

Fixes: 111941314
Test: make RunSettingsRoboTests
Change-Id: If5afadf3c602fc2aa961a04f7022079c43e99c63
2018-08-08 11:17:44 +08:00
tmfang
800f713021 Convert ProfileSelectDialog to androidx verison
Change-Id: Ib3baf04860aee07e5f28d7b537a99a3543d2a978
Fixes: 112155563
Test: robo, manual test
2018-08-08 10:33:11 +08:00
TreeHugger Robot
fbc325a9aa Merge "Get Tile#intent through getter" 2018-08-08 02:08:06 +00:00
Xin Li
ffc0419e4f Merge "Merge Android Pie into master" am: eae6f13389
am: b745578205

Change-Id: I6da67456fef37ea0df3b003c0190692e9aeaf571
2018-08-07 18:37:11 -07:00
TreeHugger Robot
06c9bd2cdb Merge "Fix profile photo chooser" 2018-08-07 23:10:12 +00:00
Xin Li
b745578205 Merge "Merge Android Pie into master"
am: eae6f13389

Change-Id: I8da592027bd7658b9d900aa8fae529c4bf7a6a7d
2018-08-07 15:06:54 -07:00
Antony Sargent
dbe907b2cf Fix profile photo chooser
The underlying Dialog API changed when it returns true for isShowing()
in a way that broke our profile photo chooser, but it turns out it was
an intended change and we were depending on it in a way we shouldn't
have been. Instead we'll just keep track of whether we were showing the
dialog by using an already existing boolean flag that gets set before we
start the photo collection activity.

Fixes: 110101157
Test: make -j RunSettingsRoboTests
Change-Id: I166230e85142c348b6760e436324261f2a41f1e0
2018-08-07 14:51:24 -07:00
Fan Zhang
3506b74659 Get Tile#intent through getter
Bug: 77600770
Test: robotests
Change-Id: I17d3556f833e6a9610fe34f382534bd90bb0499f
2018-08-07 14:50:18 -07:00
TreeHugger Robot
4453a60c17 Merge "Add a reason field to vibrator service" 2018-08-07 19:42:58 +00:00
Fan Zhang
f722e59a51 Fix memory leaks in Settings
Bug: 80507279
Test: inspected hprof before and after fix
Change-Id: I6ea2925695deb6261263649e858484e1667ec522
Merged-In: I6ea2925695deb6261263649e858484e1667ec522
2018-08-07 18:06:56 +00:00
TreeHugger Robot
b9b4a68862 Merge "Treat icon color metadata as raw value instead of reference" 2018-08-07 17:37:26 +00:00
Xin Li
eae6f13389 Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Fan Zhang
58543721f8 Treat icon color metadata as raw value instead of reference
Bug: 79841665
Test: robotests
Change-Id: I1216718e45e80a428e8a0edb7b9accf5325be769
2018-08-07 09:15:23 -07:00
TreeHugger Robot
2774768536 Merge "Use CustomDialogPreferenceCompat for ZenDuration" 2018-08-07 14:12:59 +00:00
timhypeng
8833bb61d2 remove unnecessary mock in BluetoothDeviceUpdaterTest
Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: If1c46614ec6e40c66eb121cc48caa1fbc9c39871
2018-08-07 08:21:51 +00:00
Xin Li
40a1c33e24 Merge Android Pie into master
Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
2018-08-06 16:51:22 -07:00
TreeHugger Robot
fa44a94aa9 Merge "Add a boolean flag to show or hide Private DNS in Network & internet." 2018-08-06 19:07:14 +00:00
TreeHugger Robot
ac94606cdf Merge "Clean up task affinity" 2018-08-06 18:32:37 +00:00
Fan Zhang
6c6239bc96 Clean up task affinity
Bug: 112254258
Test: manual
Change-Id: Ifd9321f5d0532f01db2f6c0b97c914418e3a15e7
2018-08-06 10:17:13 -07:00
Beverly
c4d473c613 Use CustomDialogPreferenceCompat for ZenDuration
Test: ZenModeDurationPreferenceControllerTest
Bug: 112041657
Change-Id: I0158a703d26f73512c560889d6549d68230bf98e
2018-08-06 11:41:03 -04:00
hughchen
de6d3202e1 Remove the function that not used in BluetoothCallback
Bug: 111811266
Test: Build pass
Change-Id: Ib33ec31607931f5e67d5119cf9b0cb6b894794a0
2018-08-06 17:53:08 +08:00
timhypeng
3cd093efe8 remove unnecessary mock in ConnectedBluetoothDeviceUpdaterTest
Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: I6a2a25ff80d7d3cd9bcf2b4223afb6a80de7eb7c
2018-08-06 06:44:27 +00:00
TreeHugger Robot
1e23931f3e Merge "Remove obsolete parameter from addDevice" 2018-08-06 06:40:46 +00:00
TreeHugger Robot
67e7ee3c1b Merge "Icon color of spinner updated" 2018-08-06 04:07:19 +00:00
Bill Yi
6b4c667ebd [automerger skipped] Import translations. DO NOT MERGE am: 000f97dcf9 -s ours am: 16191b3408 -s ours
am: 4dd2c1fa3d  -s ours

Change-Id: Ia93756b2c4e84be0828826ee390d0365d804fbe4
2018-08-04 18:30:05 -07:00
Bill Yi
4dd2c1fa3d [automerger skipped] Import translations. DO NOT MERGE am: 000f97dcf9 -s ours
am: 16191b3408  -s ours

Change-Id: I25c2d0e11f48a0cfa54bd1790ab858bbec109bc3
2018-08-04 18:25:30 -07:00
Bill Yi
16191b3408 [automerger skipped] Import translations. DO NOT MERGE
am: 000f97dcf9  -s ours

Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
2018-08-04 18:21:26 -07:00
Bill Yi
000f97dcf9 Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
2018-08-04 07:43:29 -07:00
Fan Zhang
60243e6873 Remove custom tintable check.
Make a bunch keys private in tile and DashboardCategory
Bug: 77600770
Test: robotests
Change-Id: I4693e6bb71bd50cc664f578c7f8e25e67da20b67
2018-08-03 16:38:36 -07:00
Android Build Merger (Role)
36a583e2ff [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be
Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec
2018-08-03 21:04:11 +00:00
Android Build Merger (Role)
1b622b07be [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
2018-08-03 21:04:09 +00:00
Android Build Merger (Role)
aaa67659a6 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
2018-08-03 21:04:08 +00:00
Android Build Merger (Role)
782fc16dc4 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
2018-08-03 21:04:06 +00:00
Android Build Merger (Role)
c056ac3011 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
2018-08-03 21:04:04 +00:00
Doris Ling
c624deaff5 DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 14:03:37 -07:00
Doris Ling
cb68db7d4f DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 12:55:42 -07:00
Doris Ling
fff37ccb31 Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 12:25:41 -07:00
TreeHugger Robot
eda8a01c23 Merge "Move profile selector dialog to Settings" 2018-08-03 02:05:32 +00:00
Android Build Merger (Role)
8da82c40cc [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9
2018-08-03 01:03:04 +00:00
Android Build Merger (Role)
3503445e59 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f
2018-08-03 01:03:02 +00:00
Android Build Merger (Role)
d98908e7c7 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a
2018-08-03 01:03:00 +00:00
Doris Ling
cd0b97e86f DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 01:02:58 +00:00
Android Build Merger (Role)
3672a1fe7f [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
2018-08-03 01:00:48 +00:00
Doris Ling
94ea2dad5b DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-02 18:00:29 -07:00