PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,477 Commits 1 Branch 0 Tags
15e38e66ac3b7e7ea71d2dce74ab8a1a598e38a8
Commit Graph

62477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
15e38e66ac Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 am: 18d42df80b 
Change-Id: Ibc58e2b8ada042754503d4b336dbcb5bb14c2395
 2020-03-30 18:08:25 +00:00
Artur Satayev
0e194b22bb [automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea am: 3054fd601f am: 36e377a475 -s ours 
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 772243ca06 is in history

Change-Id: I37da5007552ac1fe749dc7ce1d8d0fe9577a121f
 2020-03-30 18:08:08 +00:00
tim peng
18d42df80b Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 
Change-Id: Icd2d7142c994ebbd7ce67ee17119c36bc140a29e
 2020-03-30 03:45:33 +00:00
tim peng
d5bdc55390 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c 
Change-Id: I91a8a9965fda5026b5d5dacc9a91e8149db8c557
 2020-03-30 03:31:55 +00:00
tim peng
3e73d0f92c Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 
Change-Id: Ic593ca5ddc1774b7b6895fee106dba8c595ff8a0
 2020-03-30 03:14:35 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Artur Satayev
36e377a475 Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea am: 3054fd601f 
Change-Id: Ic0fd6a10e88f8e16240b54ab8e1ed3f61510e692
 2020-03-29 18:56:01 +00:00
Artur Satayev
3054fd601f Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea 
Change-Id: I627ff295a03dd26e29b613711d4bde6ab22c7298
 2020-03-29 18:45:56 +00:00
Artur Satayev
e21aa8f776 Do not exlicitly declare dependency on changeid processor. am: 772243ca06 am: a14ed2a8ac 
Change-Id: Ib2bb4ae21901047a2b5de2b2d45433c28c1f29d4
 2020-03-29 18:34:09 +00:00
Artur Satayev
f4ddb539ea Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 
Change-Id: Ia152eba38febb9ae5f7321de77a1b5d198d9cf74
 2020-03-29 18:22:34 +00:00
Artur Satayev
a14ed2a8ac Do not exlicitly declare dependency on changeid processor. am: 772243ca06 
Change-Id: I367517c904a8bcb97df844af9c8f06c9870e198f
 2020-03-29 18:22:20 +00:00
Artur Satayev
836dcbaf91 Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev 2020-03-29 18:07:37 +00:00
Artur Satayev
f9cc52d670 Do not exlicitly declare dependency on changeid processor. 
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
 2020-03-28 16:34:10 +00:00
Artur Satayev
772243ca06 Do not exlicitly declare dependency on changeid processor. 
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
 2020-03-28 16:30:47 +00:00
Kevin Chyn
01768d4879 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: dd0a4963c6 am: ee255b5cda 
Change-Id: I5c2d15f9aa15d98c0d37e07f0b3b26e40aefc3be
 2020-03-28 00:44:50 +00:00
Kevin Chyn
237ec41549 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 36359c9e96 am: 38c724f4f8 
Change-Id: Ibd3303efd001a2887f2b842bebc8b5af6e1832b0
 2020-03-28 00:22:19 +00:00
Kevin Chyn
72b0b96ef3 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: ef02804952 
Change-Id: Ibb71067cb3fc6d288ff4be8e307809e9df953956
 2020-03-28 00:21:25 +00:00
Kevin Chyn
ee255b5cda Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: dd0a4963c6 
Change-Id: I9c651f34a14a3fef87a6599c2ab3be9fd6053321
 2020-03-28 00:20:19 +00:00
Kevin Chyn
38c724f4f8 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 36359c9e96 
Change-Id: Iadea914ac19e929d4020142736bb0dc959d824f0
 2020-03-28 00:19:26 +00:00
Kevin Chyn
36359c9e96 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f 
Change-Id: Ib1da534f9cdd0e1f9a1739b9be9d7669f1ec3ca6
 2020-03-28 00:12:30 +00:00
Kevin Chyn
dd0a4963c6 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 
Change-Id: I30a3a73d57f8619b488ca4488fce34d076e14a11
 2020-03-28 00:07:04 +00:00
Kevin Chyn
ef02804952 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 
Change-Id: I4d0fd4de66f85adc86829b4b63dbaa19e5c52e02
 2020-03-28 00:07:04 +00:00
Kevin Chyn
87723f3db7 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f 
Change-Id: Ic3aeaa4cfdee235a0cd5448d8cb2b31fe47f14cc
 2020-03-28 00:06:44 +00:00
Kevin Chyn
ef28e9b75f Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev 2020-03-28 00:06:00 +00:00
Curtis Belmonte
8ce5e23d1f Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: 082137fb5a am: 8c649f1aaa 
Change-Id: I138c2310c25239ce13d3a96a80c97c8c7b197aad
 2020-03-27 23:28:40 +00:00
Curtis Belmonte
7000591ad8 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde am: 1e510e6ac1 
Change-Id: I2f5ff5b56f747f1f0ad39346ab8dd11d4ea4a29a
 2020-03-27 23:22:04 +00:00
Curtis Belmonte
aef57e3522 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: c68465f024 
Change-Id: I9f396f2a651a8a589fd2104e3bbdb70b3d018a74
 2020-03-27 23:17:39 +00:00
Curtis Belmonte
8c649f1aaa Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: 082137fb5a 
Change-Id: I4d27021826a377d4460fab95392e72c364b88bae
 2020-03-27 23:13:45 +00:00
Curtis Belmonte
1e510e6ac1 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde 
Change-Id: I5acfdaf6398efb09a0813c8b30ad98bb62badaa2
 2020-03-27 23:02:04 +00:00
Curtis Belmonte
082137fb5a Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f 
Change-Id: I991a6c351ac621b3e9c52e74864d27e56433961f
 2020-03-27 22:56:07 +00:00
Curtis Belmonte
c68465f024 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f 
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
 2020-03-27 22:55:51 +00:00
Curtis Belmonte
6654372fde Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 
Change-Id: Ifa42922dfc21fadf3ff3dbdc32e6f4314f5846cb
 2020-03-27 22:48:07 +00:00
Curtis Belmonte
33851b108f Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 
Change-Id: Ia6c51e1c80bdf988c3a24f4268ef2130ee549f5b
 2020-03-27 22:47:17 +00:00
Curtis Belmonte
da4f9f7c27 Merge "Set CDC detail string as subtitle, not description" into rvc-dev 2020-03-27 22:42:22 +00:00
Kevin Chyn
28a034d6ed Adjust ConfirmDeviceCredentialActivity system bars 
CDCA is a transparent activity with the sole purpose of
requesting authentication. Since authentication is all drawn
by SystemUI, we should also stop this activity from drawing
the StatusBar.

Register to receive biometric system events (early user canceled),
so that we can finish() and start the activity transition
simultaneously. This fixes some navigation bar jank.

Bug: 148273355

Test: Set up a work profile, then install BiometricPromptDemo
      Disable one-lock and set up a password/biometric for the
      work profile. Lock/unlock screen, then open the work
      profile version of the app. No status bar jank seen.
Change-Id: I54a352527ed007dcaf1bea14a51711e4022fe028
 2020-03-27 12:12:30 -07:00
Julia Reynolds
c3062aee26 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: 6e72355438 am: f33624e7a5 
Change-Id: Ia64c5fedc0be3572224413c1050ea4c3e40c9c8d
 2020-03-27 16:56:38 +00:00
Julia Reynolds
f33624e7a5 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: 6e72355438 
Change-Id: Ic8a913cee1e813ac893a5b7273bc29fb9b45c0a8
 2020-03-27 16:44:44 +00:00
Julia Reynolds
377fce3022 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: cfedf81a20 
Change-Id: I00be0fd352d9341d25b0203db1a66b048ad2faac
 2020-03-27 16:37:38 +00:00
Julia Reynolds
364690d789 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f 
Change-Id: If6213ccda89a2d969b06fa320724ab4d60ad71b3
 2020-03-27 16:37:12 +00:00
Julia Reynolds
cfedf81a20 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 
Change-Id: I656891f22b7c9b38221263840bc23d3faf618209
 2020-03-27 16:27:07 +00:00
Julia Reynolds
6e72355438 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 
Change-Id: Icace17540f1e3bdbb90417019ea5c29f91177f80
 2020-03-27 16:26:16 +00:00
Julia Reynolds
ade39e479f Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 
Change-Id: I083f196ec1f67e45fcbb6b9b2b6032a51dd0d8d9
 2020-03-27 16:17:07 +00:00
Julia Reynolds
e8884576f7 Merge "Fix broken test" into rvc-dev am: 5a950b763f 
Change-Id: I5fbbdc605987dc3b6080b26c94ced86340ee18c5
 2020-03-27 16:12:27 +00:00
Julia Reynolds
275f372a72 Merge "Fix broken test" into rvc-dev am: 5a950b763f 
Change-Id: If25879aec1e877bb64b1f3e2c831c677f3b80dc9
 2020-03-27 15:59:02 +00:00
TreeHugger Robot
87b21d58d3 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f am: 16d8adb1fd am: 28eb1cda17 
Change-Id: I78ba1e5feaf12b6aa364b13c27eb6dc9a34642a6
 2020-03-27 15:45:23 +00:00
Julia Reynolds
5a950b763f Merge "Fix broken test" into rvc-dev 2020-03-27 15:40:47 +00:00
Automerger Merge Worker
021fef826a Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp am: f4950d5c35 
Change-Id: Ia966eaaf2850251c7b610d16ba6fe7439b172fee
 2020-03-27 15:33:39 +00:00
TreeHugger Robot
c2864a8d25 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d am: a4a23c4bb8 
Change-Id: I5c8448c9e703c08997ff989f430dab41fc5ef358
 2020-03-27 15:33:31 +00:00
TreeHugger Robot
28eb1cda17 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f am: 16d8adb1fd 
Change-Id: If4dd1a2dc1e06984f2f642faf4b5d20f86708af4
 2020-03-27 15:33:15 +00:00
Automerger Merge Worker
f4950d5c35 Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp 2020-03-27 15:17:02 +00:00