Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
531,464 Commits 3 Branches 0 Tags
fdc7ce1e7271cc7fc784b77bb006aabded9d4792
Commit Graph

13858 Commits

Author SHA1 Message Date
Song Hu
df3d7c5a43 Merge "Pass ChooserTarget sharing and impression info to AppPredictor. Rank ChooserTargets of the same component as per available scores returned by AppPredictor. These two features are guarded by flag "mChooserTargetRankingEnabled" Add relevant logging to make it easy to figure out root cause from bug report." into rvc-dev am: 4a9bd0da70 am: 1b888453e7 am: 82a80ba9d5 am: 63b924a0e2 
Change-Id: I985734c5444e7f93ccd1f1173011465005304691
 2020-05-04 17:33:42 +00:00
Song Hu
1b888453e7 Merge "Pass ChooserTarget sharing and impression info to AppPredictor. Rank ChooserTargets of the same component as per available scores returned by AppPredictor. These two features are guarded by flag "mChooserTargetRankingEnabled" Add relevant logging to make it easy to figure out root cause from bug report." into rvc-dev am: 4a9bd0da70 
Change-Id: I6ae30f7fb54ae3ec68439adabbf720fd75ab519a
 2020-05-04 16:51:20 +00:00
Song Hu
4a9bd0da70 Merge "Pass ChooserTarget sharing and impression info to AppPredictor. Rank ChooserTargets of the same component as per available scores returned by AppPredictor. These two features are guarded by flag "mChooserTargetRankingEnabled" Add relevant logging to make it easy to figure out root cause from bug report." into rvc-dev 2020-05-04 16:39:00 +00:00
Song Hu
5aab2d3fbe Pass ChooserTarget sharing and impression info to AppPredictor. 
Rank ChooserTargets of the same component as per available scores returned by AppPredictor.
These two features are guarded by flag "mChooserTargetRankingEnabled"
Add relevant logging to make it easy to figure out root cause from bug report.

Bug: 151112858
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: Id8c4b373ba9e2e1ae29281791e49dde8722ba9d1
 2020-05-03 15:17:54 -07:00
Winson Chung
ad7d530453 Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6fa3 am: 9f725103be am: 4d2832370d am: 20f484b50a 
Change-Id: I21a3a772831b4a445e3615980650b5e7c7761864
 2020-05-02 03:37:50 +00:00
Winson Chung
4d2832370d Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6fa3 am: 9f725103be 
Change-Id: Iee50a3281717cc282a90dcb2270142de22c89c00
 2020-05-02 03:15:05 +00:00
Winson Chung
7b6a48cecb Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6fa3 
Change-Id: If2880b5676fd62afe5c140f88733f74f09cced8e
 2020-05-02 02:58:30 +00:00
Winson Chung
4ef84183e7 Account for getDimension() also doing a pixel conversion 
Change-Id: Ie35eb98d6063a0747851e06f6da17b86ede19b41
Bug: 148104018
Test: Ensure edge swipe thresholds match resources
 2020-05-01 15:24:49 -07:00
Rubin Xu
fd84363220 Merge "Refresh strong auth alarm when admin changes policy" into rvc-dev am: bc7d9bdd5a am: 0a371c7612 am: 571806a405 am: 2b8d5b9fb8 
Change-Id: Ia788773c1618a837b73448cfa5b311fd8bb06546
 2020-05-01 11:09:55 +00:00
Rubin Xu
571806a405 Merge "Refresh strong auth alarm when admin changes policy" into rvc-dev am: bc7d9bdd5a am: 0a371c7612 
Change-Id: I718963ae503b36e55175ab3212ab43f94b9bd652
 2020-05-01 10:45:16 +00:00
Rubin Xu
3733aea8e1 Merge "Refresh strong auth alarm when admin changes policy" into rvc-dev am: bc7d9bdd5a 
Change-Id: I59bd71b9f197043fbcedd1c3a714ba774ce17ea0
 2020-05-01 10:31:20 +00:00
Rubin Xu
bc7d9bdd5a Merge "Refresh strong auth alarm when admin changes policy" into rvc-dev 2020-05-01 10:14:28 +00:00
Maryam Karimzadehgan
f1d5bd7801 Merge "Add Flags to be able to run experiments for the Back Gesture Problem." into rvc-dev am: 6ff27423b8 am: d1d00283ac am: 561e1ed80c am: 6f2bad9ea3 
Change-Id: I911feba2312ec93983567b3a6b89ee97d745f5e7
 2020-04-30 23:44:43 +00:00
Maryam Karimzadehgan
561e1ed80c Merge "Add Flags to be able to run experiments for the Back Gesture Problem." into rvc-dev am: 6ff27423b8 am: d1d00283ac 
Change-Id: Id4d357c090c6b96035d5763ed0039b44a0be1c4c
 2020-04-30 23:39:57 +00:00
