Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
540,156 Commits 3 Branches 0 Tags
2adaca42069e342b1095f393a4e58781cd5d6629
Commit Graph

14000 Commits

Author SHA1 Message Date
Kevin Chyn
8f1768320e Merge "Clean up BiometricPrompt bundle" 2020-05-16 02:46:59 +00:00
TreeHugger Robot
a82cebec21 Merge "De-duplicate with callerTargets(added by using Intent.EXTRA_INITIAL_INTENTS) when adding DisplayResolveInfo." into rvc-dev am: e79c1056b2 am: 37334ce7d4 am: 13ac8ca930 am: e76f943138 
Change-Id: I92165da6942e9cbca30ed733d61c06b66f3965a1
 2020-05-16 00:01:48 +00:00
TreeHugger Robot
13ac8ca930 Merge "De-duplicate with callerTargets(added by using Intent.EXTRA_INITIAL_INTENTS) when adding DisplayResolveInfo." into rvc-dev am: e79c1056b2 am: 37334ce7d4 
Change-Id: Ib70478206926b68fd3b6de0535b63f01b75638f1
 2020-05-15 23:43:55 +00:00
TreeHugger Robot
e79c1056b2 Merge "De-duplicate with callerTargets(added by using Intent.EXTRA_INITIAL_INTENTS) when adding DisplayResolveInfo." into rvc-dev 2020-05-15 23:10:41 +00:00
Kevin Chyn
6b0c536b93 Clean up BiometricPrompt bundle 
We should stop using a bundle between BiometricPrompt (API),
AuthService/BiometricService, and AuthController (SystemUI)
For the below reasons

1) Bundles are too generic, and also less readable
2) Avoid needing to define default values everywhere
3) Cleaner interface
4) Convenience functions can be added within PromptInfo

We can consider having separate parcelables for
- BiometricPrompt->BiometricService
- BiometricService->AuthController
But that seems a bit overkill at the moment

Test: atest com.android.systemui.biometrics
Test: atest com.android.server.biometrics
Test: BiometricPromptDemo

Change-Id: I2911a876bf00197a13f6a406ab735a8bad5b960f
 2020-05-15 15:47:43 -07:00
Mike Digman
f692252157 Merge "Add app grouping indicators to Sharesheet" into rvc-dev am: 0b079c3383 am: 0e543bf645 am: 8eef98996d am: e7474fe922 
Change-Id: I26e2c748890639755cf04864bf07efed1ba6e2a4
 2020-05-15 22:34:13 +00:00
Mike Digman
e7474fe922 Merge "Add app grouping indicators to Sharesheet" into rvc-dev am: 0b079c3383 am: 0e543bf645 am: 8eef98996d 
Change-Id: I1f71a3abd7b93c90afe066dff669608f887f55e7
 2020-05-15 22:16:22 +00:00
Mike Digman
00a3a86389 Merge "Add app grouping indicators to Sharesheet" into rvc-dev am: 0b079c3383 am: 0e543bf645 
Change-Id: I61d73a4a0b3950ad9c3c742a2c841405bfc0544b
 2020-05-15 22:05:30 +00:00
Mike Digman
0b079c3383 Merge "Add app grouping indicators to Sharesheet" into rvc-dev 2020-05-15 21:54:16 +00:00
TreeHugger Robot
66c88e2589 Merge "Remove QS details prototype code" into rvc-dev am: 16715e7f85 am: 7835253585 am: 67b321708c am: 93bd0128e0 
Change-Id: I6c6ae2906c56520c8cb58c204b9a8920ae84d137
 2020-05-15 21:39:10 +00:00
TreeHugger Robot
e52cf06672 Merge "Correct Sharesheet icon and badge sizing" into rvc-dev am: 12ea0e4d4a am: d9f6701876 am: 3463218f8c am: 72074e656c 
Change-Id: Ibb86a5985fc9284d5c8dec7a489c0fe8886e485e
 2020-05-15 21:26:50 +00:00
TreeHugger Robot
28472b5acd Merge "Sharesheet - Fix app stacking" into rvc-dev am: 8714e7d195 am: b06daeb545 am: 0c5937781e am: 17de711358 
Change-Id: I2af5bff843c46b31d85198bb16b613c675014520
 2020-05-15 21:21:39 +00:00
TreeHugger Robot
93bd0128e0 Merge "Remove QS details prototype code" into rvc-dev am: 16715e7f85 am: 7835253585 am: 67b321708c 
Change-Id: Iebec66e327fc70c64f0e9cf78bc2aa5977bc4bc9
 2020-05-15 21:21:06 +00:00
