Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
806,677 Commits 3 Branches 0 Tags
cf8bc7b89d2d7479a16b3db714ef9fe616808d13
Commit Graph

806677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Lee
cf8bc7b89d Merge "Extract DebugDrawable from NPVC into its own class" into tm-qpr-dev am: 793936a15b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20345808

Change-Id: Ic6ebb8a30bb1415b8fca244b972b4bbccd516b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 19:02:24 +00:00
Shawn Lee
793936a15b Merge "Extract DebugDrawable from NPVC into its own class" into tm-qpr-dev 2022-11-07 18:53:35 +00:00
Automerger Merge Worker
5faf2ffa5c Merge changes from topic "am-a1464e9329354338abae003b908e7c86" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev am: b6adbfc68e -s ours
  [automerger skipped] Remove gson depdency from SystemUISharedLib am: 88e4f7a80d -s ours
 2022-11-07 18:48:09 +00:00
TreeHugger Robot
676bfc5ffa [automerger skipped] Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev am: b6adbfc68e -s ours 
am skip reason: Merged-In I70ecae6f229567c6031d7dc16181c8ec5fbe60e4 with SHA-1 6b7e252895 is already in history

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

Change-Id: Ic69eaa17512dd048a3b2a4ae7fea4f0850d6752a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 18:47:54 +00:00
Treehugger Robot
d4f2a8e747 Merge "Use Guava built from source in tools." am: 927a9ea7b9 am: b1e981dd69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134

Change-Id: I4b3861bcdd953f78a209063140d9fa19be7ac9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 18:47:51 +00:00
Hawkwood Glazier
1419dfdfcb [automerger skipped] Remove gson depdency from SystemUISharedLib am: 88e4f7a80d -s ours 
am skip reason: Merged-In I70ecae6f229567c6031d7dc16181c8ec5fbe60e4 with SHA-1 6b7e252895 is already in history

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

Change-Id: I5187cdd5008db2f55f1ba542380f89e2eda050f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 18:47:38 +00:00
TreeHugger Robot
b6adbfc68e Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev 2022-11-07 18:13:56 +00:00
Treehugger Robot
b1e981dd69 Merge "Use Guava built from source in tools." am: 927a9ea7b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134

Change-Id: I26370d3d3156e4a98ed4dae089f00ff993fd686b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 18:02:40 +00:00
Treehugger Robot
927a9ea7b9 Merge "Use Guava built from source in tools." 2022-11-07 17:42:07 +00:00
Mady Mellor
30919118f9 Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d495962f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925

Change-Id: I1042b767429ff7f9c1b181bce9332b7ca4076e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:36:13 +00:00
TreeHugger Robot
6712d036d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9817b5370e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2326802eba03aefea5977ba07f5a3ef7979fb888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:35:16 +00:00
Bill Yi
5073d31300 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e40472f1a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a6317a1054d6c6d2ccba5bb3612c50c3c0c0d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:34:39 +00:00
TreeHugger Robot
0e46aa6635 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: edaf16939e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c8d06bb28f974b62805c6eef58a66bfd6486b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:34:17 +00:00
Bill Yi
65dd34a434 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d773a4f316 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a9125667e668938cc574790ae08bd214c7ce287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:33:56 +00:00
TreeHugger Robot
ab2d094692 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 13c7ad8eaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03817f394a4db958206e451490e56f95b8042a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:29:26 +00:00
Bill Yi
b8410c06fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09921a35a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie99e5892098850a48bc04093a86a7b80df3bb6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:29:20 +00:00
TreeHugger Robot
9ed51a2dad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: be96587e69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ddca970ad49e03610b143a103f69370b2511f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:29:13 +00:00
Bill Yi
64d96ae0db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20e4d2e35f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fd50cd15cb7c3c1c7edd40dbb88f967c9dfe171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:29:05 +00:00
TreeHugger Robot
8f51611906 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c59cbc2102 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46eca70f18c8ce9215edb4d6fa1bedb5b33a8cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:28:45 +00:00
Bill Yi
cd2b3c2f53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb44496c60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dfe1435f0b41ca73aa8065ce1d00c3a5dee627e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 17:28:25 +00:00
Mady Mellor
61d495962f Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev 2022-11-07 17:14:56 +00:00
TreeHugger Robot
9817b5370e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:41:58 +00:00
TreeHugger Robot
edaf16939e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:41:58 +00:00
TreeHugger Robot
13c7ad8eaa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:39:51 +00:00
TreeHugger Robot
be96587e69 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:39:51 +00:00
TreeHugger Robot
c59cbc2102 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:39:51 +00:00
Hawkwood Glazier
88e4f7a80d Remove gson depdency from SystemUISharedLib 
Bug: 257473381
Test: Manually checked clock setting parsing
Change-Id: I70ecae6f229567c6031d7dc16181c8ec5fbe60e4
Merged-In: I70ecae6f229567c6031d7dc16181c8ec5fbe60e4
 2022-11-07 16:33:17 +00:00