Maryam Karimzadehgan
8dbbd88612 Merge "Add Flags to be able to run experiments for the Back Gesture Problem." into rvc-dev am: 6ff27423b8 
Change-Id: I3c45ce2f0c0e8069b96c3d82c73e26e9fa58a275
 2020-04-30 23:36:41 +00:00
Maryam
a142e5210b Add Flags to be able to run experiments for the Back Gesture Problem. 
Test: manual atest, adb shell device_config put systemui back_gesture_bottom_height 1000
Bug: 148104018
Change-Id: I5b0e696ca2e015d2d9a1718785f4a140cfff083f
 2020-04-30 16:23:43 +00:00
Automerger Merge Worker
d20fa451a4 Merge "Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 am: e1c304a615" into rvc-d1-dev-plus-aosp am: 5973fc34ac am: 226b24f842 
Change-Id: If995ba2c5bf2e0ada02902f037bc92a0a044e3c7
 2020-04-30 05:35:06 +00:00
Yunfan Chen
846f8acda4 Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 am: e1c304a615 
Change-Id: If709132abfdf5bae121c612ecbe39a8f4ec84475
 2020-04-30 05:04:51 +00:00
Yunfan Chen
3e87b4d891 Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 
Change-Id: If0cab89959f4f24d9f8cff1f0ea9c5835c7b4540
 2020-04-30 04:52:42 +00:00
Yunfan Chen
9f804f7593 Merge "Report caption insets change when layout" into rvc-dev 2020-04-30 04:43:47 +00:00
Rubin Xu
9e765abc56 Refresh strong auth alarm when admin changes policy 
When admin sets a new strong auth timeout policy, replace the existing
alarm (which enforces strong auth after the timeout) with a new one
with updated timeout.

Bug: 146188984
Test: atest com.android.server.locksettings.LockSettingsStrongAuthTest
Test: atest MixedManagedProfileTest#testRequiredStrongAuthTimeout
Change-Id: Ibcc13eb0d66697aff44192769b8fd817ca6800b8
 2020-04-29 16:00:04 +01:00
PETER LIANG
3da6d7a946 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a80 am: 20c4d45d6a am: 37a45d8987 am: 20ff61ee07 
Change-Id: I08ede8e33d2c5837260dbe09a7b17cfce222c75f
 2020-04-29 04:52:27 +00:00
Treehugger Robot
828aa8c863 Merge "Make me an owner of accessibility frameworks" am: 5a0d2aa4ba am: 20bee3e6de am: d0ec55625d am: 5c6b890d7a am: 51a200d9ec 
Change-Id: I18e57052b420030da4dd2a116b88e2791781afd6
 2020-04-29 04:50:36 +00:00
PETER LIANG
37a45d8987 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a80 am: 20c4d45d6a 
Change-Id: Ia00a80c7d541ba6418621ab8b7ca82c9f7811834
 2020-04-29 04:24:25 +00:00
PETER LIANG
f2aae1f829 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a80 
Change-Id: Idb809129577af1d0d75eaacf6e9bc8a3acdf2676
 2020-04-29 04:11:37 +00:00
Treehugger Robot
d0ec55625d Merge "Make me an owner of accessibility frameworks" am: 5a0d2aa4ba am: 20bee3e6de 
Change-Id: I4a695d7feaefae2640bf7f1a25bc46a144ae3582
 2020-04-29 04:10:33 +00:00
PETER LIANG
c463e56a80 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev 2020-04-29 04:08:36 +00:00
Treehugger Robot
5a0d2aa4ba Merge "Make me an owner of accessibility frameworks" 2020-04-29 03:37:54 +00:00
Isaac Chen
c27232bf33 Merge "Enable System User Home for CSI" 2020-04-29 02:19:12 +00:00
Jeffrey Huang
c133c9df05 Merge "Update process_state_changed logging" into rvc-dev am: 144788b5bb am: 7ce9800214 am: 02431a89df am: d8a729d3a1 
Change-Id: I122d97cf752fbdd87648bcb94d61e9153b97de83
 2020-04-28 23:54:24 +00:00
Jeffrey Huang
02431a89df Merge "Update process_state_changed logging" into rvc-dev am: 144788b5bb am: 7ce9800214 
Change-Id: Ied23a0bb544fb13eb106c179224e18ed791c6096
 2020-04-28 23:24:30 +00:00
Jeffrey Huang
d414cb4a07 Merge "Update process_state_changed logging" into rvc-dev am: 144788b5bb 
Change-Id: I391161333f2731e08433bd0acd49c7ebff752559
 2020-04-28 23:12:01 +00:00
