Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,479 Commits 3 Branches 0 Tags
33a8ba28dfb47cd605c192547d2cb334e61e89cd
Commit Graph

813479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vania Januar
a279e614a1 Merge "Add @Nullable to BluetoothAdapter provider." into tm-qpr-dev am: f1f50ee221 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20814153

Change-Id: I865392c362e7f295eeafa01b375f7b5fb7ab84a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 23:02:37 +00:00
Bill Yi
7809514542 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b4838aa947 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief12e5905ccbb7470e7ad1a3705d36ddfc2fdb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 23:00:09 +00:00
Bill Yi
ade01d1ac4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b22e1284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c44266eee8efd88c177892592cea0e3f8b551d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:59:40 +00:00
Paul Wang
b5e10e8d83 Merge "Revert "Update Window Extensions library APIs"" into tm-qpr-dev am: f9701b65e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20848944

Change-Id: I2ed152ab6d38fe516b8e9002e249bbbb9b90fe20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:56:24 +00:00
TreeHugger Robot
d55869f9de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9edb42701e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f11cddea9c6481f407924eae0b4ca7255ba1ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:54:26 +00:00
Bill Yi
da1da5ae82 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96f6e21094 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If135fc7fe5275b43fc28527e04670f2c97830584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:54:13 +00:00
TreeHugger Robot
0142887a80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 588e00b3e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7446466ab898e8e3b6f2aaa032cded7d9f2c05be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:53:58 +00:00
Bill Yi
d7b47629c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7b2b12e23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib33393d10198701058528b7bf05624a25bfbca6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:53:46 +00:00
TreeHugger Robot
f5c96149c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0712e300f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff352412620a21d8f803d98d4cdde211799435b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:53:36 +00:00
Bill Yi
e8694ae668 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb0724f866 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5529bd207e9fc0b618a23ce509afbf90c6cf01fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:53:20 +00:00
TreeHugger Robot
535cc3d3d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6c50a7664 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36c8ec1a4e9065d0e10dd98e6181f3f70cbbbf30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:53:04 +00:00
Bill Yi
edbb542292 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d373b391f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia25ba821e4c5d6031f55f9b9faf4f073615f606e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:52:25 +00:00
TreeHugger Robot
230cefc5dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a75051d095 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I200eca792469c5c60ee32420fd21dd2b6aa267c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:52:08 +00:00
Bill Yi
e156a0a3d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1f84c8f6f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If337939c9c1938791af4f6718752c4b81d0dffde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:51:53 +00:00
TreeHugger Robot
dca9186377 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c69ca3b78d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d76714fd9380ac42dc52ff58f7486cc8feb6ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:51:38 +00:00
Bill Yi
b7e627b5e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a607f35868 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7504064911fad3a8eae2e096aafc50d8d20ffef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:51:25 +00:00
TreeHugger Robot
e8a7635a02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7a39df5602 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecc09ce95b22cb627fd088212179d6401ddc63d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:51:10 +00:00
Bill Yi
02d055f1f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e24113c5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf9671e3d94bdc62a9ed6e98f433fe6f8d4df18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:50:55 +00:00
TreeHugger Robot
0075a6f375 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 861140eeb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d298c286c5f5bb32052c1cda0b13621da35363d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:50:43 +00:00
Bill Yi
161888d77e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d7c0673ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa8152307853d3be3a6262b0e9bfb3cb63cb6591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:50:30 +00:00
TreeHugger Robot
5def8f6700 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2eff6ae234 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie12c5a87b9189d748dce9db551e1608e734a4514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:50:13 +00:00
Bill Yi
98211e73ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1a4f4b2a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4319f636e871178ea35b69f879fb345a6a1f0068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:50:00 +00:00
TreeHugger Robot
8ce300bd04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2ede858954 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cd271311260bf8e57525e4f35922e777b39b9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:49:36 +00:00
Bill Yi
5313c20f42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1be25fdf00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb64d86e9bab6d87acdb0238e3f965ab1705788f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:49:23 +00:00
TreeHugger Robot
b1329fe349 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5fa3d7bf7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1cb2f85710e35f724680c9d97f64be1ca06985f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:49:03 +00:00
Bill Yi
1ceb282b60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ac520b380 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66ee19326cc838c5356cae76955b37baca61063c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:48:46 +00:00
Caitlin Shkuratov
c144becdbc [SB Refactor] Remove type from ResolvedNetworkType. 
ag/20614195 made `type` obsolete.

Bug: 238425913
Test: atest MobileConnectionRepositoryTest
Change-Id: Ieb73c357e41836e18c3ad7613a8c772a7becf682
 2023-01-03 22:16:46 +00:00
Caitlin Shkuratov
1d08a47177 [SB Refactor] Make numberOfLevels a flow at the repo level. 
The carrier merged logic will need to provide `numberOfLevels` at the
repo level, so pre-emptively refactor it there now.

Bug: 238425913
Test: `adb shell am broadcast -a com.android.systemui.demo
-e command network -e mobile show -e level 4 -e datatype 4g` -> shows
full triangle
Test: all statusbar.pipeline.mobile tests

Change-Id: I7f5bc07b4ff9917b32ffb6e56a1f18dbe181e401
 2023-01-03 22:16:46 +00:00
Caitlin Shkuratov
3747a4723e [SB Refactor] Remove unused isDefaultDataSubscription flow. 
Bug: 238425913
Test: verify mobile icon still works
Test: verify mobile demo mode still works
Test: all tests in statusbar.pipeline.mobile. Specifically,
`MobileConnectionsRepositoryTest#config_subIdChangeEvent_updated`
Change-Id: Ia61ebeb0d30fc6616eb917dfaf982ef9d4bd7d57

Change-Id: I01b33b246086583bf071b0c7f1aad47c32dfd8ee
 2023-01-03 22:16:46 +00:00
