Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646,502 Commits 3 Branches 0 Tags
d71347198dbf74a4b02a654ab528c57504361832
Commit Graph

646502 Commits

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

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

Change-Id: I6e47fba3baf5623195720b784e76583faf732507
 2021-06-12 10:33:13 +00:00
TreeHugger Robot
26f1f7366e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: efb4882744 -s ours am: cd66867a1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ce3790107ec0537e4b9fcf986b5c09bdff7cb4f
 2021-06-12 10:33:09 +00:00
TreeHugger Robot
aa10c60ee1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 14a8372d00 -s ours am: dba76d67eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf3c92c3c0afa9f7ea8a8c2526a46822c4fbdfe2
 2021-06-12 10:33:04 +00:00
Automerger Merge Worker
8c0dccbc93 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24f5ecb7f6 -s ours" into sc-dev am: 38f76e1099 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I948d8f8bb42218bb41b70994494f2b1fc2e182f3
 2021-06-12 10:33:00 +00:00
TreeHugger Robot
0af17f2d17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: cd823d7188 -s ours am: 202a2e8e58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a928bd997d0ffc3524f7d04cff55151a77860a3
 2021-06-12 10:32:51 +00:00
Automerger Merge Worker
524d7e4fdf Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24d0b735e7 -s ours" into sc-dev am: 461852a5b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2d5d1cc383ce3828c590152882486ff7f8658ff
 2021-06-12 10:32:48 +00:00
TreeHugger Robot
a53a0ced89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e4f1adacdc -s ours am: 361f35c656 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82e8f1225312e32b674d35b2ee6d0a301d2838a5
 2021-06-12 10:32:44 +00:00
Automerger Merge Worker
ddefe64a6c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a0b3854ca -s ours" into sc-dev am: 1319f44dae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec2fe25be3fe0e77753ef0cf511b96b344673cb
 2021-06-12 10:32:32 +00:00
TreeHugger Robot
0678a80127 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 67ecd1fa8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5a26a9c3488314c831860fed83ff39a2fab34d0
 2021-06-12 10:32:21 +00:00
TreeHugger Robot
d82705f42f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2ed5b793b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3cbdaaac828b62ab953cd74f7fc268a8781f1ae
 2021-06-12 10:32:12 +00:00
TreeHugger Robot
bae638f7a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8234dbef70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88a8afceb5b752203c2e7b77542e9f048e3e399f
 2021-06-12 10:32:07 +00:00
TreeHugger Robot
cd66867a1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: efb4882744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f9b1b24e063a16c70b7f7e3dd25aff28bac883b
 2021-06-12 10:31:55 +00:00
TreeHugger Robot
dba76d67eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 14a8372d00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5f3aeebdecdaeb0bc1a7482cbcaa85f7d99fa08
 2021-06-12 10:31:44 +00:00
Automerger Merge Worker
38f76e1099 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24f5ecb7f6 -s ours" into sc-dev 2021-06-12 10:31:42 +00:00
TreeHugger Robot
1ee3f493b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 90e7d7e40e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8baa4ab09fff0c4020ef679544cd99f7098bf294
 2021-06-12 10:31:33 +00:00
TreeHugger Robot
3ff016b8d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24f5ecb7f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I422f3e00fb9e61484c1c979a1f8d1115534117c6
 2021-06-12 10:31:33 +00:00
TreeHugger Robot
202a2e8e58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: cd823d7188 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie20343433b79d226537ec2960f5b3caa8f3452e1
 2021-06-12 10:31:31 +00:00
Automerger Merge Worker
461852a5b1 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24d0b735e7 -s ours" into sc-dev 2021-06-12 10:31:26 +00:00
TreeHugger Robot
2f24e2b01c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24d0b735e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83a29da2c9ff85a623b1ec2ffbbfe6d5a9edbe26
 2021-06-12 10:31:18 +00:00
TreeHugger Robot
361f35c656 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e4f1adacdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f2a34f173b53b89ee21dc07f9a71963d8fa613a
 2021-06-12 10:31:15 +00:00
Automerger Merge Worker
1319f44dae Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a0b3854ca -s ours" into sc-dev 2021-06-12 10:31:08 +00:00
TreeHugger Robot
67ecd1fa8f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-12 10:31:07 +00:00
TreeHugger Robot
2ed5b793b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-12 10:30:58 +00:00
TreeHugger Robot
3af267b6bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9fb83c35a7 -s ours am: 8dd4848df5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib885e38cda80002c41ddca9d223a3290555c41b8
 2021-06-12 10:30:53 +00:00
TreeHugger Robot
0132db7fa5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a0b3854ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f987f466bb5cebe728a97e25d4e68b5386f6e7c
 2021-06-12 10:30:51 +00:00
