Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
657,609 Commits 3 Branches 0 Tags
e7a6773456e8c14ca1d67f44c1946b778f37ac28
Commit Graph

657609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e7a6773456 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 160b74c64f -s ours am: 71ffdf9a90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29ce3dc65a11bc6b8bd2a95a6990db6c4b2eb03f
 2021-07-04 04:54:25 +00:00
TreeHugger Robot
9cffd9ebb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 92f031684d -s ours am: b18bf4837f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic458476aadc30792eaaf8b21de56554be8b13365
 2021-07-04 04:54:06 +00:00
TreeHugger Robot
71ffdf9a90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 160b74c64f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33305f7f5b173390b8b9846ff9ae854ab2557619
 2021-07-04 04:28:02 +00:00
TreeHugger Robot
b18bf4837f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 92f031684d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1509d2a4e0977370eae6fcb6f730fe871e871602
 2021-07-04 04:26:41 +00:00
TreeHugger Robot
160b74c64f Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 04:17:16 +00:00
TreeHugger Robot
92f031684d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 04:12:16 +00:00
Bill Yi
f8f0a08c5d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e9b08de100dad81a2d43afb4e3c6d2e88b962a2
 2021-07-04 02:42:26 +00:00
TreeHugger Robot
167f4bb142 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 30e2d4c8a3 -s ours am: 07b9c271a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17bf78efe3b711be939101de477ae5ee39c749e9
 2021-07-04 02:34:12 +00:00
TreeHugger Robot
4ef7556d5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8ced37a31f -s ours am: 61d887a3ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea641fdb17fb28e4fb787adca0be012c6479c4e1
 2021-07-04 02:34:05 +00:00
TreeHugger Robot
dba64291b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 10a771a46b -s ours am: 8e6b16339a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8137bc883ff9956c53f15da711a130212ba84c90
 2021-07-04 02:33:55 +00:00
TreeHugger Robot
a5bd59adb8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6349a792f4 -s ours am: fe85231cea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I355f8ec099b0ead3a4222943c694d79f63ef2f26
 2021-07-04 02:33:45 +00:00
TreeHugger Robot
07b9c271a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 30e2d4c8a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I756366ef8ff279d5ad9fe1b337cd91c2140d32b0
 2021-07-04 02:33:22 +00:00
Bill Yi
8c3fc33139 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6836a27e6e -s ours am: bb02acaa37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6eb1b02ce1109369b5a09b6f9beb58eeca103bd7
 2021-07-04 02:33:21 +00:00
TreeHugger Robot
61d887a3ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8ced37a31f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief2571c9fe03fa0343e0690e88dbb1c74e3e8fa2
 2021-07-04 02:33:06 +00:00
TreeHugger Robot
30e2d4c8a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 02:29:36 +00:00
TreeHugger Robot
8ced37a31f Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 02:29:07 +00:00
TreeHugger Robot
8e6b16339a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 10a771a46b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I124bba92b9e4993d4f94d746830e4cd6f585afd4
 2021-07-04 02:27:54 +00:00
TreeHugger Robot
10a771a46b Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 02:24:57 +00:00
TreeHugger Robot
fe85231cea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6349a792f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I623e337a171ac113d4a23d4c5017d49c74937513
 2021-07-04 02:23:11 +00:00
Bill Yi
bb02acaa37 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6836a27e6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f321f05bbaacf867f551ebbdfe6bb3ac4122c54
 2021-07-04 02:22:13 +00:00
TreeHugger Robot
6349a792f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 02:10:39 +00:00
Bill Yi
70eba94e3a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id74f29397e242d61dcc7979eec69e1ffa93022aa
 2021-07-04 01:18:41 +00:00
Bill Yi
7924d37ea4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I311fe1ac7d153bb89f35b6a44e48e882a41444df
 2021-07-04 00:57:56 +00:00
Bill Yi
2602832747 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ide5f89b24bb3d730fa4d7b9ae4c0e3f056fdfda4
 2021-07-04 00:56:46 +00:00
Bill Yi
0366c80bae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0b0a02075d7171ea12658cb65ab41122f9363a64
 2021-07-04 00:55:34 +00:00
Bill Yi
6836a27e6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8212f1742a7f2489f84f30ea26e5dac4efa00168
 2021-07-04 00:53:00 +00:00
Bill Yi
3d492989c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I459a4bac8f69ae82176480e3313d72a0c5114ab5
 2021-07-04 00:50:20 +00:00
Beth Thibodeau
fd1aee30d2 Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b979 am: 1460b849f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161370

Change-Id: Id085eaf54bea49549e410328afec88df7e8ef8f0
 2021-07-03 16:17:40 +00:00
Beth Thibodeau
c43a653548 Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b979 am: fb0ec0bbb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161370

Change-Id: I1b78772f5b35d7a97df52e1c38af4c78d4745272
 2021-07-03 16:17:22 +00:00