TreeHugger Robot
85da77b3a7 Merge "Remove QS details prototype code" into rvc-dev am: 16715e7f85 am: 7835253585 
Change-Id: I2e8e2dc7b4c06fef68f4c0ff65867f2897d761a1
 2020-05-15 21:20:17 +00:00
TreeHugger Robot
16715e7f85 Merge "Remove QS details prototype code" into rvc-dev 2020-05-15 21:10:37 +00:00
TreeHugger Robot
3463218f8c Merge "Correct Sharesheet icon and badge sizing" into rvc-dev am: 12ea0e4d4a am: d9f6701876 
Change-Id: Iba112919b622ee1b3615234d9a4b3169f120fe4e
 2020-05-15 20:50:44 +00:00
TreeHugger Robot
12ea0e4d4a Merge "Correct Sharesheet icon and badge sizing" into rvc-dev 2020-05-15 20:42:21 +00:00
TreeHugger Robot
17de711358 Merge "Sharesheet - Fix app stacking" into rvc-dev am: 8714e7d195 am: b06daeb545 am: 0c5937781e 
Change-Id: I87cfd8f858101149fd71612346c16dd8b641ccd0
 2020-05-15 20:31:59 +00:00
TreeHugger Robot
c0f78c8338 Merge "Sharesheet - Fix app stacking" into rvc-dev am: 8714e7d195 am: b06daeb545 
Change-Id: I04cbd974abca6b71356c3ba9a2e334f161dcfc5b
 2020-05-15 20:21:18 +00:00
Mike Digman
438d1320f1 Add app grouping indicators to Sharesheet 
When an app publishes multiple share targets those are now
grouped under a single target. However, there is no visual
indicator of grouping. This adds that in.

Test: manual, custom built apks for testing
Fixes: 150481688
Change-Id: Ibf72cec3a337a71387928d30126b286519f03f73
 2020-05-15 12:05:32 -07:00
Song Hu
276e384e4c De-duplicate with callerTargets(added by using Intent.EXTRA_INITIAL_INTENTS) when adding DisplayResolveInfo. 
Bug: 154611479
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: I812c8275fc6f12ad52f56419eedd0c580530704a
 2020-05-15 10:01:52 -07:00
Benedict Wong
9e18eeb4a6 Merge "Add methods for IKEv2/IPsec test mode profiles" am: f44b90fdc4 am: 8b0b9d8a26 am: d84c77544b am: faea94fccd am: c4b78b72fd 
Change-Id: Ica5592c8b02effa49a8d672fb30ee703147e025e
 2020-05-15 03:50:20 +00:00
Benedict Wong
d84c77544b Merge "Add methods for IKEv2/IPsec test mode profiles" am: f44b90fdc4 am: 8b0b9d8a26 
Change-Id: I353d999ebcdd108a900abfe20be232e83147b6d2
 2020-05-15 02:51:43 +00:00
Benedict Wong
f44b90fdc4 Merge "Add methods for IKEv2/IPsec test mode profiles" 2020-05-15 02:18:02 +00:00
Fabian Kozynski
36ddca1cf3 Remove QS details prototype code 
Also remove some other leftover prototype code

Test: manual
Fixes: 156645457
Change-Id: I21f442b2501f00c78c51826a805e7be91a214c7d
 2020-05-14 15:57:40 -04:00
Matt Pietal
c9544a7e92 Sharesheet - Fix app stacking 
When there was greater than 2 candidates for app stacking, the prior
targets would get dropped.

Bug: 156220800
Test: atest ChooserActivityTest
Change-Id: Ia8494bb81e95c5415d080148a0c4f98bd243c142
 2020-05-13 21:19:40 -04:00
Mike Digman
d45a8b5d60 Correct Sharesheet icon and badge sizing 
SimpleIconFactory previously used fixed resources to render
icons and badges. Resolver and Chooser need different icon and
badge dimensions. This cause scaling issues. Move those sizes to
a styleable attr. New dimensions align with design red lines.

Test: manual
Fixes: 155813501
Change-Id: I765ba7aab1346eacf9e1cf7b6cdbfbbb14dbc3bb
 2020-05-13 12:32:19 -07:00
Antoan Angelov
6f1575bb0d Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 am: 228ba99ce7 am: 509cda43cb am: 02003bffe6 
Change-Id: I847fce4e665022ac623d815bc86f4a77e9a3e87b
 2020-05-13 19:18:31 +00:00
