Commit Graph

647019 Commits

Author SHA1 Message Date
Jerry Chang
2bc7feae24 Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev am: 5663de7849
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14388191

Change-Id: I82a278e5eb142e5baef3a8018c2b71465f8f71a5
2021-05-03 02:56:03 +00:00
Jerry Chang
5663de7849 Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev 2021-05-03 02:36:14 +00:00
Santos Cordon
2c3bcfa9f3 Merge "Fix crash on device without nits-backlight mapping" into sc-dev am: 3ed02ffeb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14392204

Change-Id: Icb21e592f4b01b70b0bf07bae92f544934529f0a
2021-05-02 19:44:46 +00:00
Santos Cordon
3ed02ffeb1 Merge "Fix crash on device without nits-backlight mapping" into sc-dev 2021-05-02 19:29:05 +00:00
TreeHugger Robot
2b0e802c58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: abc738e1c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I219f0c0c47cf0e1017b560312a2765c73b50085e
2021-05-02 12:39:05 +00:00
TreeHugger Robot
20be98a763 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 617ba8186d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcce8f7777def4ed632c084cc555bc61e02c811a
2021-05-02 12:38:32 +00:00
TreeHugger Robot
abc738e1c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 12:27:39 +00:00
TreeHugger Robot
617ba8186d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 12:22:03 +00:00
TreeHugger Robot
e54673073f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours am: 8f5ae02ce1 -s ours am: d522072f2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8679b2aca5e991abe9983a11074aa7120d8cb68f
2021-05-02 11:39:38 +00:00
TreeHugger Robot
f61b9baa80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours am: 9af600c09a -s ours am: 332ad74353 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e46ef4ea2bce5b33ebd5b15a4a28e02cf452607
2021-05-02 11:39:29 +00:00
TreeHugger Robot
0da9d14567 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-02 11:34:25 +00:00
TreeHugger Robot
d522072f2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours am: 8f5ae02ce1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I203f7ac4e039e8f39b2bbf993f4b2809d9d343b7
2021-05-02 11:19:10 +00:00
TreeHugger Robot
332ad74353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours am: 9af600c09a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c344b7f1ee1b3276172c7fb72cc43f70ae1fb34
2021-05-02 11:18:57 +00:00
TreeHugger Robot
8f5ae02ce1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia13dcb315f6533874f6d0556310a113b5b1b11a7
2021-05-02 11:00:32 +00:00
TreeHugger Robot
9af600c09a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icada52d0f219a636a931ec76a0fd9900927ce650
2021-05-02 11:00:18 +00:00
TreeHugger Robot
f357945196 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-02 10:54:11 +00:00
TreeHugger Robot
f63c0ad801 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-02 10:41:51 +00:00
TreeHugger Robot
5bd85da2b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4820193276 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadf0ac570a87395faea5d48f08fda878d34229be
2021-05-02 10:27:46 +00:00
TreeHugger Robot
4820193276 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 10:12:01 +00:00
Bill Yi
7821d984e8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I890ac380455451ffe31b57732bbe2c21a42e2d4b
2021-05-02 09:39:41 +00:00
Bill Yi
7ec2a29f78 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31f2b4512164bb043d78d503f4f38accedc49f8d
2021-05-02 09:28:41 +00:00
Bill Yi
e9c7866326 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours am: 4f5c48bf20 -s ours am: c31d0327ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55ba0f287cc8ca108fd0320f6fa04a3304c0c9e3
2021-05-02 09:28:05 +00:00
Bill Yi
212fd2b7a0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5000390039e9495fe1aea6d6578e844b8d3fd593
2021-05-02 09:18:01 +00:00
Bill Yi
e25182ee82 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1021cf1a44b86a7defb6394062aea617685f724
2021-05-02 09:16:12 +00:00
Bill Yi
c31d0327ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours am: 4f5c48bf20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28672ed7b344475bf8b50bfbd844cd26ee8d70bc
2021-05-02 09:14:43 +00:00
Bill Yi
1580119493 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icd04e10fa5acfac2914c25cacb961f7b92dda732
2021-05-02 09:14:41 +00:00
TreeHugger Robot
7caf62fbf3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-02 09:10:58 +00:00
Bill Yi
4f5c48bf20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba350914b061bef750449f8d9ca13d5fbb940de7
2021-05-02 08:57:33 +00:00
Bill Yi
557dc61d2b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b2ae399f425eca0b1b4810a991ddf57864231de
2021-05-02 07:07:12 +00:00
Bill Yi
f41a26a615 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If834d0084a2e23121735bfb38c17f04bd9c98127
2021-05-02 06:50:40 +00:00
Bill Yi
1122e63bab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6246b9bc37077ea6b02e8135fb5a45839307687
2021-05-02 06:16:00 +00:00
Chris Li
c1afcc300d Merge "Determine whether to support activities in multi window (3/n)" into sc-dev am: e5fe75d2b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14355985

Change-Id: Ie10d1d1bf4461cc7b86cb90a75610fa1fde6f66b
2021-05-01 23:49:24 +00:00
Jay Aliomer
cf5ff6e2c9 Merge "Fixed an issue where the notification was clipped during the translation" into sc-dev am: 431e711e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353377