Treehugger Robot
9d7dc6120f Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545 am: 2f81ba23b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: Id43f16f37389ee61b663e90289aeee3aa8f303a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 16:20:48 +00:00
Treehugger Robot
2f81ba23b1 Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: Ife5037af2f34045622b8fa5ad032ab49235f2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 15:51:52 +00:00
Hawkwood Glazier
e291b8c98c Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev-plus-aosp 2022-11-07 15:21:01 +00:00
Treehugger Robot
1bd897f545 Merge "Remove permissions team from PermissionEnforcer OWNERS" 2022-11-07 15:14:46 +00:00
Alison Cichowlas
d2f540166e Merge "Separate brightness-specific ProgressDrawable logic." into tm-qpr-dev am: cbe40d9f49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20358413

Change-Id: I1f652104c57b924d3643ad3e138871cba761802d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 14:53:18 +00:00
Fabian Kozynski
186e49439f Merge changes from topic "flip_flag_v2" into tm-qpr-dev am: 9eff0afd4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20328004

Change-Id: Ib66b594fe031fb05af5ace72f02fb705d7f58c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 14:51:37 +00:00
Treehugger Robot
28d2629580 Merge "remove obsolete apf properties from platform" am: 6c88b0d188 am: 26fd2a8305 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2286895

Change-Id: I7e76cb74d19f644a4f5f9fa3107366d6c40bf489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 14:34:44 +00:00
Alison Cichowlas
cbe40d9f49 Merge "Separate brightness-specific ProgressDrawable logic." into tm-qpr-dev 2022-11-07 14:30:45 +00:00
Fabian Kozynski
9eff0afd4f Merge changes from topic "flip_flag_v2" into tm-qpr-dev 
* changes:
  Flip headers flags
  Fix vertical size when using new headers
 2022-11-07 14:19:01 +00:00
Treehugger Robot
26fd2a8305 Merge "remove obsolete apf properties from platform" am: 6c88b0d188 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2286895

Change-Id: Ic63169c10b0ba570192b6fc729275b76d150a488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 14:05:45 +00:00
Treehugger Robot
6c88b0d188 Merge "remove obsolete apf properties from platform" 2022-11-07 13:31:29 +00:00
Galia Peycheva
3f63f47ed9 Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev am: 2899ff81c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20391545

Change-Id: Ic085a2ab32026fe1586b5b48087ec1bad0a73b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 10:34:34 +00:00
Fiona Campbell
10a05c05c2 Merge "Only load default lightsensor for Brightness Tracker" into tm-qpr-dev am: 10cd7d5904 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20245644

Change-Id: I3f67e881105afbe356a9d8bd717a3c8cd4791b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 10:32:19 +00:00
Galia Peycheva
2899ff81c2 Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev 2022-11-07 10:03:28 +00:00
Fiona Campbell
10cd7d5904 Merge "Only load default lightsensor for Brightness Tracker" into tm-qpr-dev 2022-11-07 09:54:45 +00:00
Chiachang Wang
b15e857a0f Merge "Add dump for Vpn" am: ee9ad341e7 am: c0c0151771 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276132

Change-Id: I9f3cdb3988402a5fac57ef2731e2d4285e1e14ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:52:11 +00:00
Chiachang Wang
c0c0151771 Merge "Add dump for Vpn" am: ee9ad341e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276132

Change-Id: I54c064378aaa4a3a3a2cdde4e2babe1fe0271593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:24:40 +00:00
Bill Yi
09921a35a3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I526d542b8816d2a58e99b77c8162ee7dacd4ce0f
 2022-11-06 18:07:11 -08:00
Chiachang Wang
ee9ad341e7 Merge "Add dump for Vpn" 2022-11-07 01:51:48 +00:00
Bill Yi
20e4d2e35f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id2eb16df499a05844ec73a81a04b6b5293a815a2
 2022-11-06 17:16:51 -08:00
Bill Yi
cb44496c60 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibf3f048be67229493ae6fbb4ca5e9ed851d56def
 2022-11-06 16:46:45 -08:00
Bill Yi
e40472f1a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifba03af5b229084f56e3bb3b275c67ac18a3574b
 2022-11-06 16:35:22 -08:00
Bill Yi
d773a4f316 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic832f89d75edcb5f010bff69e029a74424264ec2
 2022-11-06 13:41:29 -08:00