TreeHugger Robot
24f5ecb7f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-12 10:27:59 +00:00
TreeHugger Robot
90e7d7e40e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-12 10:26:02 +00:00
TreeHugger Robot
24d0b735e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-12 10:20:22 +00:00
TreeHugger Robot
8a0b3854ca Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-12 10:19:31 +00:00
TreeHugger Robot
8234dbef70 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:19:02 +00:00
TreeHugger Robot
efb4882744 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:16:42 +00:00
TreeHugger Robot
8dd4848df5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9fb83c35a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7d21ffaa0f864eee672d12ac020cd42bfcfa9b2
 2021-06-12 10:15:54 +00:00
TreeHugger Robot
14a8372d00 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:15:46 +00:00
TreeHugger Robot
cd823d7188 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:14:32 +00:00
TreeHugger Robot
e4f1adacdc Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:11:14 +00:00
TreeHugger Robot
9fb83c35a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-12 10:08:22 +00:00
Ben Cheng
bdf5ef060c Merge "Add more LATAM locales" into sc-dev am: 73c5c11cf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880634

Change-Id: I17753dbf1191d21ff51ad3eea50a4365ee640065
 2021-06-12 08:42:03 +00:00
Ben Cheng
73c5c11cf2 Merge "Add more LATAM locales" into sc-dev 2021-06-12 08:30:23 +00:00
Jeff Sharkey
1148230bc7 Merge "Mark fallback owners as #{LAST_RESORT_SUGGESTION}." am: e944d72ed6 am: fbae4ee2ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730395

Change-Id: Icf34836bb421a4439e5e820a48d41e4f8b6ae6d1
 2021-06-11 22:07:10 +00:00
Jeff Sharkey
fbae4ee2ce Merge "Mark fallback owners as #{LAST_RESORT_SUGGESTION}." am: e944d72ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730395

Change-Id: Ifc4246756375bbc9e191dfd91a3b0879729bd194
 2021-06-11 21:46:16 +00:00
Jeff Sharkey
e944d72ed6 Merge "Mark fallback owners as #{LAST_RESORT_SUGGESTION}." 2021-06-11 21:29:05 +00:00
Jeff Sharkey
d107e4efa6 Mark fallback owners as #{LAST_RESORT_SUGGESTION}. 
These top-level owners are only designed to offer fallback support
in situations such as local OWNERS files becoming stale, large-scale
changes, etc.

When local owners have been defined by a sub-team, only those owners
should appear in the Gerrit suggestions list.

Bug: 181661570
Test: none
Change-Id: Ib201cb32e97707d35df077128f4c5e8205124b7f
 2021-06-11 20:55:44 +00:00
Ady Abraham
d22f6e9c68 Merge changes I77ca4305,Ia0278e98 into sc-dev am: 1a49d4f799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891094

Change-Id: Iae671c76b663f856f71ab63a252e8a9923525773
 2021-06-11 20:36:20 +00:00
Ady Abraham
1a49d4f799 Merge changes I77ca4305,Ia0278e98 into sc-dev 
* changes:
  Don't call setFrameRate if refresh rate switching is disabled
  DisplayManagerGlobal: suppress redundant AChoreographer_refreshRateCallback calls
 2021-06-11 20:22:39 +00:00
Jeff DeCew
20882be003 Merge "Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had." into sc-dev am: 293436dfbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937771

Change-Id: I47ca02d68772fa06d6e2401429bb1da5a1609c2a
 2021-06-11 20:16:46 +00:00
Jeff DeCew
293436dfbd Merge "Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had." into sc-dev 2021-06-11 20:04:26 +00:00
Alison Cichowlas
26fc28f8b6 Merge "Dear robots, please send bugs to our triage queue not a random team member." am: 399531f8fd am: 1535d073fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734112

Change-Id: Ic772acd83d962b66316f8402d0fe341cad679ba5
 2021-06-11 19:21:01 +00:00
Sally Yuen
2875d81a6b Merge "Unregister IA11yManagerClient in ToastPresenter" into sc-dev am: 77ea3710bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805805

Change-Id: I6912ab4b25d3ee759f42a4ca2a0a5f2b013b5a28
 2021-06-11 19:17:07 +00:00
Matt Casey
d85baf60f5 Merge "Align transition image to preview top" into sc-dev am: 55af28185e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946265

Change-Id: Ibed11e2c5876edb1297041fcbdf85d0ddb4a562e
 2021-06-11 19:16:46 +00:00
Beth Thibodeau
72aac82aa9 Merge "Fix issues with media control size" into sc-dev am: f2dc063dd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14939987

Change-Id: I8137f61441c5b145565c0ec386c73d3a168c1c73
 2021-06-11 19:15:43 +00:00