Jeffrey Huang
144788b5bb Merge "Update process_state_changed logging" into rvc-dev 2020-04-28 22:56:29 +00:00
Qasid Ahmad Sadiq
dbcc760b00 Make me an owner of accessibility frameworks 
Test: Relying on treehugger. No functional changes.
Change-Id: Idbe16f9e2443ab897c7a0c5583d6088d16c4f0fd
 2020-04-28 14:42:00 -07:00
Jeffrey Huang
419197630e Update process_state_changed logging 
Log only the parent state to avoid unnecessary process states from being
sent to statsd. This may not work for all cases, but the edge cases can
be revisited later.

Bug: 135965535
Bug: 135375287
Test: manually tested using chrome
Change-Id: I87b79f5d21f186f227a5a50bbe83b56a9105348c
 2020-04-28 13:48:06 -07:00
TreeHugger Robot
6ee339746b Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662c3 am: bc76a634d7 am: de8d91473c am: 119958ecb4 
Change-Id: I9a8c2d788dcde9b93bc9dee8b10ed6c197980db2
 2020-04-28 20:45:29 +00:00
TreeHugger Robot
de8d91473c Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662c3 am: bc76a634d7 
Change-Id: I95368c02043e3a8d173c7cf84670d22d9cf02932
 2020-04-28 20:33:57 +00:00
TreeHugger Robot
cb95c883dd Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662c3 
Change-Id: Ief40a2292f73d0e24a52afb98497298a938a31f3
 2020-04-28 20:25:58 +00:00
TreeHugger Robot
bc000662c3 Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev 2020-04-28 20:17:02 +00:00
Automerger Merge Worker
2fae11a347 Merge "Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfae7 am: e1cdf50bc2" into rvc-d1-dev-plus-aosp am: b459a0407c am: b84aea71e3 
Change-Id: I4901e450999d174dc10a04133edc0430539e619b
 2020-04-28 20:07:09 +00:00
TreeHugger Robot
89bfb17e2f Merge "Move conversation app name into header" into rvc-dev am: 821b7f21b0 am: 83b97589b4 am: c233896a84 am: c4988ae74d 
Change-Id: I53de712beaabbe7777aa2b4b05431ba245da0339
 2020-04-28 20:05:26 +00:00
TreeHugger Robot
41002251ad Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfae7 am: e1cdf50bc2 
Change-Id: Iaefa29e196577b3d676d70c5f53148fcd4dfd15e
 2020-04-28 19:31:29 +00:00
TreeHugger Robot
c233896a84 Merge "Move conversation app name into header" into rvc-dev am: 821b7f21b0 am: 83b97589b4 
Change-Id: I05d003d11f6edef088553547f9fbaa1768188690
 2020-04-28 19:31:03 +00:00
TreeHugger Robot
d933374a1b Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfae7 
Change-Id: Idc3e98bd0ab3ca9f253077153322c03874a751e8
 2020-04-28 19:25:22 +00:00
TreeHugger Robot
04ccfdfae7 Merge "Don't pass initial intents to the inactive profile." into rvc-dev 2020-04-28 19:19:17 +00:00
TreeHugger Robot
e515104eae Merge "Move conversation app name into header" into rvc-dev am: 821b7f21b0 
Change-Id: I7c7e57735c952fe00fc42f5db3201f9597ce2b28
 2020-04-28 19:14:55 +00:00
TreeHugger Robot
821b7f21b0 Merge "Move conversation app name into header" into rvc-dev 2020-04-28 18:51:35 +00:00
Feng Cao
ca8cf2776d Fix a bug in InlinePresentationStyleUtils#bundleEquals 
* before the fix, the method would return false if the two bundles both
  contains a nested bundle for the same key, and the nested bundles are
  equal. i.e. the test case
  InlinePresentationStyleUtilsTest#testBundleEquals_nestedBundle_equal
  would fail.

Test: atest InlinePresentationStyleUtilsTest
Bug: 154957669

Change-Id: Ia2cf682619fa245d846972a8683d03333551df78
 2020-04-28 11:27:59 -07:00
arangelov
acc8243564 Don't pass initial intents to the inactive profile. 
Otherwise the initial intents will be shown in the other
profile as share targets. This would cause a crash when
the user selects the app, as the activity cannot
be resolved.

Fixes: 155088755
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I0604c15c35ecddf163460286b84c27daf6ca9a5b
 2020-04-28 18:52:54 +01:00
Automerger Merge Worker
b8a9dfd029 Merge "Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev am: 8862ee3891 am: 904ccaa4c0" into rvc-d1-dev-plus-aosp am: 210f5b4b8c am: b28a7f7396 
Change-Id: If94394bbc149c6f429356739f762aaaf9e19b244
 2020-04-28 14:36:21 +00:00