Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
634,989 Commits 3 Branches 0 Tags
30fc24dcbc97bceed0c54c34eb22e20cd7953179
Commit Graph

634989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
30fc24dcbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9ece19e090 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c70f2886413c4590079f1d8eb661d1183bf6a08
 2021-04-10 21:36:21 +00:00
TreeHugger Robot
bc5c954e8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8a8954ba48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf28bcdf45cec699bd720a326313b4b970143e5d
 2021-04-10 21:36:07 +00:00
TreeHugger Robot
2b12cdda7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eafe152013 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64cc186e80d320d3112e12af11b22933f3248843
 2021-04-10 21:35:53 +00:00
TreeHugger Robot
11e70fa3ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2dbfc15684 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2aeada6f9c82165f6a05d913d844f8dad6cfee24
 2021-04-10 21:35:31 +00:00
Mariia Sandrikova
5ec89fed8b Merge "Limit fixed orientation letterbox to split screen and fullscreen on task level." into sc-dev 2021-04-10 21:35:12 +00:00
TreeHugger Robot
8366cb9da8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 758ba2ec43 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ed595e483368892f3f57ff985e5bc0bef58a10a
 2021-04-10 21:35:01 +00:00
TreeHugger Robot
062b84831e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 054e4c7644 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia26b2e7919c3d4646b0bd67754b75f0121804366
 2021-04-10 21:33:41 +00:00
TreeHugger Robot
9ece19e090 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:57:49 +00:00
TreeHugger Robot
8a8954ba48 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:57:30 +00:00
TreeHugger Robot
eafe152013 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:56:20 +00:00
TreeHugger Robot
2dbfc15684 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:51:20 +00:00
TreeHugger Robot
758ba2ec43 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:48:29 +00:00
TreeHugger Robot
054e4c7644 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:44:40 +00:00
Bill Yi
fcaf2e20ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4461473391f3336d07ac50946e729d6dc0ed257c
 2021-04-10 08:44:23 -07:00
Cecilia Hong
d8a78dcb51 Merge "Add Smartspace media card in media carousel when the Ss data is available." into sc-dev 2021-04-10 14:55:08 +00:00
Bill Yi
b51c0a7b54 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I25067425b87496c35b0e19f2387fbe6a434d6769
 2021-04-10 07:05:22 -07:00
Bill Yi
9bc50085c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3989433b1100ad943c070cc7775219f4ae6db876
 2021-04-10 06:32:22 -07:00
Bill Yi
1824b046dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0861fbec5be9cd1608d65ed19a91b12bd4e8680a
 2021-04-10 05:59:16 -07:00
Mariia Sandrikova
34440439c5 Merge "Wallpaper background for letterbox." into sc-dev 2021-04-10 12:07:33 +00:00
Bill Yi
de51b99410 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If33fd0fc9c282685102a49be891bdfd166c5ca77
 2021-04-10 04:53:16 -07:00
Bill Yi
203bdc8be3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I465278d669ee62aadadd3977d52827f16ad64f9a
 2021-04-10 04:20:17 -07:00
TreeHugger Robot
f163ffe1a3 Merge "Add keylayout mapping for Dualsense game controller." into sc-dev 2021-04-10 08:17:01 +00:00
TreeHugger Robot
e8131b4e13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ccaeb0f6c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0dbd0d31e53aee11d1d9a2c53c2e6fb127f7e608
 2021-04-10 07:37:17 +00:00
TreeHugger Robot
d984b05ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1ec8674378 -s ours am: 45e9470b7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba3f62ffdb078ec6feb674565367980fdb87e8dd
 2021-04-10 07:16:18 +00:00
TreeHugger Robot
45e9470b7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1ec8674378 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38bc33f51b6617bfdeb605a1b68f80eae7b84801
 2021-04-10 06:00:58 +00:00