Caitlin Shkuratov
7a6bbb6f26 [SB Refactor] Run the linter on WifiRepositoryImpl. 
Bug: 238425913
Test: atest WifiRepositoryImplTest

Change-Id: I873e57bff94c775a06084098d47ff716211d811a
 2023-01-03 22:16:46 +00:00
Caitlin Shkuratov
4d313e1c16 [SB Refactor] Provide a disabled wifi repo if there's no wifi manager. 
This allows WifiRepositoryImpl to use a non-null WifiManager, which
removes a lot of null checks throughout the pipeline.

Bug: 238425913
Test: verify wifi icon still works
Test: verify wifi demo mode still works
Test: verify that, when WifiManager is null, the wifi icon never shows
Test: all tests in statusbar.pipeline.wifi
Change-Id: I8de76ad554769e91f1612ddfb3e9fa6dfa9bc6ed
 2023-01-03 22:15:47 +00:00
Caitlin Shkuratov
50a849cdfa [SB Refactor] Un-ignore #onDarkChanged tests. 
See reasoning in bug.

Fixes: 262660044
Test: `atest ModernStatusBarWifiViewTest#onDarkChanged_iconHasNewColor
--iterations 100` -> all pass

Change-Id: Ic38b9698afab43f274007d9f66ff73675f526a1e
 2023-01-03 22:12:50 +00:00
Caitlin Shkuratov
f7055e6d60 [SB Refactor] Connect old pipeline visibility/tints to new mobile icons. 
The _new_ pipeline has the source of truth for whether the mobile icons
*should* be visible. But, the _old_ view system has the source of truth
for whether the mobile icons *can* be visible (i.e. if there's enough
space for it).

The _old_ view system also has the source of truth for icon tint.

This CL hooks up the old system's knowledge of visibilities and tints to
the new pipeline view.

Bug: 238425913
Test: manual: verify the mobile icon tints correctly
Test: manual: add a lot of subscriptions and verify that the
subscriptions on the left eventually shot a dot or hide completely
Test: manual: verify turning flag 611 on/off correctly shows/hides the
icon debug coloring
Test: atest ModernStatusBarMobileViewTest

Change-Id: I94d58d468eab8370b49ffbc97967570991ddd3d9
 2023-01-03 22:12:50 +00:00
Caitlin Shkuratov
ed18e21dd9 [SB Refactor] Remove the wifi-specific parts from ModernStatusBarView. 
Bug: 238425913
Test: verify wifi icon still tints correctly
Test: atest ModernStatusBarViewTest ModernStatusBarWifiViewTest
Change-Id: I86a2ca1b7ddf05dc2942faf178e702abd1d5738f
 2023-01-03 22:12:50 +00:00
Caitlin Shkuratov
8d921138b0 [SB Refactor] Move ModernStatusBarWifiView to shared. 
It'll be re-named and have the wifi-specific logic removed in the next
CL.

Bug: 238425913
Test: verify wifi icon still tints correctly
Change-Id: Icb1150bc37755caac395e8048be9b32ef78fe731
 2023-01-03 22:12:50 +00:00
Caitlin Shkuratov
c7c881a0fb [SB Refactor] Move the wifi view binding class to shared/. 
The mobile view will need the exact same binding object, so move it to
be shared between mobile and wifi.

Bug: 238425913
Test: verify wifi icon still tints correctly
Change-Id: I8ac2384a377b5fa61a429c3135f10a23c3544a40
 2023-01-03 22:11:50 +00:00
TreeHugger Robot
22b82d3814 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c439313f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77d7d1a77f2d557cbfa93899a9595200f1e20c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:08:49 +00:00
Bill Yi
cb3e908147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7a5760b71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie435bbf06977fe61f621079a01f707003663670f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:08:14 +00:00
TreeHugger Robot
511710e9cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1f293f1696 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7863a22d26c4b78714cd00d03d758b322eecaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:07:43 +00:00
Bill Yi
65ef3a183a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fbbe9619b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id320ebfedb074370c61a822194cdde1171313104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:07:09 +00:00
TreeHugger Robot
cdb5e19424 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 099f9de1d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7512f79e2cf6310745de6cf7277e5583ca599e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:04:11 +00:00
Bill Yi
e46efba096 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd204be5b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fbbb90162d9181721fe5f70199d5aaed30d40d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:03:58 +00:00
TreeHugger Robot
7e5e72e550 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8a63ef605e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic287fed2a460e791180d727c6f76f2379c915e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:03:25 +00:00
Bill Yi
74b640e2fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6baf6d00d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id43cdd1344da73f2c61e546e065e19d2be581ca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:02:52 +00:00
TreeHugger Robot
8442e4b271 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ad8ede3bbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica343961c3df42499b33272eb3f678b872ac3dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:02:26 +00:00
Bill Yi
8d0223a8e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 294ff6c009 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I632859a825001df94cf8c1224aefe20f2d3371e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:01:45 +00:00
Caitlin Shkuratov
89ffd33a06 [Chipbar] Run the linter on ChipbarCoordinator. 
Bug: N/A
Test: atest ChipbarCoordinatorTest
Change-Id: I373d54df0f7179c5b95d956a1c63149727432116
 2023-01-03 21:58:34 +00:00
TreeHugger Robot
37fd8a1d09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4edda7effa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icce96273a1f71809575f02f0ba7860cb692c2211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 21:56:04 +00:00
Bill Yi
c68ddc22bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 18e4537d57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0001aee18a76b77a53cfdb2be4fee64cd900b66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 21:55:50 +00:00
TreeHugger Robot
bfed53f19c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8bef3c34fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89b5c77516af6174b51acc7f18b85736b2f9d393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 21:55:32 +00:00