Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,993 Commits 3 Branches 0 Tags
dd7ed60de0efbc682ee98605faa128fa39bb99dc
Commit Graph

647993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Dupin
dd7ed60de0 Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0."" 
This reverts commit 2ded80094e.

Reason for revert: Working on fixing the regression that happened on Wembly, so we can resume feature work.

Change-Id: I9a624beffdaf97f131046fd4441a251ed3a448ad
Test: adb shell /system/bin/bootanimation
Bug: 190093578
(cherry picked from commit 8eedc0293d)
 2021-08-16 20:17:48 +00:00
Jeff DeCew
3e7384fbe2 Merge "FooterView color logic cleanup" into sc-qpr1-dev 2021-08-16 20:12:59 +00:00
Neha Jain
7c51d30f77 Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037

Change-Id: I875e675d2740e1bdeb7356e6aa1ba88dd463ef2c
 2021-08-16 20:12:02 +00:00
Evan Laird
2270569990 DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037

Change-Id: I43d21926050499232df9b41b94bdf60ff77369c6
 2021-08-16 20:11:55 +00:00
Neha Jain
def23772a7 Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev 2021-08-16 19:56:14 +00:00
Huihong Luo
dc7594b513 Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814

Change-Id: Ief9558864ee9e46b1c3488403a37cecd78edb258
 2021-08-16 19:38:10 +00:00
Huihong Luo
e44bc77bc3 Merge "Remove Webview Overlays on destroy" into sc-dev 2021-08-16 19:22:01 +00:00
Jeff DeCew
10c7e2b811 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev 
* changes:
  Use tertiary accent color for expander with unread count.
  Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
 2021-08-16 19:21:18 +00:00
Jeff Sharkey
3d3db4b676 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: I412bc049b951516c9abd2c8d821ca71db810e2e9
 2021-08-16 16:06:29 +00:00
Jeff Sharkey
5af6057607 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev 2021-08-16 15:55:08 +00:00
Ryan Mitchell
9fd3a5cc5e Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: I3709c3153186b42cdc9923605b2d895183625a97
 2021-08-16 15:23:03 +00:00
Ryan Mitchell
1561c6ac27 Merge "Guard against null info when applying widget RROs" into sc-dev 2021-08-16 15:08:06 +00:00
Jeff DeCew
d8054270e7 Use tertiary accent color for expander with unread count. 
Fixes: 196586577
Test: visual inspection
Test: atest android.app.NotificationTest
Change-Id: I09b3999ad1c51615fbf7c8027dc65e6750721f18
 2021-08-16 14:19:13 +00:00
Jeff DeCew
4c0e8a62e6 Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color 
Fixes: 196600502
Test: atest ContrastColorUtilTest
Change-Id: I590be0ba30c03e867bf08558483239818b3aff82
 2021-08-16 14:14:53 +00:00
Evan Laird
2b79873e29 DO NOT MERGE: Register NetworkController to DumpManager 
It seems that enough Dependency.get() calls were removed for
NetworkController that the dumpsys stopped including NetworkController
in it. This CL manually registers NetworkController so we can have those
logs back.

Test: `adb shell dumpsys activity service com.android.systemui/.SystemUIService | grep NetworkController`
Fixes: 196486687
Change-Id: Id8865dd2159a6e3d85ebe80a3d0c4e05d0c16491
 2021-08-16 13:53:06 +00:00
Selim Cinek
193406410a Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318

Change-Id: I772cb9e60857aebda21a11083ed2bc2690a1517c
 2021-08-16 11:52:16 +00:00
Selim Cinek
ab89e910bc Merge "Don't create one-handed-background-panel after rotation" into sc-dev 2021-08-16 11:40:26 +00:00
James Wei
4f7f6fba23 USB: Correct title bar notification am: c0162a74b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: I5c1606698ca17794051bf9a52ea19ee608ece70e
 2021-08-16 10:51:21 +00:00
James Wei
c0162a74b9 USB: Correct title bar notification 
Change notification in accordance with additional tethering support on NCM

Bug: 196240561
Test: Manual test: Switch USB tethering to and from MTP / Charge Only
Change-Id: I7a5e1d7066774d60c3ba7f453554dc3a25b0af69
 2021-08-16 17:13:47 +08:00
Yu-Ta Lu
01c0e57647 Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I52b2570bed6d7e9b24955528d4222e3707e01b05
 2021-08-14 18:22:55 +00:00
Yu-Ta Lu
c9ce62c06b Merge "Set CollapsingToolbar Title textColor" into sc-dev 2021-08-14 18:12:06 +00:00
Milton Wu
9c58022d6b Merge "Add non-system overlay flag for usb perm dialog" into sc-qpr1-dev 2021-08-14 03:56:11 +00:00
Joe Bolinger
8d74548cba Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15564960

