Commit Graph

645006 Commits

Author SHA1 Message Date
Winson Chung
9f6c848df3 Merge "Ensure the back gesture window is not touchable" into sc-dev am: 4c0f4e3a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14926475

Change-Id: I23894341666ec8ead879d6bc2f336ed6504d4ec5
2021-06-13 21:30:57 +00:00
Winson Chung
4c0f4e3a61 Merge "Ensure the back gesture window is not touchable" into sc-dev 2021-06-13 20:50:30 +00:00
TreeHugger Robot
f77c2ff73e Merge "libandroid_runtime & libhwui: use libstats*_lazy" into sc-dev am: 2aa8be16f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13935774

Change-Id: I3bfed93030252de76bc15352bd92f44bcf06f75d
2021-06-13 12:04:51 +00:00
TreeHugger Robot
2aa8be16f8 Merge "libandroid_runtime & libhwui: use libstats*_lazy" into sc-dev 2021-06-13 11:51:50 +00:00
Shubang Lu
da75f925cc Merge "MediaMetrics: Cleanup the formatting of session ID" into sc-dev am: 138a3612a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934055

Change-Id: Id175ad1824294fc695d97180af1ec3031dab81a9
2021-06-13 08:22:56 +00:00
Shubang Lu
138a3612a8 Merge "MediaMetrics: Cleanup the formatting of session ID" into sc-dev 2021-06-13 08:09:30 +00:00
TreeHugger Robot
6edd727c1d Merge "Cache Typeface for later animation" into sc-dev am: 40ee59c0fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14930139

Change-Id: Ia4391e19fbdeebbea49b8f5759a531b28d11e1b5
2021-06-13 06:35:02 +00:00
TreeHugger Robot
40ee59c0fc Merge "Cache Typeface for later animation" into sc-dev 2021-06-13 06:14:36 +00:00
TreeHugger Robot
d61b937ff2 Merge "Update footer text for Alarms & Reminders" into sc-dev am: a3a3219369
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14944746

Change-Id: I850805c5e73656f86130d5774125b5b0d8db4d91
2021-06-13 05:11:45 +00:00
TreeHugger Robot
a3a3219369 Merge "Update footer text for Alarms & Reminders" into sc-dev 2021-06-13 04:58:33 +00:00
Erik Wolsheimer
b6467b2670 Merge "Store whether attribution tag is valid separate from bypass" into sc-dev am: 6d3212e617
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14955197

Change-Id: I76343eccc841fe097596ab14d02a39b487658704
2021-06-13 03:29:09 +00:00
Erik Wolsheimer
6d3212e617 Merge "Store whether attribution tag is valid separate from bypass" into sc-dev 2021-06-13 03:19:41 +00:00
TreeHugger Robot
c4ab7b722f Merge "Fix test failure due to missing Roboto VF font" into sc-dev am: a59bbb7451
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924582

Change-Id: Ia95e928b91b66cd87781dbcc6488ee6ecb3bde37
2021-06-13 02:14:45 +00:00
TreeHugger Robot
a59bbb7451 Merge "Fix test failure due to missing Roboto VF font" into sc-dev 2021-06-13 01:58:57 +00:00
Erik Wolsheimer
947cb752b8 Store whether attribution tag is valid separate from bypass
Bug: 189484870
Bug: 190073375
Test: Manual
Change-Id: Iccc0e887d28c837a8ef4099af611794590af25c5
2021-06-12 16:36:57 -07:00
Alexander Dorokhine
7b0a2d6f3a Merge "Fix some incorrect annotations in AppSearch." into sc-dev am: 625d330a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925630

Change-Id: Ie2623ef2a9a986fd12a4680d834abd4807e61ad5
2021-06-12 23:00:17 +00:00
Alexander Dorokhine
625d330a48 Merge "Fix some incorrect annotations in AppSearch." into sc-dev 2021-06-12 22:47:17 +00:00
TreeHugger Robot
bfda804adc Merge "Set ACTION_SHOW_NEW_USER_DISCLAIMER as protected intent." into sc-dev am: 38101db3a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14926502

Change-Id: I042df716a2e8a56ebc6b5794a135b59edf385960
2021-06-12 21:00:25 +00:00
TreeHugger Robot
38101db3a2 Merge "Set ACTION_SHOW_NEW_USER_DISCLAIMER as protected intent." into sc-dev 2021-06-12 20:41:33 +00:00
TreeHugger Robot
f2c79396ff Merge "Refactor SkImageFilter usage to cache results." into sc-dev am: 98f48b4c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921729

Change-Id: I7eebfae710b972a6e84d2c579b352988a5bf74b3
2021-06-12 20:28:13 +00:00
TreeHugger Robot
98f48b4c95 Merge "Refactor SkImageFilter usage to cache results." into sc-dev 2021-06-12 20:14:14 +00:00
Rajeev Kumar
0e5a71d480 Merge "Match more flags to get runnable packages" into sc-dev am: 41b61007ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949623

Change-Id: I03b368275bcde8bdc1b87a20376be061c3d7397c
2021-06-12 19:22:21 +00:00
Rajeev Kumar
299c3ae7b0 Merge "Fix positioning bug in user switcher" into sc-dev am: d6a70b8b9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925350

Change-Id: I9453e012b7e39f8d32272c975dfbc92f185b944f
2021-06-12 19:22:00 +00:00
Rajeev Kumar
41b61007ef Merge "Match more flags to get runnable packages" into sc-dev 2021-06-12 19:10:53 +00:00
Rajeev Kumar
d6a70b8b9a Merge "Fix positioning bug in user switcher" into sc-dev 2021-06-12 19:10:33 +00:00
TreeHugger Robot
ba69e6175a Merge "Skip onMovementBoundsChanged when waiting for fixed rotation" into sc-dev am: fe8d6de401
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14939513