TreeHugger Robot
ccaeb0f6c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 05:54:38 +00:00
cecilia
629f3cb0bb Add Smartspace media card in media carousel when the Ss data is available. 
Test: Tested manually on local builds
Bug: 182813345, 181365922
Change-Id: I143b8df12f9ca65936f4871a7a8985ef9495b61e
 2021-04-10 01:30:10 -04:00
TreeHugger Robot
d942e8c649 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 918aeb2e71 -s ours am: 3793f3ca23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8d7317cab0899bd49ad0b9191d33623abc51cff
 2021-04-10 05:25:55 +00:00
TreeHugger Robot
f4da93648e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours am: bd8e63545b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4385f1b085ee6fa94ddd41c3419218d1e8571451
 2021-04-10 05:25:42 +00:00
TreeHugger Robot
bbd84dfff4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours am: 8dc1bc6cbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If959258019ead34e25536f745b688f990dd82e9a
 2021-04-10 05:25:28 +00:00
TreeHugger Robot
77999ac695 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8ecc90ea3 -s ours am: d49775ea4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9697943e89dc25f8b308d1517bc02c941c2b58ff
 2021-04-10 05:24:44 +00:00
TreeHugger Robot
1ec8674378 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 05:13:06 +00:00
TreeHugger Robot
b5e420af8b Merge "Revert^2 Initial data pipeline for Smartspace media recommendations data in media carousel." into sc-dev 2021-04-10 05:06:38 +00:00
TreeHugger Robot
3793f3ca23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 918aeb2e71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1066ff25ccd377f64f6351b24cf1c306fb8a2cc4
 2021-04-10 04:33:40 +00:00
TreeHugger Robot
bd8e63545b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35efdc93b0163b48e72c2c76ad04127b7700c326
 2021-04-10 04:33:31 +00:00
TreeHugger Robot
8dc1bc6cbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f0334c24dc2342ddcd2e52c8c3a4965aa924b77
 2021-04-10 04:33:15 +00:00
TreeHugger Robot
d49775ea4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8ecc90ea3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3a0e7d86676ec0deec870bde4a51057622cef9
 2021-04-10 04:33:03 +00:00
TreeHugger Robot
badb432a45 Merge "Update Reference RCU kl and idc files" into sc-dev 2021-04-10 04:16:25 +00:00
Shan Huang
4e784c87b1 Merge "Remove text and animated dots on wireless charging animation." into sc-dev 2021-04-10 04:08:39 +00:00
TreeHugger Robot
918aeb2e71 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:57:04 +00:00
TreeHugger Robot
fe45cc15b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:55:04 +00:00
TreeHugger Robot
f5693e6cdc Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:54:48 +00:00
TreeHugger Robot
f8ecc90ea3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:51:49 +00:00
Bill Yi
579e127fcc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3fea20a6505394081e9a89ba6d09d5b4f52061b3
 2021-04-09 19:40:24 -07:00
Cecilia Hong
d8dd3010d4 Revert^2 Initial data pipeline for Smartspace media recommendations data in media carousel. 
This reverts commit 1967209719.

Reason for revert: Forward fix with removing the bcsmartspace dependency.

Test: Tested manually on local builds
Bug: 182813345
Change-Id: Icb8cbac4e27abfa9346f9ed0ef6513f6874db556
 2021-04-10 02:07:17 +00:00
Wei Wang
cc2602452b Merge "Revert "Update face detectInteraction"" into sc-dev 2021-04-10 01:45:35 +00:00
TreeHugger Robot
c6970005ea Merge "DejankUtils fix for wrong thread init" into sc-dev 2021-04-10 01:04:21 +00:00
Bill Yi
475b98c5ad Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f7d3930b3e8cab9b99fc7344999ad4923beefd6
 2021-04-09 18:02:49 -07:00
Bill Yi
11ef406ebe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b37a09419127e9d0666775a2df2290e992f2c04
 2021-04-09 17:36:15 -07:00
Lucas Dupin
298971dba9 Merge "Add namespace to lStar" into sc-dev 2021-04-10 00:31:21 +00:00