OSDN Git Service
TreeHugger Robot [Wed, 15 Aug 2018 18:02:35 +0000 (18:02 +0000)]
Merge "Migrate all remaining condition cards to v2."
Fan Zhang [Tue, 14 Aug 2018 20:25:47 +0000 (13:25 -0700)]
Migrate all remaining condition cards to v2.
Bug:
112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220
Jordan Liu [Wed, 15 Aug 2018 11:54:56 +0000 (04:54 -0700)]
[automerger skipped] Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am:
5b7535d5b4 am:
b951ba66e5
am:
63910710ef -s ours
Change-Id: I577cb63948f594e0505ce9c19bb3cd1e9c4613f7
Jordan Liu [Wed, 15 Aug 2018 07:44:42 +0000 (00:44 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am:
5b7535d5b4
am:
b951ba66e5
Change-Id: I15b5f716f97efe9ba54a5dee25f2e0cbb33fecff
Kevin Chyn [Wed, 15 Aug 2018 06:34:41 +0000 (06:34 +0000)]
Merge "7/n: Add enrollment animation"
Kevin Chyn [Thu, 9 Aug 2018 23:31:09 +0000 (16:31 -0700)]
7/n: Add enrollment animation
Fixes:
112005540
Test: Tested with ag/
4749121
Change-Id: I7d51187f7b8b7a6c2c34c984740b76bc9fd89262
Jordan Liu [Wed, 15 Aug 2018 03:09:31 +0000 (20:09 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am:
5b7535d5b4
Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
Jordan Liu [Tue, 14 Aug 2018 23:54:12 +0000 (23:54 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 23:25:53 +0000 (16:25 -0700)]
[automerger skipped] Merge "Use new SubscriptionInfo constructor" am:
e8e24e7e0b am:
188272e12b
am:
d78a882bb1 -s ours
Change-Id: Idffe865742097d74f4d5373a41c5c2cf240f0032
irisykyang [Tue, 10 Apr 2018 07:34:33 +0000 (15:34 +0800)]
Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug:
77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 22:06:16 +0000 (15:06 -0700)]
Merge "Use new SubscriptionInfo constructor" am:
e8e24e7e0b
am:
188272e12b
Change-Id: I3bd584dd5e8258713bd101e488ffefea81ad0a48
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 20:59:07 +0000 (13:59 -0700)]
Merge "Use new SubscriptionInfo constructor"
am:
e8e24e7e0b
Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
TreeHugger Robot [Tue, 14 Aug 2018 19:43:37 +0000 (19:43 +0000)]
Merge "New ConditionManager"
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 18:58:25 +0000 (18:58 +0000)]
Merge "Use new SubscriptionInfo constructor"
Fan Zhang [Tue, 14 Aug 2018 18:16:31 +0000 (11:16 -0700)]
Reformat wifisettings fragment.
Bug:
111875856
Test: rebuild
Change-Id: I9f8d5aaab0dc5015416084aac273c4f01e52a4ed
Fan Zhang [Mon, 13 Aug 2018 19:10:19 +0000 (12:10 -0700)]
New ConditionManager
- Create a new ConditionManager that loads data and filters displayable
condtionals in memory
- Separete conditional controller logic and ui model
- Plumb new ui model into DashboardAdapater, and create a new
ConditionAdapter to manage UI.
Bug:
112485407
Test: robotests
Change-Id: If56d141d135341e9b8c2dc80e43c3d40b1de1340
Malcolm Chen [Thu, 9 Aug 2018 23:32:32 +0000 (16:32 -0700)]
Use new SubscriptionInfo constructor
Bug:
92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
TreeHugger Robot [Tue, 14 Aug 2018 03:06:26 +0000 (03:06 +0000)]
Merge "Save BottomSheet state when screen rotate"
Kevin Chyn [Tue, 14 Aug 2018 02:57:56 +0000 (02:57 +0000)]
Merge "Stop camera enumeration after finding first camera"
Android Build Merger (Role) [Tue, 14 Aug 2018 02:08:05 +0000 (02:08 +0000)]
Merge "Merge stage-dr1-aosp-master into stage-aosp-master am:
fbc7d27155 am:
55ce535126"
Raff Tsai [Mon, 13 Aug 2018 05:37:42 +0000 (13:37 +0800)]
Save BottomSheet state when screen rotate
- Save BottomSheet state in onSaveInstanceState
- When Settings starts from saved state, we don't need to
add fragment. Because FragmentManager already contains
fragment instance.
- Fix status bar color
Change-Id: Ic8779b8253040554409e735bd57bd9001c1d56fd
Fixes:
112428378
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 14 Aug 2018 01:54:27 +0000 (01:54 +0000)]
Merge "Move ConditionListener to a top level class."
Xin Li [Tue, 14 Aug 2018 01:43:50 +0000 (18:43 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master am:
fbc7d27155
am:
55ce535126
Change-Id: I8a5b2cefa1e2845dc621a1d94816741966070f33
Kevin Chyn [Tue, 14 Aug 2018 01:32:47 +0000 (18:32 -0700)]
Stop camera enumeration after finding first camera
The first one returned generally specifies the vendor's recommended
camera. We can also check lens focal length but it's not necessary.
Fixes:
112482387
Test: manual
Change-Id: Iab245f278ce1bf69ea95f7c081d20e837e84fe51
Xin Li [Tue, 14 Aug 2018 00:36:58 +0000 (17:36 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
am:
fbc7d27155
Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb
Fan Zhang [Tue, 14 Aug 2018 00:31:08 +0000 (17:31 -0700)]
Move ConditionListener to a top level class.
So we can use it later for furture refactoring.
Bug:
112485407
Test: rebuild
Change-Id: Ic3994464cfaff67a56f2d383490860a81f436fbd
Lei Yu [Tue, 14 Aug 2018 00:05:01 +0000 (00:05 +0000)]
Merge "Refactor the BatteryInfo"
Xin Li [Mon, 13 Aug 2018 20:01:18 +0000 (13:01 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
Bug:
112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
TreeHugger Robot [Mon, 13 Aug 2018 15:57:23 +0000 (15:57 +0000)]
Merge "Remove SettingsAppWidgetProvider and related resources"
TreeHugger Robot [Mon, 13 Aug 2018 15:04:01 +0000 (15:04 +0000)]
Merge "Always enable double tap and pick up gestures"
Mill Chen [Mon, 13 Aug 2018 10:11:54 +0000 (18:11 +0800)]
Remove SettingsAppWidgetProvider and related resources
Bug:
111514449
Test: manual, RunSettingsRoboTests
Change-Id: I91e5662148a00a2aed12341304007f3b155e181c
TreeHugger Robot [Sat, 11 Aug 2018 01:20:22 +0000 (01:20 +0000)]
Merge "Force externally injected tiles to use rounded icon."
TreeHugger Robot [Sat, 11 Aug 2018 01:13:20 +0000 (01:13 +0000)]
Merge "Move conditional stuff from dashboard/ to homepage package."
Fan Zhang [Fri, 10 Aug 2018 23:36:46 +0000 (16:36 -0700)]
Move conditional stuff from dashboard/ to homepage package.
dashboard package is not a real place for homepage stuff. Putting
Conditionals here makes it easier to refactor it for new homepage in the
future
Bug:
110405144
Bug:
112485407
Test: robotests
Change-Id: If433aeac8766124f0f4f6e5786b93ac1372bb745
Fan Zhang [Fri, 10 Aug 2018 22:37:41 +0000 (15:37 -0700)]
Force externally injected tiles to use rounded icon.
Bug:
110405144
Change-Id: Ic65200fce5010ea8077254e7a67bbe4dae886ec3
Fixes:
79748104
Test: robotests
Xiangyu/Malcolm Chen [Fri, 10 Aug 2018 22:42:21 +0000 (22:42 +0000)]
Merge "Use new SubscriptionInfo constructor"
Lucas Dupin [Fri, 10 Aug 2018 00:05:45 +0000 (17:05 -0700)]
Always enable double tap and pick up gestures
Both gestures should also work when AOD is on.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DoubleTapScreenPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PickupGesturePreferenceControllerTest
Test: manual
Bug:
111414690
Change-Id: I6552b6b6581a942dbc54f5320dda102c2ac62517
Fan Zhang [Fri, 10 Aug 2018 00:32:37 +0000 (17:32 -0700)]
Add a config to force rounded icon for DashboardFragment.
And each page has ability to turn on/off rounded icons. This CL only
adds the flag, it doesn't actually change icon shape yet.
- Boolean config in xml
- New protected method for each DashboardFragment to load config
- Plumb the boolean into DashboardFeatureProvider for future use.
- Remove some unused APIs from DashboardFeatureProvider
Bug:
110405144
Fixes:
79748104
Test: robotests
Change-Id: Id34782e75aa7289967e4dd1f4fe2978688092702
Zimuzo Ezeozue [Fri, 10 Aug 2018 17:14:13 +0000 (17:14 +0000)]
Merge "Add autofill service setting in managed profile"
TreeHugger Robot [Fri, 10 Aug 2018 16:29:41 +0000 (16:29 +0000)]
Merge "Added the CardContentProvider"
Pavel Grafov [Fri, 10 Aug 2018 10:50:38 +0000 (10:50 +0000)]
Merge "Respect per-user fingerprints on profiles with unified challenge."
TreeHugger Robot [Fri, 10 Aug 2018 08:35:33 +0000 (08:35 +0000)]
Merge "Clear connected Bluetooth device from preference when Bluetooth state is off"
hughchen [Tue, 7 Aug 2018 10:00:28 +0000 (18:00 +0800)]
Clear connected Bluetooth device from preference when Bluetooth state is off
1. Clear connected Bluetooth device from preference when Bluetooth state
is off.
2. Do not force to update the list of Bluetooth device when Bluetooth is
disable.
3. Add test to verify following situations:
1. Do not force to update the list of Bluetooth device when Bluetooth
is disable.
2. Force to update the list of Bluetooth device when Bluetooth is
enable.
3. Force to update the list of Bluetooth device when Bluetooth state
is on.
4. Clear the connected Bluetooth device from preference when
Bluetooth state is off.
Bug:
110178164
Test: make -j42 RunSettingsRoboTests
Change-Id: I8b17c5d761e010e4eab620355c8b9185543e85ed
Sunny Shao [Tue, 24 Jul 2018 10:15:55 +0000 (18:15 +0800)]
Added the CardContentProvider
- Added the CardContentProvider
- Added the CardDatabaseHelper
- Added the CardContentProviderTest, CardDatabaseHelperTest
- Modified CardDatabaseHelper and added the locale and expire_time_ms
- Added the permission for CardContentProvider
- Modified CardDatabaseHelper and added the category and availability_uri
- Added the UriMatcher
Test: robotest
Bug:
111820446
Change-Id: Ie9df065133307f4eac2680637f67be1dcb8310a3
TreeHugger Robot [Fri, 10 Aug 2018 01:55:28 +0000 (01:55 +0000)]
Merge "Clean up obsolete battery settings files"
TreeHugger Robot [Fri, 10 Aug 2018 01:45:50 +0000 (01:45 +0000)]
Merge "Follow slice API finalization"
TreeHugger Robot [Fri, 10 Aug 2018 01:45:34 +0000 (01:45 +0000)]
Merge "Let new homepage accept injected tiles"
TreeHugger Robot [Fri, 10 Aug 2018 01:32:02 +0000 (01:32 +0000)]
Merge "6/n: Add camera preview to FaceEnrollEnrolling"
jackqdyulei [Fri, 10 Aug 2018 00:02:13 +0000 (17:02 -0700)]
Refactor the BatteryInfo
Move the battery stats logic to background because it is time
consuming.
Bug:
112262502
Test: robotest still pass
Change-Id: I794bc82a4f1b5ae5a883c89d447116601a86558f
TreeHugger Robot [Fri, 10 Aug 2018 00:43:43 +0000 (00:43 +0000)]
Merge "More task affnity clean up"
jackqdyulei [Fri, 10 Aug 2018 00:13:01 +0000 (17:13 -0700)]
Clean up obsolete battery settings files
Fixes:
112440820
Test: robotest still pass
Change-Id: I91e8a4094bb2077c7998ef663d5545e9a3e18d03
Fan Zhang [Thu, 9 Aug 2018 23:50:04 +0000 (16:50 -0700)]
Let new homepage accept injected tiles
Bug:
110405144
Test: robotests
Change-Id: Idaa60fad23bab0989cccf687fb3ea47b7d56d957
Jason Monk [Mon, 6 Aug 2018 13:44:22 +0000 (09:44 -0400)]
Follow slice API finalization
Test: build
Change-Id: I5671b180a949d5038f9a73caf84a6d266ef90cfa
Zhaoyu Su [Thu, 9 Aug 2018 23:59:12 +0000 (16:59 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am:
44360bc96a am:
b69559f882 am:
2c23e6ab75
am:
d8ba38975b
Change-Id: I699ec762b84fcfe47acf7a98bd7cc4803c9fb9cb
Zhaoyu Su [Thu, 9 Aug 2018 23:44:57 +0000 (16:44 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am:
44360bc96a am:
b69559f882
am:
2c23e6ab75
Change-Id: I99bb280fd1697d890a6f44cc8cb49e0eaadef325
Fan Zhang [Thu, 9 Aug 2018 23:34:31 +0000 (16:34 -0700)]
More task affnity clean up
Change-Id: I0df4f897b0e8649add5d4e8360ec3b9b95c214fd
Fixes:
111213301
Test: manual
Malcolm Chen [Thu, 9 Aug 2018 23:32:32 +0000 (16:32 -0700)]
Use new SubscriptionInfo constructor
Bug:
92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Zhaoyu Su [Thu, 9 Aug 2018 23:31:49 +0000 (16:31 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am:
44360bc96a
am:
b69559f882
Change-Id: Ia7b74d284a1385dc401eb168d82fc9cb8756192f
Kevin Chyn [Tue, 31 Jul 2018 02:20:01 +0000 (19:20 -0700)]
6/n: Add camera preview to FaceEnrollEnrolling
Bug:
112005540
Test: manual
Change-Id: Ie4f810dffecdec9731e20d5756854d9c9f420f4b
Zhaoyu Su [Thu, 9 Aug 2018 23:20:45 +0000 (16:20 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am:
44360bc96a
Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3
TreeHugger Robot [Thu, 9 Aug 2018 22:55:49 +0000 (22:55 +0000)]
Merge "Add summary text for more top level setting tiles"
Doris Ling [Thu, 9 Aug 2018 22:45:17 +0000 (15:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours am:
bea56da7d6 -s ours am:
8143665d70 -s ours
am:
b3ad03f0ba -s ours
Change-Id: I6f9b8de654a5381a16bc9c0df13eabc53852d300
Doris Ling [Thu, 9 Aug 2018 22:40:59 +0000 (15:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours am:
bea56da7d6 -s ours
am:
8143665d70 -s ours
Change-Id: Id4783d9333f538d739c0ef6546738d2a46a4e2d9
Doris Ling [Thu, 9 Aug 2018 22:32:03 +0000 (15:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours
am:
bea56da7d6 -s ours
Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072
Doris Ling [Thu, 9 Aug 2018 22:26:36 +0000 (15:26 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours
am:
2ef0e15b66 -s ours
Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
Doris Ling [Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am:
62158f0943 -s ours
Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
TreeHugger Robot [Thu, 9 Aug 2018 21:51:32 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
Fan Zhang [Thu, 9 Aug 2018 16:51:35 +0000 (09:51 -0700)]
Add summary text for more top level setting tiles
- Connected devices
- App & notifs
- Battery
Bug:
110405144
Test: robotests
Change-Id: Ife44f7c5165483a1bad903ce90a241108ab5da25
Treehugger Robot [Thu, 9 Aug 2018 21:37:17 +0000 (21:37 +0000)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
Doris Ling [Thu, 9 Aug 2018 20:24:51 +0000 (13:24 -0700)]
[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 -s ours
Change-Id: Ib0fbb7fcaa2f0fd26687213d511dfbd185a0eac5
Doris Ling [Thu, 9 Aug 2018 20:17:12 +0000 (13:17 -0700)]
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am:
38b9504a41 -s ours
am:
8c84949c84 -s ours
Change-Id: Id93d5293c4dd5ab1a0a7b3ca816795351221ef80
Doris Ling [Thu, 9 Aug 2018 20:08:34 +0000 (13:08 -0700)]
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
am:
38b9504a41 -s ours
Change-Id: I4b2ec56d290a83730e111012dd5ab02855860c27
TreeHugger Robot [Thu, 9 Aug 2018 19:47:07 +0000 (19:47 +0000)]
Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
Doris Ling [Thu, 9 Aug 2018 19:30:58 +0000 (12:30 -0700)]
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
Change-Id: Iebb88ec7a0e4e4c2580b23515c97b3778d58188f
Doris Ling [Thu, 9 Aug 2018 19:29:06 +0000 (12:29 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb am:
78a7ee2f10 am:
d1146af517 am:
ad04140966
am:
949e45c8af
Change-Id: Id3220c286a49072a68bedde9090f8a43bea180ed
Doris Ling [Thu, 9 Aug 2018 19:21:38 +0000 (12:21 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053 am:
9245b98d0f am:
4a6da68af7
am:
ce02bdc0cd
Change-Id: Icd911b9b62e8896db8bdac80c7149555e1a47f2e
Doris Ling [Thu, 9 Aug 2018 19:20:08 +0000 (12:20 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb am:
78a7ee2f10 am:
d1146af517
am:
ad04140966
Change-Id: I14f35ecc0ac25bf95506b1ec5458a8dcf4b9b3ff
Doris Ling [Thu, 9 Aug 2018 19:19:05 +0000 (12:19 -0700)]
[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 -s ours
Change-Id: Ia1a0f9d0a728b603ec4cde705f4e4532899aba50
Doris Ling [Thu, 9 Aug 2018 19:18:06 +0000 (12:18 -0700)]
[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
Change-Id: I0c2d4ce5d64814a807bbc85be2a3be57dad3ab0a
Doris Ling [Thu, 9 Aug 2018 19:14:46 +0000 (12:14 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053 am:
9245b98d0f
am:
4a6da68af7
Change-Id: Iaa83729685f24a2504b9142c17f87452ac1d9d85
Doris Ling [Thu, 9 Aug 2018 19:13:30 +0000 (12:13 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb am:
78a7ee2f10
am:
d1146af517
Change-Id: Ic63e27409f0e1b5fe3c4cb9d152c50d9f1cef351
Doris Ling [Thu, 9 Aug 2018 19:11:59 +0000 (12:11 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f am:
cff5200146
am:
0f0147213e -s ours
Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
Doris Ling [Thu, 9 Aug 2018 19:11:58 +0000 (12:11 -0700)]
[automerger skipped] Disable changing lock when device is not provisioned. am:
770f4abf9d
am:
bedc0dce89 -s ours
Change-Id: I878c470dcfbfc8d87fa701c63a0755cdb02ae0fd
Doris Ling [Thu, 9 Aug 2018 19:06:31 +0000 (12:06 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053
am:
9245b98d0f
Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
Doris Ling [Thu, 9 Aug 2018 19:05:08 +0000 (12:05 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb
am:
78a7ee2f10
Change-Id: I82960fb637152698cb676fae82862408b1a2db75
Doris Ling [Thu, 9 Aug 2018 19:03:48 +0000 (12:03 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f
am:
cff5200146
Change-Id: I44df485b49098b69371d1248067e51559dcd4964
Doris Ling [Thu, 9 Aug 2018 19:02:34 +0000 (12:02 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev
am:
197a10b053
Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
Doris Ling [Thu, 9 Aug 2018 19:00:42 +0000 (12:00 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev
am:
528be61eeb
Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]
Disable changing lock when device is not provisioned.
am:
770f4abf9d
Change-Id: Id94aa8ed209203f0bd70fd2c1cd9bc1ac51059cd
Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
am:
3672a1fe7f
Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
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:
cd0b97e86f am:
d98908e7c7 skipped:
3503445e59
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:34:12 +0000 (18:34 +0000)]
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:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6 skipped:
1b622b07be
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
DO NOT MERGE Disable changing lock when device is not provisioned.
Pavel Grafov [Thu, 9 Aug 2018 15:51:55 +0000 (16:51 +0100)]
Respect per-user fingerprints on profiles with unified challenge.
When an app uses KeyguardManager.createConfirmDeviceCredentialIntent to ask
the user to confirm credentials, it first goes into ConfirmDeviceCredentialActivity
and then goes into ConfirmLockPattern/ConfirmLockPassword, that incorporates
a derivative of ConfirmDeviceCredentialBaseFragment to deal with the actual credential
and fingerprint checking.
There are two bits of logic that are changed:
1) ConfirmDeviceCredentialBaseFragment gets target user id from the intent,
then uses UserManager.getCredentialOwnerProfile to find the credential owner
user id. If the target user is a work profile with unified challenge,
profile owner will be primary user, otherwise it will be the same user.
When credential confirmation dialog is invoked via
KeyguardManager.createConfirmDeviceCredentialIntent, mUserId will already
correspond to credential owner because ConfirmDeviceCredentialActivity already
calls getCredentialOwnerUserId(), so real target user is not available.
With this CL ConfirmDeviceCredentialActivity doesn't query credential owner because
it will be handled later anyway.
2) Currently when confirming credentials for work profile with unified challenge
we use mEffectiveUserId (credential owner) for fingerprints, which is incorrect,
since fingerprints are per-user and primary profile fingerprints cannot unlock
work profile apps' auth-bound keys. With this CL work profile user is used for
fingerprints.
Bug:
111821299
Test: manual, tried ConfirmCredential sample app in both profiles
Test: manual, tried CA certificate installation in both profiles
Test: manual, tried separate work challenge
Change-Id: I074f773de1bd6207b01664f259bdd04766f32d41
TreeHugger Robot [Thu, 9 Aug 2018 15:58:56 +0000 (15:58 +0000)]
Merge "Fix RequestPermissionActivity crash"
TreeHugger Robot [Thu, 9 Aug 2018 09:58:30 +0000 (09:58 +0000)]
Merge "Replace LocalBluetoothAdapter with BluetoothAdapter"
Jordan Liu [Thu, 9 Aug 2018 05:03:16 +0000 (22:03 -0700)]
[automerger skipped] Merge "Preserve leading 0s in mcc mnc" am:
593d767e15 am:
c2a5c47290 am:
efd3dd02b6
am:
7bfad68128 -s ours
Change-Id: I981da46d66bcea83af925d4d72c81884f5bcbb9c
tmfang [Thu, 9 Aug 2018 04:48:58 +0000 (12:48 +0800)]
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
Chienyuan [Wed, 8 Aug 2018 07:44:42 +0000 (15:44 +0800)]
Replace LocalBluetoothAdapter with BluetoothAdapter
LocalBluetoothAdapter is obsolete, use BluetoothAdapter instead.
Bug:
111810977
Test: make -j50 RunSettingsRoboTests
Change-Id: I5109a0296c1006a3c2e346bf966ef8901c101e30
Fan Zhang [Wed, 8 Aug 2018 01:06:39 +0000 (18:06 -0700)]
[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
Jordan Liu [Wed, 8 Aug 2018 22:55:34 +0000 (15:55 -0700)]
Merge "Preserve leading 0s in mcc mnc" am:
593d767e15 am:
c2a5c47290
am:
efd3dd02b6
Change-Id: I3f42a20035fb2be92e98c33dd16b59870b8ed481
OSDN Git Service
