Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,072 Commits 3 Branches 0 Tags
3d806ea42f52c0df48324bfcad897edfa16fd92f
Commit Graph

660072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3d806ea42f Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371343

Change-Id: Ied2d4feffb231e55a18633ea4011a79fe1f154cd
 2021-12-07 20:05:03 +00:00
TreeHugger Robot
d8d54c9aac Merge "Add missing size check when parsing staged aliases" into sc-dev 2021-12-07 19:45:56 +00:00
Lucas Dupin
e2dd7e5bf8 Merge "Revert "Remove unused resources"" into sc-dev am: 18dbe0bba5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16388475

Change-Id: Ide004e5a9dfa13a0e400529af1eafa9a73a54853
 2021-12-06 16:33:32 +00:00
Lucas Dupin
18dbe0bba5 Merge "Revert "Remove unused resources"" into sc-dev 2021-12-06 16:12:03 +00:00
Aaron Tsai
7b2bced874 Revert "Remove unused resources" 
Revert "Remove unused resources"

Revert submission 16213656-cherrypick-sysui_unused_resources_master-vi8fzf6lsj

Reason for revert: Fix broken test
Reverted Changes:
I7f76ca424:Remove unused resources
I96e2f7c7c:Remove unused resources

Bug: 209359845
Change-Id: Ifae925ef5525849ffb0bf9c651ec0ab9b91d070b
 2021-12-06 07:03:31 +00:00
Sam Saccone
ebbb1dc7f2 [automerger skipped] Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 am: cc1431f53f -s ours am: 94ddd3853e -s ours 
am skip reason: Merged-In I74a607219f546d18127954bf961771394e4553ab with SHA-1 c9bc394198 is already in history

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

Change-Id: I2e132f112ee7923b5aa16383d9dfe027bb4ced1a
 2021-12-01 22:27:46 +00:00
Sam Saccone
94ddd3853e [automerger skipped] Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 am: cc1431f53f -s ours 
am skip reason: Merged-In I74a607219f546d18127954bf961771394e4553ab with SHA-1 c9bc394198 is already in history

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

Change-Id: I9f47ceab040e781c91df1744526bdde9e6271c2a
 2021-12-01 22:21:39 +00:00
Sam Saccone
4ba8761829 [automerger skipped] Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 am: 7a1aff9d6f -s ours am: 4654e2aaf8 -s ours 
am skip reason: skipped by user zyy

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

Change-Id: I016251472f5aca9b393d3833bf082486da2e99bb
 2021-12-01 22:09:42 +00:00
Lucas Dupin
44b3f3876c Merge "Remove unused resources" into sc-dev am: 2ab64731b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16213676

Change-Id: Ibd0bff4e4bc89e5be88e3ba05de6a79ccf96abc0
 2021-12-01 22:09:31 +00:00
Sam Saccone
4654e2aaf8 [automerger skipped] Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 am: 7a1aff9d6f -s ours 
am skip reason: skipped by user zyy

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

Change-Id: If7dae55cbf761c9679e2cae0296fb239922e680b
 2021-12-01 22:08:45 +00:00
Lucas Dupin
2ab64731b9 Merge "Remove unused resources" into sc-dev 2021-12-01 21:51:13 +00:00
Sam Saccone
cc1431f53f Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373401

Change-Id: I4a7dfffa04611310363928ff547eb4677c1c3290
 2021-12-01 21:06:48 +00:00
Sam Saccone
7a1aff9d6f Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. am: c9bc394198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373401

Change-Id: I117d116b7070d9a62a805146e54e41b0b2ed88bd
 2021-12-01 21:06:39 +00:00
Sam Saccone
c9bc394198 Update tools/ OWNERS to valid owners and remove noparent rule to allow for parent owners in cases where needed. 
BUG=208667308

Change-Id: I74a607219f546d18127954bf961771394e4553ab
Merged-In: I74a607219f546d18127954bf961771394e4553ab
(cherry picked from commit 0fab999056bba21599928a64691e80c267c9641a)
 2021-12-01 20:25:51 +00:00
TreeHugger Robot
ecf18f9d88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70c6650eda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e0be2b43af5b3ace3845d14d546e929c75d3959
 2021-12-01 17:20:41 +00:00
Yurii Zubrytskyi
a27822a795 Add missing size check when parsing staged aliases 
Need to have the same kind of data size check as in other
types parsing

Bug: 203938029
Test: manual
Change-Id: I9f5d2851ff59da90163ead6c0416f0bba3868cc4
Merged-In: I9f5d2851ff59da90163ead6c0416f0bba3868cc4
(cherry picked from commit 8002034e6b)
 2021-12-01 17:20:07 +00:00
TreeHugger Robot
2f755a755f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ecc5067c48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc242b54d8ffd51563074683334004dba6c8346e
 2021-12-01 17:17:43 +00:00
TreeHugger Robot
be896447ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e3fa2b66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dc04e5a27d4d9fa888bec806e7d34600a13c14c
 2021-12-01 17:17:27 +00:00
