Matt Casey
03a4bc053d
Merge "Load app icon in miniresolver." into tm-dev am: 8cdbd6c00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321625
Change-Id: I8802084bf5761806c30c484629a429cf9284c159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:27:24 +00:00
Matt Casey
8cdbd6c00a
Merge "Load app icon in miniresolver." into tm-dev
2022-05-12 12:04:57 +00:00
Song Hu
c409c89efd
Add shortcut title into pin label. Without shortcut title, the pin label does not make sense in non-English string. am: 82b7fd414d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18328646
Change-Id: I2b13c2b1870d04185f0f5cc6b5852f38046e56e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 02:30:28 +00:00
Song Hu
82b7fd414d
Add shortcut title into pin label. Without shortcut title, the pin label does not make sense in non-English string.
...
Bug: 232198467
Test: manual test on local phone
Change-Id: I5a4760ffed87ed3e573eb4c48ef754e641853f61
2022-05-12 02:02:55 +00:00
Matt Casey
126314b371
Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891
Change-Id: Ifb958ab53729011a6594dc3bd179de2cb1b3a16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:49:26 +00:00
Calvin Pan
d00dd4ee2b
Merge "Filter the locale not in resources" into tm-dev am: 53c979939c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872
Change-Id: Ieb1fbc9222934323af7b6624bcc893c2351bc5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:47:11 +00:00
Wu Ahan
75073ffaa8
Merge "Instrument jank of CUJ take screen shot" into tm-dev am: 009099e89d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729988
Change-Id: I3e41aec1cc2a28719498ed57a00a8aabacab3233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:20:41 +00:00
Tom Hsu
4c5a298909
Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev am: a3352d9664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245866
Change-Id: I6ee024052c6244866d3c77f11cfaa451a7ca9a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:19:02 +00:00
Matt Casey
7c3a2374be
Load app icon in miniresolver.
...
Awkwardly used LoadIconTask from ResovlerActivity, but trying to
constrain change as much as possible given release timeline.
Also:
- Update paddings and font sizes per mocks
(https://www.figma.com/file/sGebzybgbcKrK8nBiBSWc9/Intent-Picker-%26-Sendkit?node-id=1252%3A6083 )
Bug: 175433480
Test: Visual inspection.
Change-Id: Id7606d358183733efdf69f5ef687dd71605e853e
2022-05-11 19:42:50 +00:00
Matt Casey
ad48cd89e0
Merge "Resolve NPE when mini resolver is rotated" into tm-dev
2022-05-11 16:47:13 +00:00
Calvin Pan
53c979939c
Merge "Filter the locale not in resources" into tm-dev
2022-05-11 15:16:10 +00:00
Calvin Pan
42bb47de41
Filter the locale not in resources
...
Some 1p apps may not provide all the resources in the apk, need to
reply air update to download other language resources
Bug: 213980690
Test: Test apps that the locale in <locale-config> more than
resources.
Change-Id: I1c050ffc8bba76df42832a3641ddcba1111afd33
2022-05-11 08:02:58 +00:00
Wu Ahan
009099e89d
Merge "Instrument jank of CUJ take screen shot" into tm-dev
2022-05-11 06:35:13 +00:00
Tom Hsu
a3352d9664
Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev
2022-05-11 05:51:00 +00:00
Song Hu
04e773c395
Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev am: 6c90bbe1cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842
Change-Id: I11d92e51949b00bb6e4f182b80b6adf3bdd18a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:36:39 +00:00
Shawn Lin
06c8b78bae
Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214
Change-Id: I8e157b22b287a84fc4e579552be816a51b4cb862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:46 +00:00
Matt Casey
755cc5b04d
Resolve NPE when mini resolver is rotated
...
Was attempting to adjust padding on a View that didn't exist.
Also adding additional conditional behavior for similar issues:
- Fix the padding at the bottom based upon insets.
- Only trigger mini resolver for ResolverActivity itself.
- Add comments defining mini resolver.
Test: atest ResolverActivityTest
Test: Manual test of rotation not crashing and padding looking better.
Bug: 222497968
Bug: 175433480
Change-Id: Ie38787f61dc523bd812b828ec16830b91f61ce0b
2022-05-10 17:59:08 +00:00
Song Hu
6c90bbe1cf
Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev
2022-05-10 15:23:31 +00:00
Shawn Lin
3ab2eccace
Merge "Add multi-user support for kids mode" into tm-dev
2022-05-10 12:30:16 +00:00
tom hsu
75ed59fac9
[Panlingual][frameworks] Fix when tap search bar, will leave a big blank.
...
- Close blank layout after title disappear when search bar is expanded.
Bug: b/227287277
Test: local, see b/227287277#6
Change-Id: I6b5f6990cacf6da9e17b743519ae554af32f691d
2022-05-10 08:30:38 +00:00
Chaohui Wang
f260301608
Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990
Change-Id: If491185fc92a96dd2895eb57cf80b3c22842fdf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 06:26:08 +00:00
Shawn Lin
2b9e4b6550
Add multi-user support for kids mode
...
Listener to ACTION_USER_SWITCH intent and update the settings key when
user switched.
Bug: 231575466
Test: 1. set different settings keys for different user.
2. switch between users and see if the setting value is correct.
Change-Id: Ia1afcb6121b296b293bef0ba7d0a0be25b857554
2022-05-10 03:03:56 +00:00
Joanne Chung
724dd81653
[DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825
Change-Id: If09c9e832c2d087ae523ab189319036f9e3a6b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 02:53:42 +00:00
Chaohui Wang
4f4e8dd340
Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev
2022-05-10 02:44:48 +00:00
Joanne Chung
070275dcae
Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev
2022-05-10 00:59:33 +00:00
Alex Buynytskyy
66dd9d37e4
Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666
Change-Id: Ia2c2957ef2cd40439daf5b62b7ef489c563bfa21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 23:17:30 +00:00
Alex Buynytskyy
4220511d7e
Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev
2022-05-09 21:44:00 +00:00
Dmitri Plotnikov
8c766d1ef2
Merge "Fix recording of battery history tags" into tm-dev am: f19925afc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091
Change-Id: Iccadd3a552e9be182c71f32600675c6936b454a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 21:01:33 +00:00
Raphael Kim
706cbd6f0a
Merge "Remove package title from notification access confirmation intent" into tm-dev am: 75577e9421
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151122
Change-Id: I7cbe28e79f497ff1c3ecb60caa2627cd867945fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:41:49 +00:00
Dmitri Plotnikov
f19925afc9
Merge "Fix recording of battery history tags" into tm-dev
2022-05-09 17:56:17 +00:00
Raphael Kim
75577e9421
Merge "Remove package title from notification access confirmation intent" into tm-dev
2022-05-09 17:55:07 +00:00
Tiger Huang
752819c0b3
Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528
Change-Id: I65bef4f8b0915412a97a5102b58422d914a557be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:40:48 +00:00
Rubin Xu
ed856dfe87
Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412
Change-Id: I75581b0124116eb7efd50d892491d72d5f5b7fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:23:28 +00:00
Alex Buynytskyy
7e0ab65145
Forcefully convert to basic Intent before calling PM API.
...
AIDL can't accept subclasses, see more info in the bug
Bug: 223022163
Fixes: 223022163
Test: launch WSJ, click on share
Change-Id: I0015fda3a6fb741b109f7d3d00df1da6f7d64863
2022-05-09 09:17:23 -07:00
Tiger Huang
b8ab50b68b
Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev
2022-05-09 12:47:17 +00:00
Rubin Xu
9c9916e4d9
Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev
2022-05-09 11:41:02 +00:00
Song Hu
fbdcff39cd
ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface.
...
Test: atest
Test: test on phone
Bug: 229607293
Change-Id: I8d610e4c7033b25eea8a98885339207a723716b6
2022-05-07 22:22:27 +00:00
Hans Boehm
0c1d2d8fbf
Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 am: 29eb7ad17e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782
Change-Id: I7df909549bb80d31774ba0fa472ffaeee8ce132b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 00:35:58 +00:00
Hans Boehm
29eb7ad17e
Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782
Change-Id: I5e80ebf68b5faf3215b37bef66631452e7322d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 00:10:26 +00:00
Dmitri Plotnikov
44cb0c4e31
Fix recording of battery history tags
...
Bug: 230552845
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I018cf3f85e8ef11167e780653863b234822be27a
2022-05-06 17:08:18 -07:00
Hans Boehm
5ee3cfe147
Merge "Document VirtualRefBasePtr hazards"
2022-05-06 23:54:45 +00:00
Treehugger Robot
c92d823876
Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a am: 0db2c732ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443
Change-Id: I8ddbe81595509ca00044e4a9b1990a309ee0ab6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 21:39:02 +00:00
Treehugger Robot
0db2c732ac
Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443
Change-Id: I128625d46b2daf19ae7dbb8293f2415b940e9c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 21:16:32 +00:00
Song Hu
fb3db94c78
Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf145179
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333
Change-Id: Ic60751ea6d00a1812da32a7eb34cf7b7ea5ed30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 20:40:04 +00:00
Treehugger Robot
1e3e69212a
Merge "Set an edit uri to data of ACTION_EDIT"
2022-05-06 20:38:05 +00:00
Song Hu
42bf145179
Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev
2022-05-06 20:36:02 +00:00
Shan Huang
6ab5e39822
Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev am: e3a61826eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17952046
Change-Id: I33ca384c6ed7f423e7d70099db4870c8cfa9f01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 19:52:31 +00:00
Shan Huang
e3a61826eb
Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev
2022-05-06 19:35:42 +00:00
Hans Boehm
d72e472407
Document VirtualRefBasePtr hazards
...
Test: Treehugger
Change-Id: I6f364b4e0f73a2eb554f2902a67e774ef5890b00
2022-05-06 11:11:37 -07:00
TreeHugger Robot
ba3fbdf314
Merge "Fix logging crash in ResolverRankerService model" into tm-dev am: ad237705da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185215
Change-Id: I56d6ac42ce05554463b46b1ff920ccfbeda9ccde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 16:00:13 +00:00