Change-Id: I32472eceab1deb8853313e7ab86700d9eed13853
2021-05-01 23:48:34 +00:00
Chris Li
e5fe75d2b1 Merge "Determine whether to support activities in multi window (3/n)" into sc-dev 2021-05-01 23:46:11 +00:00
Jay Aliomer
431e711e47 Merge "Fixed an issue where the notification was clipped during the translation" into sc-dev 2021-05-01 23:27:37 +00:00
Ruslan Tkhakokhov
c6f12d3587 Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev am: bdd1f279c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353381

Change-Id: I751d2ac6f3bde00f1361363f67cb60156cf36295
2021-05-01 13:41:55 +00:00
Ruslan Tkhakokhov
bdd1f279c5 Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev 2021-05-01 13:22:21 +00:00
Santiago Seifert
38dad39946 [automerger skipped] Merge "Rename MediaExtractor symbols to log session id" into sc-dev am: 9642d628ab -s ours
am skip reason: Merged-In I2e71d460e6907400daeba21fd6a76fa0ea5e0922 with SHA-1 36a551bc29 is already in history

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

Change-Id: Iee9f007cea035c76db497b57e938a5810e794b26
2021-05-01 11:03:34 +00:00
Santiago Seifert
9642d628ab Merge "Rename MediaExtractor symbols to log session id" into sc-dev 2021-05-01 10:51:09 +00:00
Jack Yu
01fdc3f71b [automerger skipped] Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d am: efa5a0e556 am: 259fa8266a -s ours am: a8559261ac -s ours
am skip reason: Merged-In I1a7e413015ccdff3d9358cc85605325a4bff3b33 with SHA-1 c8cf1b02a3 is already in history

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

Change-Id: Ie14df352b434fa8d72093d342079ca31c4f9e45b
2021-05-01 10:25:31 +00:00
Daniel Bright
f022ac19e5 [automerger skipped] Unthrottle all APNs on APM am: 86c11c1e69 am: 0e1b7e11ec am: 70a00cb622 -s ours am: 92a7987f81 -s ours
am skip reason: Merged-In I8ecc7a61a181df46f7283196cfaf2d28bbddb50f with SHA-1 781d41ad21 is already in history

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

Change-Id: I4f8bd986cffb6dd57e268cbc3333dbf63af46f1b
2021-05-01 10:25:28 +00:00
Santos Cordon
01b6dd29ff Fix crash on device without nits-backlight mapping
When there is no nits mapping, we sent NaN for the
sdr backlight value, which is invalid. Instead, send
the same (valid) backlight value for normal and SDR
brightnesses.

Bug: 186895034
Test: Manually verify that a device without nit-backlight
      mapping can still boot normally.
Change-Id: Ie6786fa17776674d914e66727f324368831f6761
2021-05-01 11:18:18 +01:00
Jack Yu
a8559261ac [automerger skipped] Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d am: efa5a0e556 am: 259fa8266a -s ours
am skip reason: Merged-In I1a7e413015ccdff3d9358cc85605325a4bff3b33 with SHA-1 c8cf1b02a3 is already in history

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

Change-Id: I24911b298829530e0b97708c07b40eb07e980ba2
2021-05-01 10:09:42 +00:00
Daniel Bright
92a7987f81 [automerger skipped] Unthrottle all APNs on APM am: 86c11c1e69 am: 0e1b7e11ec am: 70a00cb622 -s ours
am skip reason: Merged-In I8ecc7a61a181df46f7283196cfaf2d28bbddb50f with SHA-1 781d41ad21 is already in history

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

Change-Id: Ibc33ee37a7d682fd3962c4542a785824a63721e1
2021-05-01 10:09:24 +00:00
Jack Yu
259fa8266a Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d am: efa5a0e556
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851

Change-Id: I55bcfc699e0891426421b56397a6a48f517b6e9f
2021-05-01 09:33:15 +00:00
Daniel Bright
70a00cb622 Unthrottle all APNs on APM am: 86c11c1e69 am: 0e1b7e11ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692852

Change-Id: I8a7175ebca60361691a702e5e23ad4008ec1dcb0
2021-05-01 09:33:09 +00:00
Jack Yu
efa5a0e556 Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851

Change-Id: Ia724ce769e036348a35d2166dc9fa0a5bb32ab8a
2021-05-01 09:15:16 +00:00
Daniel Bright
0e1b7e11ec Unthrottle all APNs on APM am: 86c11c1e69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692852

Change-Id: I9646b0d1fa970a3e986f18de0baecb3d19f09a46
2021-05-01 09:13:13 +00:00
Jack Yu
e4df5d375d Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes"
* changes:
  Unthrottle data retry in some conditions
  Unthrottle all APNs on APM
2021-05-01 08:53:11 +00:00
TreeHugger Robot
93647df771 Merge "Make IInputMethodManager#reportActivityViewAsync() truly async" into sc-dev am: 096c8547d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14391522

Change-Id: Iff394739d5d27e0cc1ceb15e42c37589b07f092f
2021-05-01 08:05:35 +00:00