Jason Monk
fee23c456a
Follow slice API finalization
...
Test: build
Change-Id: I5671b180a949d5038f9a73caf84a6d266ef90cfa
2018-08-09 17:03:33 -07:00
Doris Ling
6c00b94652
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours am: 8c84949c84 -s ours
...
am: 690a4a199c
2018-08-09 13:24:51 -07:00
Doris Ling
690a4a199c
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours
...
am: 8c84949c84
2018-08-09 13:17:12 -07:00
Doris Ling
8c84949c84
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
...
am: 38b9504a41
2018-08-09 13:08:34 -07:00
TreeHugger Robot
38b9504a41
Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
2018-08-09 19:47:07 +00:00
Doris Ling
44c1ea445a
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f am: 4a6da68af7 am: ce02bdc0cd
...
am: 4b770e9ac8
2018-08-09 12:30:58 -07:00
Doris Ling
735baab6d3
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517 am: ad04140966
...
am: 949e45c8af
2018-08-09 12:29:06 -07:00
Doris Ling
4b770e9ac8
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f am: 4a6da68af7
...
am: ce02bdc0cd
2018-08-09 12:21:38 -07:00
Doris Ling
949e45c8af
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517
...
am: ad04140966
2018-08-09 12:20:08 -07:00
Doris Ling
9751c5d864
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 am: 0f0147213e -s ours am: cfcfc6a677
...
am: f2335b6567
2018-08-09 12:19:05 -07:00
Doris Ling
f2335b6567
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 am: 0f0147213e -s ours
...
am: cfcfc6a677
2018-08-09 12:18:06 -07:00
Doris Ling
ce02bdc0cd
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f
...
am: 4a6da68af7
2018-08-09 12:14:46 -07:00
Doris Ling
ad04140966
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10
...
am: d1146af517
2018-08-09 12:13:30 -07:00
Doris Ling
cfcfc6a677
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146
...
am: 0f0147213e
2018-08-09 12:11:59 -07:00
Doris Ling
a4be447514
[automerger skipped] Disable changing lock when device is not provisioned. am: 770f4abf9d
...
am: bedc0dce89
2018-08-09 12:11:58 -07:00
Doris Ling
4a6da68af7
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
...
am: 9245b98d0f
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
...
am: 78a7ee2f10
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f
...
am: cff5200146
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
...
am: 197a10b053
2018-08-09 12:02:34 -07:00
Doris Ling
78a7ee2f10
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
...
am: 528be61eeb
2018-08-09 12:00:42 -07:00
Doris Ling
bedc0dce89
Disable changing lock when device is not provisioned.
...
am: 770f4abf9d
2018-08-09 11:58:38 -07:00
Doris Ling
cff5200146
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
...
am: 3672a1fe7f
2018-08-09 11:58:38 -07:00
TreeHugger Robot
197a10b053
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86fd98908e7c73503445e59cd0b97e86fd98908e7c7cd0b97e86f
2018-08-09 18:43:34 +00:00
TreeHugger Robot
528be61eeb
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5c056ac3011782fc16dc4aaa67659a61b622b07bec624deaff5c056ac3011782fc16dc4aaa67659a6c624deaff5c056ac3011782fc16dc4c624deaff5c056ac3011c624deaff5
2018-08-09 18:34:12 +00:00
TreeHugger Robot
27c9e13c92
Merge "Fix RequestPermissionActivity crash"
2018-08-09 15:58:56 +00:00
TreeHugger Robot
e46e3d1cc9
Merge "Replace LocalBluetoothAdapter with BluetoothAdapter"
2018-08-09 09:58:30 +00:00
Jordan Liu
02c202e303
[automerger skipped] Merge "Preserve leading 0s in mcc mnc" am: 593d767e15 am: c2a5c47290 am: efd3dd02b6
...
am: 7bfad68128
2018-08-08 22:03:16 -07:00
tmfang
fe50f43f3f
Fix RequestPermissionActivity crash
...
- Dialog needs to use AppCompat theme.
- Activity needs to finish itself when user closed AlertDialog.
If we don't fix it, you can see a window after AlertDialog was dismissed.
Change-Id: Idfbd6b68bcdd3b577f1459657b635b7af9397276
Fixes: 112018696
Test: robo test, manual test
2018-08-09 12:48:58 +08:00
Chienyuan
fca684aab6
Replace LocalBluetoothAdapter with BluetoothAdapter
...
LocalBluetoothAdapter is obsolete, use BluetoothAdapter instead.
Bug: 111810977
Test: make -j50 RunSettingsRoboTests
Change-Id: I5109a0296c1006a3c2e346bf966ef8901c101e30
2018-08-09 11:40:54 +08:00
Fan Zhang
25d9f3812b
[Dynamic Home] Make a new page for all top level settings
...
Since we are moving conditionals/suggestions to a different place, there
is no need to use DashboardSummary to display top level settings any
more. We can simplify a lot of code for top level settings and reduce it
to a standard DashboardFragment.
- Create a new DashboardFragment + xml for all top level internal items
- Add a PreferenceController to provide summary for Network & internet
item.
- Mark a bunch of things deprecated for future work.
Bug: 110405144
Test: robotests
Change-Id: I9f778777131c28eb836b722e089e026a59f5ddc6
2018-08-08 17:20:15 -07:00
Jordan Liu
7bfad68128
Merge "Preserve leading 0s in mcc mnc" am: 593d767e15 am: c2a5c47290
...
am: efd3dd02b6
2018-08-08 15:55:34 -07:00
Jordan Liu
efd3dd02b6
Merge "Preserve leading 0s in mcc mnc" am: 593d767e15
...
am: c2a5c47290
2018-08-08 15:50:24 -07:00
Jordan Liu
c2a5c47290
Merge "Preserve leading 0s in mcc mnc"
...
am: 593d767e15
2018-08-08 15:46:32 -07:00
Jordan Liu
593d767e15
Merge "Preserve leading 0s in mcc mnc"
2018-08-08 22:21:40 +00:00
Jordan Liu
f546b97db9
Preserve leading 0s in mcc mnc
...
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
Fan Zhang
9980096d33
Update manifest to use order metadata instead of priority
...
Bug: 77600770
Test: visuau
Change-Id: Ia8cb8764d29c4a76bb3a0aec90715810b20845d1
2018-08-08 11:29:04 -07:00
Fan Zhang
9445d15f9d
Remove priority from intent-filters for IA items
...
And use ORDER metadata instead.
Bug: 77600770
Test: robotests
Change-Id: I9862c89ff5b601fbb9fb53eaa91f03d95d501284
2018-08-08 09:09:27 -07:00
Xin Li
23c549b996
Merge "Merge Android Pie into master" am: eae6f13389 am: b745578205 am: ffc0419e4f
...
am: ecad848947
2018-08-08 03:45:20 -07:00
Xin Li
ecad848947
Merge "Merge Android Pie into master" am: eae6f13389 am: b745578205
...
am: ffc0419e4f
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
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
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