TreeHugger Robot
7aa2a22920 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-01 17:04:42 +00:00
TreeHugger Robot
70c6650eda Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-01 17:03:45 +00:00
TreeHugger Robot
341bb9e0ea Merge changes from topic "presubmit-am-2143ecd1458f4508bf53aff3786dc505" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8d4068ec34
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 17:03:45 +00:00
TreeHugger Robot
ecc5067c48 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-01 17:03:36 +00:00
TreeHugger Robot
38e449b7d3 Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 65643ed1cd
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 17:03:36 +00:00
TreeHugger Robot
111a226c95 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-01 17:02:37 +00:00
TreeHugger Robot
27e3fa2b66 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-01 17:00:07 +00:00
TreeHugger Robot
bc395d529f Merge changes from topic "presubmit-am-0ba418188bf14da5b3177de2f43d7187" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ecb62dfe9
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 17:00:07 +00:00
TreeHugger Robot
ed282dd1e1 Merge changes from topic "presubmit-am-89eae4c44d22430cafb16bdf4e262a4d" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f18a02a647
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 16:59:54 +00:00
TreeHugger Robot
596d2be8d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-01 16:57:31 +00:00
TreeHugger Robot
38e4cfc518 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-01 16:56:55 +00:00
Bill Yi
5ac0e8e557 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 65643ed1cd 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib4c2e028e153ca3e488a02dc245075c8d8e39360
 2021-11-29 19:11:08 +00:00
Bill Yi
65643ed1cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ed3bb2765bc5e3c6c85b3c2efe32ce3fcdb014c
 2021-11-29 19:10:53 +00:00
Bill Yi
a20401a008 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8d4068ec34 
Blank merge reason: commit message contains skip directive

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

Change-Id: Idd71acceb672f043132fd7d2a51e6d4873f6d27d
 2021-11-29 18:46:44 +00:00
Bill Yi
8d4068ec34 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4ff60fcff5c3a9bf6cc5a76c7fea0fd3e92d7618
 2021-11-29 18:46:34 +00:00
Bill Yi
4eb3de4793 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic891794ae1f14f4a539f4d529eefef833d3e8f9f
 2021-11-29 18:37:40 +00:00
Bill Yi
a3b76547cf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1021f53692a508cd89b6a8250bb674df59a3873f
 2021-11-29 18:31:07 +00:00
Bill Yi
592fc9636d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd87e7f42ae266dd5e1b8c4683c7045437cb9159
 2021-11-29 18:04:59 +00:00
Bill Yi
73f6c9434e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f18a02a647 
Blank merge reason: commit message contains skip directive

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

Change-Id: I30d741494259bbfcf989ba20780fa6ed3f222402
 2021-11-29 18:00:41 +00:00
Bill Yi
f18a02a647 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icfc72bab38d041599f084cc79852ff027ba0bb01
 2021-11-29 18:00:29 +00:00
Bill Yi
ab5bb38da4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I152775e5dfe2437798934e268ce7c47babd50495
 2021-11-29 17:57:37 +00:00
Bill Yi
f550db4986 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ecb62dfe9 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie01198427b5795edcde8c6244cbf27ccdd44e694
 2021-11-29 14:38:55 +00:00
Bill Yi
1ecb62dfe9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I739e8cf4ad8fa165b087d4e1662fd94b0d082a87
 2021-11-29 14:38:46 +00:00
Bill Yi
36bb919297 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icd8ffb8d0b09cac8677957b08bc12928a66c4fd1
 2021-11-29 14:11:35 +00:00
Oliver Woodman
2aeaddce36 Merge "Fix SysUI volume controls not appearing" into sc-dev am: adc5f9571f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16286398

Change-Id: Ifbc9bb770ef72382bf961a5b11586ffa7d1ab4de
 2021-11-22 20:51:48 +00:00
Oliver Woodman
a761e563a7 Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16233501

Change-Id: I8c672e700ab971d7f3882e7a7858287ef9130bd3
 2021-11-22 20:51:43 +00:00
Oliver Woodman
8092f8f5e7 Re-enable volume control for non-grouped devices am: b7f52f4468 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214442

Change-Id: I4dea32ff7cb937279853ea27849c645290e1c068
 2021-11-22 20:51:35 +00:00
Oliver Woodman
b84e1cff6f Tweak volume adjustment rules am: 022081595b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16220980

Change-Id: I040ae45f417e5cdf89a1258a9bc42bb2a9a6a391
 2021-11-22 20:51:23 +00:00
Oliver Woodman
adc5f9571f Merge "Fix SysUI volume controls not appearing" into sc-dev 2021-11-22 20:33:14 +00:00
Oliver Woodman
e65fa2ba18 Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev 
* changes:
  Plumb config to output switcher indication chip
  Re-enable volume control for non-grouped devices
  Tweak volume adjustment rules
 2021-11-22 20:33:14 +00:00
TreeHugger Robot
7054b9dd19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b5d35b0192 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f5075645ed93da901b40c9eb97cf5dad2d268f1
 2021-11-18 20:30:08 +00:00
TreeHugger Robot
b5d35b0192 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-18 20:13:51 +00:00