Bill Yi
23f2bfb3a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb05bdc603a7427c0cf9c163f90930e13f1ed875
2022-04-13 16:11:33 +00:00
Julia Reynolds
b28925ad48
Merge "Fix some history issues" into tm-dev
2022-04-12 17:39:55 +00:00
TreeHugger Robot
7a4f6a5ba3
Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev
2022-04-12 17:24:05 +00:00
Julia Reynolds
4d46dddbe7
Fix some history issues
...
- Work profile notifs not showing
- Work profile icon is too big
Fixes: 228397748
atest: manually view work profile notifs in history
Change-Id: I76f7ad37bcfcf4ee7c909516f456920b7e19c541
2022-04-12 11:14:30 -04:00
Victor Truong
cd11aa887a
Disable dream highlight when screensaver is disabled in Settings.
...
Bug: 228329639
Test: Manual
Change-Id: Ic6d9664cc800c28327fbcaa1628bb518c07354f2
2022-04-12 13:23:10 +00:00
Jason Hsu
7a5ade7e9f
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev
2022-04-12 10:18:43 +00:00
TreeHugger Robot
3c4b7c53ef
Merge "Fix color lint" into tm-dev
2022-04-12 08:01:56 +00:00
jasonwshsu
2f2f0e982f
Write default accessibility service only when user enter into corresponding page.
...
Based on ag/17463205, to help users not to mis-triggered
volume-key-accessibility shortcut, we will only write default
accessibility service when user enter into corresponding service page.
Fix: 228562075
Fix: 226866175
Test: manual test ->
1. Do not enter into default config accessibility service page during setup wizard then finish setup wizard.
2. Observe settings value of shortcut targets. It should be null.
Change-Id: I4f26598d646c8e6b312debd03eaaa9d2cd7010ea
2022-04-12 15:10:38 +08:00
YK Hung
6cf229c922
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev
2022-04-12 01:21:40 +00:00
ykhung
c5b8287f1e
Replace HashSet with memory efficient ArraySet collection
...
https://developer.android.com/reference/android/util/ArraySet
Bug: 195306545
Test: N/A
Change-Id: I3f5831f2c5b5ec5ca50d312331c42eb90def2c61
2022-04-11 17:12:21 +00:00
Tom Hsu
e79605c652
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev
2022-04-11 15:44:52 +00:00
Betty Chang
6ebed73fbe
Merge "[LE Audio] Broadcast Sink UI" into tm-dev
2022-04-11 13:57:52 +00:00
Tsung-Mao Fang
e706ccc59a
Fix color lint
...
Test: repo upload
Change-Id: Ia39bcf291fb84ff7f27e52b45a28f946b2d3a75f
2022-04-11 20:40:18 +08:00
tom hsu
db1b6accac
[Panlingual] Fix settings crash due to no content view.
...
- Sometimes, listview may not created instantly, so move the action of
addHeaderView after fragment finished the onResume;
Bug: 228563549
Test: local
Change-Id: Ie5d53c962bed35783decd374c743a168a98cbf6a
2022-04-11 19:10:18 +08:00
changbetty
a56e198c61
[LE Audio] Broadcast Sink UI
...
- Add dialog for Broadcast and find broadcast source
- Add Activity for find broadcast source
Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-04-11 08:15:10 +00:00
TreeHugger Robot
18bdecad94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd
-s ours am: f6bc991eca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675016
Change-Id: I8793bb8cecefada63074542b428549ca222330b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 07:17:13 +00:00
Bill Yi
3d34896214
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a
-s ours am: 772b675c21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675016
Change-Id: I97e9045aa6b5e9c5928968f3998e57d458ef1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 07:17:11 +00:00
TreeHugger Robot
f6bc991eca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675016
Change-Id: Ifcf3abb8947dddfdf7db01c7ed7a7a8fb8b95042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 06:45:50 +00:00
Bill Yi
772b675c21
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675016
Change-Id: I2141797b3768ad979ff4dd600687ec17e4b28a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 06:45:41 +00:00
TreeHugger Robot
0aa436da2b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-11 06:41:44 +00:00
TreeHugger Robot
f8cae93b6e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004
Change-Id: I81954c4e9a931190a8b683014396ddf5da8b35b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 06:31:57 +00:00
TreeHugger Robot
abd1a29b60
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-11 06:26:16 +00:00
TreeHugger Robot
6a8dbf49bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-11 06:23:57 +00:00
TreeHugger Robot
cb8148ebaf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-11 06:05:47 +00:00
TreeHugger Robot
652b9f46bc
Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
Import translations. DO NOT MERGE ANYWHERE
2022-04-11 06:05:47 +00:00
Bill Yi
80f9c4f88d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745
am: 7df6d79353
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675011
Change-Id: I886e3694aeb948d9f851335978c429dc62e2620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 05:59:26 +00:00
Bill Yi
de1870ffed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675008
Change-Id: I37b8fab4a16c5e5f94266bd46f41f7a814bdfe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 04:47:20 +00:00
Bill Yi
f89aa3ca1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
2022-04-09 13:30:52 +00:00
Bill Yi
7df6d79353
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675011
Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
2022-04-09 13:15:01 +00:00
Bill Yi
8acb20ea2a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ec8d124d01075b528fe637783670daccb2da3cf
2022-04-09 13:07:19 +00:00
Bill Yi
7f2b0a3e06
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004
Change-Id: I9121da491000a804d91723b6e13ee9d2a74f82c2
2022-04-09 13:03:55 +00:00
Bill Yi
4beecb6946
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia56e96f0f7b667a6811440e12e3caab7dee7548e
2022-04-09 13:03:44 +00:00
TreeHugger Robot
3ed73b7b2d
Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev
2022-04-09 08:59:05 +00:00
Bill Yi
29510c162d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib43c040ea78198a02e3a405c9d3814af1927458f
2022-04-09 04:37:46 +00:00
Bill Yi
f0622598ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cc4c934e8fe86a45c45dc1d62aab78a30585529
2022-04-09 04:34:41 +00:00
Bill Yi
ee03d0172d
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours am: 6df1ae4e5f
-s ours am: 74fc91b313
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: Ie8f47508a38cd60aba21309f166970901d42a13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:47:10 +00:00
Bill Yi
4dd803da1d
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours am: ee5c8c915e
-s ours am: fdcf2eed39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I84b054daea4ece17be364b6a405650ed9d3af04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:46:27 +00:00
Bill Yi
74fc91b313
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours am: 6df1ae4e5f
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours am: ee5c8c915e
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:14:30 +00:00
Bill Yi
6df1ae4e5f
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 18:31:36 +00:00
Bill Yi
ee5c8c915e
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617
-s ours
...
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150
Change-Id: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 18:31:20 +00:00
Lucas Silva
8604694b24
Merge "Always set the customize button in dream settings to not selected." into tm-dev
2022-04-08 18:27:38 +00:00
Bill Yi
c854c108a2
Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE"
2022-04-08 18:08:25 +00:00
TreeHugger Robot
f558466b83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443
-s ours am: 191b3c66f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: Idbe24cff535f3591b26a033aa4ddb643c81c0854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:52 +00:00
Bill Yi
405720d804
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace
-s ours am: 6d933dc234
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: I1461c43cfe5f811cc80b212d9dd487fe96b296b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:51 +00:00
TreeHugger Robot
4470dcd6c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb
-s ours am: 71308f95e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: Id724e127a93ad691d7fad55d8e0819c9daaae909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:42:34 +00:00
TreeHugger Robot
191b3c66f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: I5cbe6e45fe2c432891eafd33960e2114b602e2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:41:15 +00:00
Bill Yi
6d933dc234
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626794
Change-Id: Ic87c9242df5d2da4163fe06cdc4a3ef52b271261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:41:03 +00:00
TreeHugger Robot
27d3d5cbdb
Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453
Change-Id: I62f4ea02f37069236098d6abda1f6a49ed6fede3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 16:39:10 +00:00