Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772,314 Commits 3 Branches 0 Tags
de10f07e145cec0d00a523c99ffbe24895d3f69e
Commit Graph

772314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff DeCew
dcf05c8857 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: f4b38cbaba am: 8bb45f2393 -s ours am: 4fb3676dca -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

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

Change-Id: Iac75bd097cd382d3807a9aa263142075f24129b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:50:26 +00:00
Jeff DeCew
ea0f411893 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: 404ae95e7b -s ours am: 4fbe2d51fc -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 d107a27fe5 is already in history

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

Change-Id: I97e9f11743ddbb6e39b55059119459efae6660c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:50:19 +00:00
Jeff DeCew
4fb3676dca [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: f4b38cbaba am: 8bb45f2393 -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

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

Change-Id: I98203d56a6afd562b56c7130f41702123913b885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:48:54 +00:00
Alejandro Nijamkin
a9f3033fec KeyguardBottomAreaView new impl. - UI layer 
- In this third CL in the series, we create the UI layer for the
  KeyguardBottomAreaView and also start using it based on our feature
  flag
- The UI layer contains both the view-models and view-binder that uses
  them
- The KeyguardBottomAreaView class is rigged to use the
  binder/view-model combo instead of its old logic, which is kept intact

Bug: 235403546
Fix: 235403546
Test: Unit tests are included for the view-model only. Also manually
verified that the bottom area behaves as expected with the feature flag
on and with the feature flag off. Specifically:
- The buttons appear at the right times, fade away as you scroll up/down
  and disappear when the device is unlocked
- All three buttons (home controls, quick access wallet, and QR code
  scanner) work when clicked
- The indication area text properly shifts its x/y position to avoid
  pixel burn-in. This is especially visible when moving between AOD and
  lock-screen

Change-Id: Ia2e838d81be2b0f2675efdd10d046e3ed5e79ef1
 2022-08-01 13:44:03 -07:00
Jeff DeCew
8bb45f2393 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: f4b38cbaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: I17fe7c09b893a5da7d93d6103ab05ff4a0967e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:34:30 +00:00
Jeff DeCew
4fbe2d51fc [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: 404ae95e7b -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 d107a27fe5 is already in history

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

Change-Id: I38f9b216b8db1193e1a26e2c18b59802e9679b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:34:18 +00:00
Evan Rosky
2d71a01c12 Merge "Only set display ready when transfering displays" into tm-qpr-dev 2022-08-01 20:26:11 +00:00
Jeff DeCew
7ec075c5a0 Merge "Revert "Clean up index assignments and comparators"" into tm-qpr-dev 2022-08-01 20:24:38 +00:00
Jeff DeCew
f4b38cbaba Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: Ib5ca2799d3601b709ddfc4e30ab903ca5e5f4074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:15:18 +00:00
Jeff DeCew
404ae95e7b Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: Ib4ed5361ffbbbc2512c0ddf31df9208f2d2ef2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:14:14 +00:00
Andrew Solovay
81d565f643 Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd59 am: 7d00787cbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953

Change-Id: Ia80b98fd6b6e1f21af32d74b4af7367c60540fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:58:32 +00:00
Jeff DeCew
923870bfe4 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-dev am: 9b846de147 am: 66f6dad116 -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 55a6021f24 is already in history

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

Change-Id: Ib762bbb158941629fa413ecccc65f96762c74ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:58:26 +00:00
Jeff DeCew
722ca99029 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: I6ee71f28d447e32c565b5e60c558b558d965dc10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:57:07 +00:00
Darrell Shi
4d9db6618b Add home controls complication type. 
Use the correct complication type for home controls so it shows up
properly only when available.

Bug: 240707969
Fix: 240707969
Test: atest ComplicationUtilsTest#testConvertComplicationType
Test: atest DreamHomeControlsComplicationTest#complicationType
Test: on device see that home controls only shows on dreams that support
complications

Change-Id: I6c6518e35a1d94a49932e3f7a744f1b8a5095e1a
 2022-08-01 19:50:07 +00:00
Andrew Solovay
7d00787cbf Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953

Change-Id: Iaa1ea8164208ef999ceb58a8eb25b8e6e5385888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:40:06 +00:00
Jeff DeCew
66f6dad116 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-dev am: 9b846de147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346143

Change-Id: I0909b840b212f989d565827919ba18f148ed03ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:39:49 +00:00
Jeff DeCew
f7b8f7233a Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: If2e92feffef02aa3315afd3485394c7042e7af0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:38:51 +00:00
Caitlin Cassidy
d915985414 [Media TTT] Increase the default timeout to 10s, and the timeout for the 
"transfer started but not finished" state to 30s.

Fixes: 240306550
Test: manual
Change-Id: I27d2e4aecbc26c2b7f990c4ee83106c6c80fe443
 2022-08-01 19:29:42 +00:00
Caitlin Cassidy
588d1031a5 [Media TTT] Don't wake the screen if the screen is already in dream 
state.

Fixes: 239426653
Test: manual: verified chip displays on top of dream instead of fully
waking the device
Test: MediaTttChipControllerCommonTest

Change-Id: Ieef1681cfcd2cf46ed5b6faaa1f692c768ae4427
 2022-08-01 19:27:34 +00:00
Andrew Solovay
22dd45bd59 Merge "docs: Fixing typo in Activity reference" into tm-dev 2022-08-01 19:21:36 +00:00
Jeff DeCew
e35bab3aa0 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev 2022-08-01 19:18:45 +00:00
Jeff DeCew
9b846de147 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-dev 2022-08-01 19:14:53 +00:00
Caitlin Cassidy
655f988042 [Media TTT] Re-display the chip when the density/font changes. 
Test: manual
Test: media.taptotransfer tests
Fixes: 236253092
Change-Id: I15c4a4771e3ea8637de8d05fab35c41951785083
 2022-08-01 19:12:21 +00:00
Mark Renouf
bbbfa95637 Merge "Code cleanup of ScreenshotRequest and usages" into tm-qpr-dev 2022-08-01 19:07:53 +00:00
TreeHugger Robot
7fb9bfccb6 Merge "Ignore notification update for not active user" into tm-qpr-dev 2022-08-01 18:23:53 +00:00
Mark Renouf
693478bd52 Code cleanup of ScreenshotRequest and usages 
Make constructor visible for tests
Make all fields final (no setters, so already effectively final)
Remove mHasStatusBar and mHasNavBar (unused)
Remove overload 'takeScreenshot' method without a source param
Added missing @IntDef annotations to parameters

Bug: 231957192
Test: atest ScreenshotHelperTest SystemActionPerformerTest
Change-Id: Ief43bd0ba50dafac720ae18d00c3c99b8d31e2e1
 2022-08-01 18:14:33 +00:00
Alejandro Nijamkin
5c88658895 KeyguardBottomAreaView new impl. - domain layer 
- In this second CL in the series, we create the domain layer that will power
the new implementation of KeyguardBottomAreaView
- On its own, this CL doesn't do anything and nothing is using it
- The domain layer contains both the use-cases and models for them
- Use-cases serve as reusable pieces of business logic
- Most use-cases are trivial

Bug: 235403546
Test: Unit tests are included for non-trivial use-cases only. Also manually verified that the bottom area behaves as expected once the
entire CL chain is compiled together

Change-Id: I21434e24f562d7f974ac32e7b72284b2b9c3051f
 2022-08-01 10:56:24 -07:00
TreeHugger Robot
5c002a64a5 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I7d641cea03f9f35889d0ebdcf66e9bf7a0f35609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:51:59 +00:00
TreeHugger Robot
8f42b2f8d6 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev 2022-08-01 17:48:28 +00:00
Alejandro Nijamkin
39fcf4f887 KeyguardBottomAreaView new impl. - data layer 
- In this first CL in the series, we create the data layer that will power
the new implementation of KeyguardBottomAreaView
- On its own, this CL doesn't do anything and nothing is using it
- The data layer contains both the repositories and models
- There are two repositories:
  - The generic KeyguardRepository is responsible for providing generic
    application state that the view will ultimately consume. Note that
    some states are very specific to the bottom area and/or the view -
    this was done mostly as a shortcut because the current codebase
    makes it intractable to trace the true source of truth for these.
    Later, when things get cleaned up across the codebase, the
    repository can be changed to source the state from the real source
    of truth without making changes to its consumers
  - The specific KeyguardQuickAffordanceRepository is responsible for
    providing "quick affordance" (previously known as "bottom button")
    state. It creates a simple framework for defining the configuration
    for each of these buttons, positioning them on the left/right, and
    deciding which one takes precedence when more than on is available
    at the same position on the screen

Bug: 235403546
Test: Unit tests are included for both repositories and for two out of
the three quick affordance data sources. It was not possible to add a
unit test for the "home controls" data source because of my use of
`combine` which seems to not play nice with test coroutine scopes. I
also manually verified that the bottom area behaves as expected once the
entire CL chain is compiled together

Change-Id: I90f8ccf0233c8a089b564a831f14157bf2096c31
 2022-08-01 10:47:31 -07:00
Bill Lin
5f84f0e106 Fix redundant move animation on Side-FPS indicator 
There was a redundant move transition when showing
Side-FPS indicator overlayView on bouncer.
Set PRIVATE_FLAG_NO_MOVE_ANIMATION in Window LayoutParams
when adding overlayView to WindowManager to avoid move
transition.

Test: atest SidefpsControllerTest
Test: manual enable keyguard bouncer and check SFPS indicator
Fixes: 238354906
Bug: 226610828
Change-Id: Ic43ee09c39c0ffb33ea44f3b4baede9a21d4a347
 2022-08-01 17:46:25 +00:00
Jeff DeCew
3c7ff59bc6 [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into tm-dev am: 64b630c5e5 am: 530bbf8d42 -s ours 
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 0a8f3dd2a8 is already in history

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

Change-Id: I405808f9d08eef18fc59b30e7c9af2f12964e6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:43:11 +00:00
Nate Myren
04173a8154 Override 5 variable onPermissionRevoked in PermissionCallback 
This ensures that apps are properly killed after resetting app
preferences

Bug: 237485761
Test: manual
Change-Id: I050124ff6e6d3ad28cc7473de8fbde9d0d46eab9
 2022-08-01 17:40:46 +00:00
Jeff DeCew
530bbf8d42 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into tm-dev am: 64b630c5e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416132

Change-Id: Ife240fd82b841c82010c199d8157f9716e368690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:19:03 +00:00
Jeff DeCew
64cf08f78d Revert "Clean up index assignments and comparators" 
This reverts commit 6c579ef0eb.

Reason for revert: b/240857315

Change-Id: I6302bc24dd61bd59f900962fb3392f941e30c241
 2022-08-01 17:11:41 +00:00
Bill Yi
fa81e0082b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 34496ffa39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcac84416b146b4e426cdd405b8574532e15ce97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:59:04 +00:00
Bill Yi
4be9987a0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc32f7b7e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I050e8e31dd87bd4e923b874524174034ea3d50e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:59:03 +00:00
Bill Yi
9b58aa3fb9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9f97be3da1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95775089dd81564cc4f90d0f73b9a18a737384f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:58:58 +00:00
Bill Yi
73bf72cdfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ad4a0ecf2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I628361e0dae6d60b9d34cb2e2a349743ca098b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:58:48 +00:00
Bill Yi
c87433b119 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1ad15021f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9118abffdd1db0bd47b18ceb077eaf33d8db790b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:58:27 +00:00
Bill Yi
704ec32c5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c658d911b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I747de3bf613619a497eae48c0b0bb1bf01184a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:58:12 +00:00
Jeff DeCew
64b630c5e5 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into tm-dev 2022-08-01 16:57:23 +00:00
TreeHugger Robot
cd4036de5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fef13a7112 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c57cae23ea3eed0115ecc2ed809e334bc3cb71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:56:00 +00:00
Bill Yi
dfe8768c30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d9801fb28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie174e814cbd897300dd1bffdf10cec81c51e424b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:58 +00:00
TreeHugger Robot
f03da27e6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4f940a17b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic538f5d8741b17ef87d3aa1ece3629eb82272383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:56 +00:00
Bill Yi
64f4b9659b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d13d3c015 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8e181aacf4a1e50408dfa6879a055895fe3ac4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:54 +00:00
TreeHugger Robot
733592d070 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 52a3933472 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22346d532e20d11a9d9f56e687dd5fe853554b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:51 +00:00
Bill Yi
447320b830 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 810ed7e3c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9f8cc045bb41982f62829e96b61bf35ad866e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:50 +00:00
TreeHugger Robot
14adf0a793 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 949661da21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47db9174ae730ffb0d901929f201e9eb0ca533de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:41 +00:00
Bill Yi
fd449afecd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22bf769a25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37ca6073e912345749b0b7bcffbcec9c0eb2b855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:55:40 +00:00