Change-Id: Idf80a4a7f232b524ae75fa223d17b910a37380cc
 2021-08-14 03:52:27 +00:00
Mill Chen
23dd0bd4a1 Set CollapsingToolbar Title textColor 
The original title color seems to be set incorrectly for all OEM
devices except for Pixel. This change stabilizes the color.

Bug: 196106314
Bug: 196614394
Test: manual test
Change-Id: I2b9f7ddec17d1d447cb7348e8f96cabb81e2e229
 2021-08-14 03:48:12 +00:00
Joe Bolinger
922fe0da54 Merge "Add a generic error message for missing vendor error strings." into sc-dev 2021-08-14 03:30:22 +00:00
Jeff DeCew
44527690ed Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev 2021-08-14 02:13:33 +00:00
TreeHugger Robot
ab26c9e03f Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fccb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259610

Change-Id: I482de4133a08cb1bec3e5f5baf30fac1ed3dd4ac
 2021-08-14 02:00:20 +00:00
TreeHugger Robot
0fa71fccb5 Merge "Log failures to unlinkToDeath wakelocks." into sc-dev 2021-08-14 01:42:41 +00:00
Ray Essick
a9da270159 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours am: ddaf6b4117 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: Id6f59abde3d02ddaa5b11bff07be7c36fbee0a7a
 2021-08-14 01:13:16 +00:00
Ray Essick
ddaf6b4117 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: I137dc117cc9d7fd131c3ca2e221a8fbbc56c439d
 2021-08-14 01:11:25 +00:00
Bill Yi
2139ac2389 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f294 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21d12d340d4b46feddf517a5d14e194368494943
 2021-08-14 00:01:17 +00:00
Bill Yi
85dca6379a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69d1a14f5c03e4cb72ea5a1c2712be43dbf7bd56
 2021-08-14 00:00:53 +00:00
Bill Yi
680e13f294 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:48:13 +00:00
Bill Yi
a74d94dde7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:46:35 +00:00
Bill Yi
2795524cc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3f20c30df8c7330be878a8adc5f15c36cc11fac
 2021-08-13 23:25:26 +00:00
TreeHugger Robot
db20a16c5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa01ce9ceb5bf13bc23561632edae8ced92d9994
 2021-08-13 23:24:58 +00:00
Bill Yi
e71c41a882 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:15:02 +00:00
TreeHugger Robot
69d06e9fb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f3de0722f388d17aaea46acbe7c382eff226659
 2021-08-13 23:11:50 +00:00
Bill Yi
e4c51ab8fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id400594f2ba97ed4ee018b1085829d2df7ccc79e
 2021-08-13 23:06:59 +00:00
Joe Bolinger
5d5d9eb812 Add a generic error message for missing vendor error strings. 
The message is empty, instead of null, to prevent apps from crashing but it will be changed to a more meaninful string in a future change.

Fix: 196176475
Test: N/A
Change-Id: I7823084238a87cb1b8892b8550c472cd8b40f556
 2021-08-13 16:03:54 -07:00
Bill Yi
da46d42b87 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:03:10 +00:00
TreeHugger Robot
403f941afb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91d987a7a9f2753e8e51fb1ba69588e01fe3de47
 2021-08-13 23:01:43 +00:00
TreeHugger Robot
6dcacb9ba2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If22f44722a0d7e2c74870fdc3c1e1de168bb0168
 2021-08-13 23:01:40 +00:00
TreeHugger Robot
7140b47d4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I904380032352ea9f5ba0fea6a8e6025b6f8db6d5
 2021-08-13 23:01:30 +00:00
TreeHugger Robot
2e0c1a0555 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06c58f640f59ecd616482a9dccee6b77003491de
 2021-08-13 22:52:21 +00:00
TreeHugger Robot
c184057731 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71340676efc68296a67411057ea86b95e89dcfd7
 2021-08-13 22:52:07 +00:00
TreeHugger Robot
ee6d526833 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e9ee255d315af28a22e342e8f345cb32bf715a4
 2021-08-13 22:51:44 +00:00
TreeHugger Robot
3229884baf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:49:46 +00:00
TreeHugger Robot
ddcdda9f4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours am: dba5e43aeb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I739ec5493de7a86b2e283ce7878a3e3e727008bf
 2021-08-13 22:45:37 +00:00
TreeHugger Robot
17e594d97f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours am: 7eba26bb3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic175cb8b0abbfc01f88298fe3510086ea9f6434a
 2021-08-13 22:45:32 +00:00