Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645,704 Commits 3 Branches 0 Tags
516cd210f61e90fc13575e05d5e468af4aad2e54
Commit Graph

645704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silin Huang
516cd210f6 Merge "Add a tile service meta-data for QuickAccessWalletServiceInfo that fetches a drawable for wallet tile." into sc-dev 2021-06-30 23:16:58 +00:00
Huihong Luo
faa7a4383e Merge "Add a sys prop to control WebView Overlays support" into sc-dev 2021-06-30 23:10:54 +00:00
Silin Huang
3d9cf89d06 Add a tile service meta-data for QuickAccessWalletServiceInfo that 
fetches a drawable for wallet tile.

The wallet tile will get the icon drawable from QAW client; if it
doesn't exist, fall back to the static icon in SysUI.

Test: manual
Bug: 190606984
Fixes: 190539096
Change-Id: I2d822ee34c8e4b27ae72e86186b0d78f2b52854f
 2021-06-30 22:28:01 +00:00
Jing Ji
98b57c304d Merge "Skip resetting the shouldNotFreeze flag while re-evaluating oom adj" into sc-dev 2021-06-30 22:12:19 +00:00
TreeHugger Robot
cfe4767b40 Merge changes I5bdc1f46,Idd24fd51 into sc-dev 
* changes:
  Sharesheet style updates
  Update Edit icon.
 2021-06-30 22:00:33 +00:00
TreeHugger Robot
8303d7d9b8 Merge "Set pinner.pin_camera default to true." into sc-dev 2021-06-30 21:50:21 +00:00
Lucas Dupin
119582ab5f Merge "Add shade radius to systraces" into sc-dev 2021-06-30 21:37:38 +00:00
Beverly Tai
d35f3f20d6 Merge "Only call onFingerUp if finger was down" into sc-dev 2021-06-30 21:31:36 +00:00
TreeHugger Robot
8a8ee837a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 21:25:42 +00:00
TreeHugger Robot
956ec10525 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 21:22:30 +00:00
Silin Huang
8fd5255fc4 Merge "Update the string when no card in wallet tile." into sc-dev 2021-06-30 21:12:40 +00:00
Ryan Mitchell
b3659d36b0 Merge changes from topic "revert-15058002-SNQUARIDWJ" into sc-dev 
* changes:
  Revert^2 "Apply overlay changes with config change"
  Revert^3 "Deprecate Context#createApplicationContext"
 2021-06-30 20:58:43 +00:00
TreeHugger Robot
29bf17a236 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 419296ddac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d6baa8245fe1ab1ad58e94e35584eb2dce80105
 2021-06-30 20:44:52 +00:00
TreeHugger Robot
d7b7eb71f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 94868d931c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72e8827a2efaa814fbc423b98fc47c5679cdc24e
 2021-06-30 20:44:31 +00:00
TreeHugger Robot
419296ddac Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:43:42 +00:00
TreeHugger Robot
55d4b08c43 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:43:10 +00:00
TreeHugger Robot
94868d931c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:41:07 +00:00
TreeHugger Robot
47d33c2c95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 758ffa0475 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91f8360c168f4e7468c18e1490ed4c8cd2fe3152
 2021-06-30 20:39:05 +00:00
TreeHugger Robot
758ffa0475 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:36:39 +00:00
Automerger Merge Worker
10911b130e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4b473a5ba3 -s ours" into sc-dev 2021-06-30 20:34:47 +00:00
Matt Pietal
4719320ff6 Merge "Large clock positioning" into sc-dev 2021-06-30 20:34:33 +00:00
TreeHugger Robot
2bc1fa7e83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4b473a5ba3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1164a3b023d7a2473769ce43d0ac8580f92fc9d
 2021-06-30 20:34:23 +00:00
TreeHugger Robot
047fd95364 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:31:17 +00:00
TreeHugger Robot
4b473a5ba3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:30:39 +00:00
TreeHugger Robot
87fe6ed2fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:30:36 +00:00
TreeHugger Robot
0a4e48b640 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:28:56 +00:00
TreeHugger Robot
6403945649 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ec61733997 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib657968b5da70a680e2cc9cc5eaae8a364fc84df
 2021-06-30 20:28:28 +00:00
TreeHugger Robot
4d69f52dfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 84f1f1c035 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc4991936cd3e5c338b43a3f3a13abe0493bac4e
 2021-06-30 20:28:17 +00:00
TreeHugger Robot
ec61733997 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:28:05 +00:00
TreeHugger Robot
f0b980c3c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 16aeb49ffd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cb94fa7dce4a06fdfba21763ccd9b2f5f672aad
 2021-06-30 20:28:05 +00:00
TreeHugger Robot
b3e87e479a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0ed4f3f782 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31f358a84836d9b5a52659253c9dc543dd5adcb
 2021-06-30 20:27:50 +00:00
TreeHugger Robot
1600f8ebef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ad7cb3d92f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1ccdc2da0e3353842c45189d63f465035cc0e8a
 2021-06-30 20:27:38 +00:00
TreeHugger Robot
559ba0ea3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 93d16d3d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76efe742fad4d9fd76fc0187b1ccceaeaf2e1cad
 2021-06-30 20:25:57 +00:00
TreeHugger Robot
a33ae13f6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9408886886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icead881d96c37926a539cccf843d0fa4dfa3d45b
 2021-06-30 20:25:41 +00:00
Automerger Merge Worker
b72f910379 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec9b81395b -s ours" into sc-dev 2021-06-30 20:25:35 +00:00
TreeHugger Robot
38c284d3bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec9b81395b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bb8ccad2c863f10aaabcb6563134b48f23a2287
 2021-06-30 20:25:05 +00:00
TreeHugger Robot
12385f32b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:25:04 +00:00
TreeHugger Robot
84f1f1c035 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:25:01 +00:00
Automerger Merge Worker
d29572bd1a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3d943e4671 -s ours" into sc-dev 2021-06-30 20:25:00 +00:00
TreeHugger Robot
95dc4fc307 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:24:58 +00:00
TreeHugger Robot
93d16d3d4e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:24:45 +00:00
TreeHugger Robot
16aeb49ffd Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:24:35 +00:00
TreeHugger Robot
a7bd32130d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3d943e4671 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief4fe3cc5ea21bd0ac8a6323d96851924b34e74e
 2021-06-30 20:24:28 +00:00
Automerger Merge Worker
465138d60f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4eb3a125d -s ours" into sc-dev 2021-06-30 20:24:18 +00:00
Silin Huang
e06b0d447d Merge "Polish the wallet screen landscape mode." into sc-dev 2021-06-30 20:24:09 +00:00
TreeHugger Robot
e6d7573cb8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4eb3a125d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65b7207cf7eac26e098c45ba54d4d6b3fd4e32c2
 2021-06-30 20:23:51 +00:00
Automerger Merge Worker
5f47a3765d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 48c12de197 -s ours" into sc-dev 2021-06-30 20:23:40 +00:00
Hongwei Wang
739425e56b Merge "Exclude the split-secondary offsets when auto-enter-pip" into sc-dev 2021-06-30 20:23:23 +00:00
TreeHugger Robot
9135591342 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 48c12de197 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0f568f1baf69f4f5982c3f09169103de4af93f5
 2021-06-30 20:23:10 +00:00
TreeHugger Robot
edf4deba6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4439c9c501 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5df3948caa6b51c843d4c2c3695e4c835349026
 2021-06-30 20:22:41 +00:00