Commit Graph

648351 Commits

Author SHA1 Message Date
TreeHugger Robot
01bb23b661 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a1eafdd6c4 -s ours am: 68d90fbe9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia60d8b35ef8cfb6177ac1983d8a79407bb09f3e0
2021-07-02 15:02:48 +00:00
Bill Yi
9845f15bf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5bbdfd377a -s ours am: 3119665824 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25c391e393cdb3c2cfad5d9dba43f06513a56f38
2021-07-02 15:02:41 +00:00
TreeHugger Robot
313ba711a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6f1b5d64e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03c18321e20be8145cf04024a138a14ff35ec1bb
2021-07-02 15:02:37 +00:00
TreeHugger Robot
5787974be4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cda7eb752e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dc689d1cba0ccbf4e317f4f4b4410cb68b4e618
2021-07-02 15:02:29 +00:00
TreeHugger Robot
23997a1bec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b49ef90a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93bb97c4452e0d9ab991f2307857444f5a8d9c3d
2021-07-02 15:02:23 +00:00
TreeHugger Robot
d97853a908 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 60ecfc0dbe -s ours am: 043d51c1bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5df915fb5c6d1359e2944e68a6e8b1607b8c019f
2021-07-02 15:02:16 +00:00
Bill Yi
a9a08d0b82 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45f03ef391 -s ours am: c88f64de99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c3b412de8a0c68b25a3ac4f293c9eb09256e8f8
2021-07-02 15:02:11 +00:00
TreeHugger Robot
68d90fbe9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a1eafdd6c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icce2df9667acc70e7ec8f0f30059efa4a2a14f21
2021-07-02 14:58:24 +00:00
Bill Yi
3119665824 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5bbdfd377a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8cb09659780870bf7c074e06d01c8fc3ef7ccd89
2021-07-02 14:57:53 +00:00
TreeHugger Robot
6f1b5d64e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-02 14:55:19 +00:00
TreeHugger Robot
cda7eb752e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-02 14:49:48 +00:00
TreeHugger Robot
8b49ef90a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-02 14:48:18 +00:00
TreeHugger Robot
043d51c1bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 60ecfc0dbe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bfea9a748ceac7042ba3d216e27e2c52537a6ff
2021-07-02 14:43:54 +00:00
TreeHugger Robot
a1eafdd6c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-02 14:43:19 +00:00
Bill Yi
c88f64de99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45f03ef391 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iced50a1ed4ea399640609e2555dca6bbec2d94c1
2021-07-02 14:43:14 +00:00
TreeHugger Robot
b04723902b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:40:39 +00:00
TreeHugger Robot
60ecfc0dbe Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-02 14:31:29 +00:00
Stanley Wang
a0a04ad741 Merge "Refine the IllustrationPreference." into sc-dev am: 39ee79bd8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15151600

Change-Id: I1b3a0f6b209f35da23febcb4068e4c5f694d483c
2021-07-02 14:28:15 +00:00
Jeff DeCew
676c1c6178 Merge "Reinstate the logtags event SYSUI_HEADS_UP_STATUS" into sc-dev am: 4d338c28dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177738

Change-Id: I07cc0423ec019486c47fe2eb844ee6b3a9e08063
2021-07-02 14:28:07 +00:00
Stanley Wang
39ee79bd8a Merge "Refine the IllustrationPreference." into sc-dev 2021-07-02 14:23:38 +00:00
Jeff DeCew
4d338c28dc Merge "Reinstate the logtags event SYSUI_HEADS_UP_STATUS" into sc-dev 2021-07-02 14:23:19 +00:00
TreeHugger Robot
73adcbb654 Merge "Revert notification haptics to previous patterns" into sc-dev am: a0927a9a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180071

Change-Id: Iee3a1549af6e97cf9e5696df0cd1cba8eec7eff7
2021-07-02 14:20:35 +00:00
Beverly Tai
21e97adb71 Merge "Always show lock icon if device is locked" into sc-dev am: c5aa20b947
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15164970

Change-Id: Icf3445ab890d1d40eba48a4eb249818bd9ba8931
2021-07-02 14:20:07 +00:00
TreeHugger Robot
a0927a9a67 Merge "Revert notification haptics to previous patterns" into sc-dev 2021-07-02 14:18:20 +00:00
Beverly Tai
c5aa20b947 Merge "Always show lock icon if device is locked" into sc-dev 2021-07-02 14:17:54 +00:00
Joshua Mccloskey
391df0c897 Merge "Added rate limiter for calibration notification" into sc-dev am: 55ffd5b10c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15155993