Change-Id: I4e0179afae3cee599f69e5d9c122bbe4223ebb9e
2021-06-12 18:34:45 +00:00
TreeHugger Robot
fe8d6de401 Merge "Skip onMovementBoundsChanged when waiting for fixed rotation" into sc-dev 2021-06-12 18:13:50 +00:00
Cyrus Boadway
378e1f28d4 Merge "Include splashscreen background color in new starting window listener" into sc-dev am: 7deb3ba4d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881305

Change-Id: I0cb2815e926a55032637caf585a63c634d868ee5
2021-06-12 17:27:27 +00:00
Cyrus Boadway
7deb3ba4d4 Merge "Include splashscreen background color in new starting window listener" into sc-dev 2021-06-12 17:14:49 +00:00
TreeHugger Robot
e5cddac7a0 Merge "Remove mIsRegistered check for setUwbEnabled" into sc-dev am: 6c3b00c116
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14943278

Change-Id: I5f23aa84137a1710b5167b0ce8ab8d58b6e9213f
2021-06-12 15:55:24 +00:00
TreeHugger Robot
6c3b00c116 Merge "Remove mIsRegistered check for setUwbEnabled" into sc-dev 2021-06-12 15:39:27 +00:00
Matt Pietal
8d0fea1842 Merge "KeyguardClockPositionAlgorithm Test updates" into sc-dev am: a38c45adde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948896

Change-Id: I95828697c44f6f2dfb99c2b255578193e0a3b72c
2021-06-12 15:05:02 +00:00
Matt Pietal
a38c45adde Merge "KeyguardClockPositionAlgorithm Test updates" into sc-dev 2021-06-12 14:54:15 +00:00
shubang
3406ff9b16 MediaMetrics: Cleanup the formatting of session ID
Use the flags Base64.NO_PADDING|Base64.NO_WRAP|Base64.URL_SAFE

This formats the id as one long string without == passing at the end,
Using -_ instead of +/ characters

Bug: 175357495
Test: atest android.media.metrics.cts.MediaMetricsAtomHostSideTests
Change-Id: Iba73976b5677e9a2e5fd3e156a55499005e26904
2021-06-12 14:12:49 +00:00
TreeHugger Robot
5c7add770c Merge "Don don't blame if attr ctx created" into sc-dev am: 55b9b53e34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14935399

Change-Id: I3e320ae0b6feb6c1661061d82762d234a87a18a5
2021-06-12 12:00:13 +00:00
TreeHugger Robot
55b9b53e34 Merge "Don don't blame if attr ctx created" into sc-dev 2021-06-12 11:46:22 +00:00
TreeHugger Robot
8de4b79651 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7b73edb5cd -s ours am: 531e242bfe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945986

Change-Id: Ic1ffec85d0ea877514aec39df7ad1c175653d338
2021-06-12 10:41:52 +00:00
TreeHugger Robot
b5535717cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 07ace9c0a1 -s ours am: a227c6e7d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946332

Change-Id: Ibcea1efe91f41f9a7603e697280ddfb4c2e701f7
2021-06-12 10:41:38 +00:00
TreeHugger Robot
fa5e300bf9 Merge "Made same APN retry maximum counter configurable" into sc-dev am: 69bd06127a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14938453

Change-Id: Ie4f9be96d47d5735a30c4c13a09c05ed023f88d9
2021-06-12 10:41:27 +00:00
TreeHugger Robot
531e242bfe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7b73edb5cd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945986

Change-Id: I8969417ff98168c932e0eee86442bb7fa91cef1b
2021-06-12 10:41:08 +00:00
TreeHugger Robot
a227c6e7d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 07ace9c0a1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946332

Change-Id: I1a7207d3e056e792407b91947b329e4bab93c257
2021-06-12 10:40:36 +00:00
TreeHugger Robot
69bd06127a Merge "Made same APN retry maximum counter configurable" into sc-dev 2021-06-12 10:38:04 +00:00
TreeHugger Robot
07ace9c0a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-12 10:37:31 +00:00
TreeHugger Robot
d90cb8698b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13a22e62e4 -s ours am: 8e07ce6493 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945972

Change-Id: Ibde3b745558967ca0a29009ed973d2dec090ca72
2021-06-12 10:36:53 +00:00
TreeHugger Robot
0b138ba58b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 082666875d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946334

Change-Id: I489aea8e9ec7c02d1c876fc89fbac6336c998b58
2021-06-12 10:36:47 +00:00
TreeHugger Robot
8e07ce6493 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13a22e62e4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945972

Change-Id: I264470435523c72025b4cadd858e7117fd8dbca3
2021-06-12 10:36:08 +00:00
TreeHugger Robot
7b73edb5cd Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:34:29 +00:00
TreeHugger Robot
082666875d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-12 10:33:59 +00:00
TreeHugger Robot
0ac125b046 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: cbce476bb6 -s ours am: fcfe705e04 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946278

Change-Id: Ia2b6ef507513acb289037dc956ab4ab567efe67d
2021-06-12 10:33:14 +00:00
TreeHugger Robot
fe63f85480 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8ac28e52cb -s ours am: 4ed329b646 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14944981

Change-Id: I171dd6fef65c30640e43a009e240a09684ce2f67
2021-06-12 10:33:11 +00:00