Antoan Angelov
509cda43cb Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 am: 228ba99ce7 
Change-Id: Ibb26480e6ecffe7f18b79a181480ae9cdf8571a2
 2020-05-13 18:30:41 +00:00
Antoan Angelov
a1d2a8d9cc Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 
Change-Id: I9c6336d8060b1f53834752b95dfa1170d2a96f16
 2020-05-13 18:19:25 +00:00
Antoan Angelov
b98da91c63 Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev 2020-05-13 18:06:06 +00:00
Automerger Merge Worker
236c99e05c Merge "Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 am: 022a82161c" into rvc-d1-dev-plus-aosp am: 3bc82e0fb8 am: 486f2374b8 
Change-Id: Ieb5c1dc254e41c27c68b2dfde94363651ac0d0a8
 2020-05-13 17:19:25 +00:00
Miranda Kephart
1e7448a0b0 Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 am: 022a82161c 
Change-Id: Id572a615f2c907eb88dcb07972167aa9fd085e9a
 2020-05-13 16:29:38 +00:00
Miranda Kephart
2be49604d1 Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 
Change-Id: I4f5eefd73aec60b2f4606e7bb18916d56384ebc6
 2020-05-13 16:23:58 +00:00
Miranda Kephart
a4b9474647 Merge "Fix NPE in ScreenshotHelper" into rvc-dev 2020-05-13 16:20:14 +00:00
arangelov
8519218a73 Initialize workProfileUserHandle before initial check for work tabs 
The shouldShowTabs() call checks for the existence of the work
profile user, which is actually initialized after that call.

Fixes: 156462936
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: Iff840826f7b008420f1a254c1044c05c27764d0c
 2020-05-13 13:59:22 +00:00
TreeHugger Robot
99edc45752 Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c am: 08aa39ec2c am: 19b93ed25b 
Change-Id: Ia63c286f4d5570f570e3552b9b974598bd8d8a39
 2020-05-13 13:37:28 +00:00
TreeHugger Robot
19b93ed25b Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c am: 08aa39ec2c 
Change-Id: I3db44c04ada8061027971135006ac7afab1da226
 2020-05-13 13:19:50 +00:00
TreeHugger Robot
50ab6ee68d Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c 
Change-Id: I4c3749b185f4abf147d5c9d88cc404c53063f1d5
 2020-05-13 13:06:57 +00:00
TreeHugger Robot
a64fc14b85 Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa 
Change-Id: I2800dccca0869637cf87a6f1354ca3cea4b258c4
 2020-05-13 12:54:55 +00:00
TreeHugger Robot
f4fa3eb9fa Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev 2020-05-13 12:41:43 +00:00
Benedict Wong
63d2bfd257 Add methods for IKEv2/IPsec test mode profiles 
This change adds the ability for IKEv2/IPsec VPN profiles to run on Test
Networks. If enabled, the IKEv2/IPsec VPN profiles will request ONLY
test networks.

Bug: 148582947
Test: FrameworksNetTests passing
Test: Added for testing
Change-Id: I2511b39b27a1e29ae97907cdb12728d13fb1628f
 2020-05-12 22:55:55 -07:00
TreeHugger Robot
3ecc9ea11c Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb am: 9679757fee am: c3d7baf52f am: 6c70a223f5 
Change-Id: I7a72ef2612e142652e2df7b8831d96ee5ff9171c
 2020-05-13 01:31:45 +00:00
TreeHugger Robot
c3d7baf52f Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb am: 9679757fee 
Change-Id: Ib4393c50d2f3a79dc6d1fed358b4dabee6cbb755
 2020-05-13 01:02:14 +00:00
TreeHugger Robot
1e68d0e33c Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb 
Change-Id: I0e62291acfcdee38d2ac4a5e418a2a5550508257
 2020-05-13 01:01:10 +00:00
TreeHugger Robot
58c274fdcb Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev 2020-05-13 00:57:28 +00:00
Beverly Tai
bc7e0347f9 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 am: 3ad107e5e0 am: 0aeae479b7 am: 3539d27256 
Change-Id: Ibbe1ed4a7ca6a74ab7515a1073428510b392b153
 2020-05-12 23:55:21 +00:00
Beverly Tai
0aeae479b7 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 am: 3ad107e5e0 
Change-Id: I1363e472c19109301070ae663cc8f439a7c9fbea
 2020-05-12 23:20:50 +00:00
Beverly Tai
574fbd1410 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 
Change-Id: Ic4225ac0d4cbbdbfd6ca0c048302a74f9715b896
 2020-05-12 22:58:50 +00:00
Beverly Tai
3fb4151b06 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev 2020-05-12 22:40:44 +00:00