Change-Id: I064894d3744016b62d6b01d80744f539eb016784
2021-07-02 14:16:58 +00:00
Mohammad Samiul Islam
939f14b4a2 Merge "Propagate error while scanning apk-in-apex to session object" into sc-dev am: 929235fb71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15155996

Change-Id: I7e5a73caf0414abc3273016016f8db54b8dac921
2021-07-02 14:16:39 +00:00
Andrea Ambu
b5f8ba68ca Merge "speech: Check componentName maps to RecognitionService" into sc-dev am: 2578be81e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15155990

Change-Id: Ic52433fe363d4a397028cd76e5a9ff5eeed66b98
2021-07-02 14:16:19 +00:00
Caitlin Cassidy
bc050cb6ca Merge "Allow swiping down from area directly below notch to trigger QS instead of notification shade." into sc-dev am: 40116423b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15108769

Change-Id: Ic0821ee41189c3db419a46e714ac1bf60c72e3a8
2021-07-02 14:16:04 +00:00
TreeHugger Robot
56d9865410 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:14:29 +00:00
Joshua Mccloskey
55ffd5b10c Merge "Added rate limiter for calibration notification" into sc-dev 2021-07-02 14:14:09 +00:00
TreeHugger Robot
ca06e7e787 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:11:09 +00:00
TreeHugger Robot
ffb122d109 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:10:39 +00:00
TreeHugger Robot
6238fa728e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:09:59 +00:00
Mohammad Samiul Islam
929235fb71 Merge "Propagate error while scanning apk-in-apex to session object" into sc-dev 2021-07-02 14:09:37 +00:00
TreeHugger Robot
ba70e73914 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-02 14:09:14 +00:00
Andrea Ambu
2578be81e3 Merge "speech: Check componentName maps to RecognitionService" into sc-dev 2021-07-02 14:06:33 +00:00
Caitlin Cassidy
40116423b0 Merge "Allow swiping down from area directly below notch to trigger QS instead of notification shade." into sc-dev 2021-07-02 14:01:02 +00:00
Robert Horvath
ab7c14c59a Merge "Dismiss Inattentive Sleep Warning when inattentive sleep is disabled" into sc-dev am: 4c7368f759
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080841

Change-Id: Ib0a7407a3ffedaff8136e2267ee4fbd31bf9bfd5
2021-07-02 13:55:48 +00:00
Robert Horvath
4c7368f759 Merge "Dismiss Inattentive Sleep Warning when inattentive sleep is disabled" into sc-dev 2021-07-02 13:45:43 +00:00
Dave Mankoff
001bcae00d Merge "Fix Bouncer-Showing Status." into sc-dev am: 89646f1b97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15146461

Change-Id: I75a5233ea5cc8ddc709260f54e32dd137d134a3b
2021-07-02 13:31:48 +00:00
Dave Mankoff
d71aa057a3 Merge "Ensure taps are capture for falsing in the Wallet Activity." into sc-dev am: 267216bdb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15178508

Change-Id: I9f9e905eeb7a42f819a1899c06ce5cccbd95385f
2021-07-02 13:31:11 +00:00
Fabian Kozynski
7938100836 Merge "Fix clipping of SecondaryLabel on animation" into sc-dev am: b2a201b7e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15176788

Change-Id: Ic1b3d8f14b753c83294c50e004ee1864ab292710
2021-07-02 13:30:33 +00:00
Dave Mankoff
89646f1b97 Merge "Fix Bouncer-Showing Status." into sc-dev 2021-07-02 13:25:28 +00:00
Dave Mankoff
267216bdb0 Merge "Ensure taps are capture for falsing in the Wallet Activity." into sc-dev 2021-07-02 13:24:48 +00:00
Fabian Kozynski
b2a201b7e1 Merge "Fix clipping of SecondaryLabel on animation" into sc-dev 2021-07-02 13:15:31 +00:00
Bill Yi
393537e0db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia3b4ce0a1e3d31e81d9c1d63dc1c8feb0abd8ac0
2021-07-02 11:30:48 +00:00
Bill Yi
6d844349a1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I992091d77996de496f3c3166b2f09034f745fc83
2021-07-02 11:24:57 +00:00
Bill Yi
8b8eaf721c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5daf7eecaac7b6775cfdfb142acf94d1266407b8
2021-07-02 11:10:16 +00:00
Bill Yi
a0161bae64 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iba1e6da851f902df55284b557889d96fb13a1acd
2021-07-02 11:08:36 +00:00