Beth Thibodeau
fb0ec0bbb4 Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b979 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161370

Change-Id: I616cb6a16f12d75327b1c9a7e86a6ce796f68b99
 2021-07-03 16:03:12 +00:00
Beth Thibodeau
1460b849f3 Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b979 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161370

Change-Id: Ic45ac1834ac7459c9e3aaa9e762636d23d1907b6
 2021-07-03 16:02:10 +00:00
Beth Thibodeau
1c3d54b979 Merge "Remove controls from carousel when not in manager" into sc-dev 2021-07-03 15:49:15 +00:00
Fabian Kozynski
d331cd77ef Merge "Fix some paddings in QS" into sc-dev am: 8c95f71ec3 am: 93f45af611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190047

Change-Id: I8c89df8041a97aca1d3758e8f9296cc1233112fe
 2021-07-03 13:50:56 +00:00
Fabian Kozynski
956d34df69 Merge "Fix some paddings in QS" into sc-dev am: 8c95f71ec3 am: 1da31e4873 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190047

Change-Id: I71d636105924596c0f1d8f9e29507e1bfbcf33a3
 2021-07-03 13:50:33 +00:00
Fabian Kozynski
1da31e4873 Merge "Fix some paddings in QS" into sc-dev am: 8c95f71ec3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190047

Change-Id: I2737d2344541f7d6907332b5e1c13f77b76f132a
 2021-07-03 13:36:44 +00:00
Fabian Kozynski
93f45af611 Merge "Fix some paddings in QS" into sc-dev am: 8c95f71ec3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190047

Change-Id: If40f4a45302655ea53c72ae8d65036397620f703
 2021-07-03 13:35:46 +00:00
Fabian Kozynski
8c95f71ec3 Merge "Fix some paddings in QS" into sc-dev 2021-07-03 13:22:41 +00:00
Tom Natan
4d8c8f4a0d Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc900b am: 5cbaa01396 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634

Change-Id: Iebe1853aa761cc459cc6ee5e39fb478294f5049e
 2021-07-03 12:21:35 +00:00
Tom Natan
7d4c3fb9e2 Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc900b am: f7149f15f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634

Change-Id: If5d76e4af7602aead7dadbde32f02a642f9604b1
 2021-07-03 12:21:13 +00:00
Tom Natan
f7149f15f6 Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc900b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634

Change-Id: I8d1ea625ad7e9f7831d803f00dc8cd65290ac82d
 2021-07-03 12:08:49 +00:00
Tom Natan
5cbaa01396 Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc900b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634

Change-Id: Idda8031244cf721b1d24f16363d32ecd5f6730df
 2021-07-03 12:08:15 +00:00
Tom Natan
b295cc900b Merge "Handle multiple users when adding and rechecking overrides." into sc-dev 2021-07-03 11:56:43 +00:00
TreeHugger Robot
e1dc82d3d5 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev am: 881dc456c8 am: 57ef687087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166612

Change-Id: I10025ddb23c3eb266fb4b42f1ae8eaf09ad127e9
 2021-07-03 11:05:29 +00:00
TreeHugger Robot
9f1e578942 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev am: 881dc456c8 am: fd201ca290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166612

Change-Id: I12539c925c146b233d34264da930622dff04fe46
 2021-07-03 10:58:11 +00:00
TreeHugger Robot
57ef687087 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev am: 881dc456c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166612

Change-Id: I5607b1df1e275ac5d3bf0f2a0bf75e67521b1cd6
 2021-07-03 10:45:17 +00:00
TreeHugger Robot
fd201ca290 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev am: 881dc456c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166612

Change-Id: I998e849a8e4f005c80bc1f50fbf836471be044c7
 2021-07-03 10:44:28 +00:00
TreeHugger Robot
881dc456c8 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev 2021-07-03 10:30:16 +00:00
Ahaan Ugale
3618fda894 Merge "Re-init HotwordDetectionSrvc when audioserver dies" into sc-dev am: 8fd0ab207a am: 11aca08c83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187469

Change-Id: I18f83e38dba7257b820585cdec3d65b222ccbf78
 2021-07-03 09:31:49 +00:00
Ahaan Ugale
ce1ea96e5b Merge "Re-init HotwordDetectionSrvc when audioserver dies" into sc-dev am: 8fd0ab207a am: fcf6fd3b42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187469

Change-Id: Ib68ce147087da83eb58d1bdd23dee9a8faf35617
 2021-07-03 09:31:21 +00:00
Ahaan Ugale
fcf6fd3b42 Merge "Re-init HotwordDetectionSrvc when audioserver dies" into sc-dev am: 8fd0ab207a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187469

Change-Id: I9d959ea47a110da2f15e45f0e8b4a4388e9195d3
 2021-07-03 09:13:20 +00:00