Julia Reynolds
cf0c8f9868
[automerge] Fix some history issues 2p: 4d46dddbe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594
Change-Id: Ia4166d749cab1f571f2becec77b3dfae996d5101
2022-04-12 15:16:04 +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
2a57e5ec0d
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f
am: 89e58480d3
am: 789263e67f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: I174992eca77c10079a18d3887825648c29b8b8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 11:16:31 +00:00
Jason Hsu
789263e67f
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f
am: 89e58480d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: Ibef7b4a36294d8edf83331c69ed5f6df0f666f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 11:01:56 +00:00
Jason Hsu
89e58480d3
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: I611b086a17f4ccf6a2884764a2a507a931806104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 10:39:43 +00:00
Jason Hsu
4bf619c429
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f
am: 7d22d2460d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: Ia72133a62fce12dfd355abb618e1af12a0a998eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 10:39:36 +00:00
Jason Hsu
7798467e31
Merge changes from topic "presubmit-am-ae3353ea18c5416f84915ca2bb52d68b" into tm-mainline-prod am: 1c59d5db7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: I77bbf96f791981a29f8e52f8f8c9af19fa87dbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 10:39:18 +00:00
Jason Hsu
7d22d2460d
Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: Ib25bf6eaf354d4de0d3dc8ff8a866f0410f7b3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 10:38:47 +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
Jason Hsu
45fe16a5e9
Merge changes from topic "presubmit-am-ae3353ea18c5416f84915ca2bb52d68b"
...
* changes:
[automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
2p: e1e4a6747f
[automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
Write default accessibility service only when user enter into corresponding page.
2022-04-12 10:18:43 +00:00
Jason Hsu
1c59d5db7a
Merge changes from topic "presubmit-am-ae3353ea18c5416f84915ca2bb52d68b" into tm-mainline-prod
...
* changes:
[automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
Write default accessibility service only when user enter into corresponding page.
2022-04-12 10:18:43 +00:00
TreeHugger Robot
e248bfd070
Merge "Fix color lint" into tm-dev am: 3c4b7c53ef
am: 3976cc031e
am: 3f9c78103a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: I5e6d7cbbc156c706c56cf07e2dc6e412add18263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 09:46:27 +00:00
TreeHugger Robot
3f9c78103a
Merge "Fix color lint" into tm-dev am: 3c4b7c53ef
am: 3976cc031e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: I66868ee0b7c448534b463c23f2ae6a5e946a292e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 08:53:11 +00:00
TreeHugger Robot
3976cc031e
Merge "Fix color lint" into tm-dev am: 3c4b7c53ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: Ia5a03f90477d06fc404529b08b566850c385fb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 08:31:17 +00:00
TreeHugger Robot
f29dc0ed20
Merge "Fix color lint" into tm-dev am: 3c4b7c53ef
am: 29333a608b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: I80fcf173bea4739edf6f9da6d2a0c35a4ab2e7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 08:30:48 +00:00
TreeHugger Robot
ca035877e2
Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904" into tm-mainline-prod am: d79f27a66d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: I347f1ab36d3bf7f2dad08335e05c813c202217e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 08:30:41 +00:00
TreeHugger Robot
29333a608b
Merge "Fix color lint" into tm-dev am: 3c4b7c53ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: Ided24cb8b57158c50fda825933322bd9b35533c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 08:30:11 +00:00
TreeHugger Robot
3c4b7c53ef
Merge "Fix color lint" into tm-dev
2022-04-12 08:01:56 +00:00
TreeHugger Robot
b72948c7d2
Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904"
...
* changes:
[automerge] Fix color lint 2p: e706ccc59a
2p: ae4e50dfdd
[automerge] Fix color lint 2p: e706ccc59a
Fix color lint
2022-04-12 08:01:56 +00:00
TreeHugger Robot
d79f27a66d
Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904" into tm-mainline-prod
...
* changes:
[automerge] Fix color lint 2p: e706ccc59a
Fix color lint
2022-04-12 08:01:56 +00:00
Presubmit Automerger Backend
5ce913b1a7
[automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
2p: e1e4a6747f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: I53be724a2717e6d3c5ee74859e3b6d761d348fa7
2022-04-12 07:12:37 +00:00
Presubmit Automerger Backend
e1e4a6747f
[automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: Iced39d75bb57ea4cf0ba12b598c8a74193d9d8b1
2022-04-12 07:12:28 +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
Tsung-Mao Fang
a3e6e156dc
[automerge] Fix color lint 2p: e706ccc59a
2p: ae4e50dfdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394
Change-Id: Id7668e0dda15a3b90decca6a8cf58e0af25973fd
2022-04-12 03:04:00 +00:00
YK Hung
48ece925d5
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922
am: b85a395fc4
am: bea04faffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: Ic0a78b658eaa7932b4b56981f2e77d56f23969d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 02:22:46 +00:00
YK Hung
bea04faffb
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922
am: b85a395fc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: I7229c8e973964a36a8c31ccffd376c00cb7b9136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 01:59:45 +00:00
YK Hung
71ccc10142
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922
am: 19889cb427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: I30f264a5616f529acca0d4e8592d798e23a1c4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 01:45:46 +00:00
YK Hung
b85a395fc4
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: Icda8561d3977e14f364cd6be8e572d13755af93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 01:44:27 +00:00
YK Hung
234d7c0b15
Merge changes from topic "presubmit-am-e3b2c7aa82f942259e52399c23d94021" into tm-mainline-prod am: 5bf35db4df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: I4222f0ed95c8f8c0d4a08bdc1b8f9b8f686b7ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 01:43:50 +00:00
YK Hung
19889cb427
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Change-Id: I64e6a6b7e183dea475cbcd49bba2f892aa5dac85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-12 01:43:44 +00:00
YK Hung
6cf229c922
Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev
2022-04-12 01:21:40 +00:00
YK Hung
15aae196e5
Merge changes from topic "presubmit-am-e3b2c7aa82f942259e52399c23d94021"
...
* changes:
[automerge] Replace HashSet with memory efficient ArraySet collection 2p: c5b8287f1e
2p: 6125e7c969
[automerge] Replace HashSet with memory efficient ArraySet collection 2p: c5b8287f1e
Replace HashSet with memory efficient ArraySet collection
2022-04-12 01:21:40 +00:00
YK Hung
5bf35db4df
Merge changes from topic "presubmit-am-e3b2c7aa82f942259e52399c23d94021" into tm-mainline-prod
...
* changes:
[automerge] Replace HashSet with memory efficient ArraySet collection 2p: c5b8287f1e
Replace HashSet with memory efficient ArraySet collection
2022-04-12 01:21:40 +00:00
TreeHugger Robot
7c7efdf1e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7a7beda0c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17671920
Change-Id: I570e0e55436118efe1360760b1d2e7211ec8d201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 17:52:21 +00:00
TreeHugger Robot
7a7beda0c7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-11 17:25:47 +00:00
TreeHugger Robot
33ba38408d
Merge changes from topic "presubmit-am-cdb4e91a0bab46aba38f4860019c4fc1"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc5b9f2157
Import translations. DO NOT MERGE ANYWHERE
2022-04-11 17:25:47 +00:00
Presubmit Automerger Backend
a102030855
[automerge] Replace HashSet with memory efficient ArraySet collection 2p: c5b8287f1e
2p: 6125e7c969
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Bug: 195306545
Change-Id: I4847317e195d8b79ee114805b143670072b1e436
2022-04-11 17:12:42 +00:00
Presubmit Automerger Backend
6125e7c969
[automerge] Replace HashSet with memory efficient ArraySet collection 2p: c5b8287f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17680974
Bug: 195306545
Change-Id: Idb78cf85fda8dbaecff1650a90be5bfac043c15c
2022-04-11 17:12:35 +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
097b2c83c5
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652
am: e24b3ee152
am: e61f77ff63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: Ia6cc37ecf683bec149de10d85cefedcf2144d675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 17:10:07 +00:00
Tom Hsu
e61f77ff63
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652
am: e24b3ee152
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: I3c806d8379d971cb5ef063314306c00d13bc890a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 16:53:42 +00:00
Tom Hsu
0a53876930
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652
am: 2bde2ed0c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: Id992d1785157e857d0e00fc76481f23aa379d0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 16:33:32 +00:00
Tom Hsu
e24b3ee152
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: I972a5641a3d6f06b174e1eecec44acedff2a5fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 16:32:57 +00:00
Tom Hsu
7462a08cdf
Merge changes from topic "presubmit-am-86edc02cc89b443ca1d69b5d4139164f" into tm-mainline-prod am: 2cee15a6cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: I46d0813fc81513f4df9d59a3eb46dfef26d6d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 16:32:36 +00:00
Tom Hsu
2bde2ed0c3
Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392
Change-Id: I3b62f7a854235fa7b814f402d4a5a682a241f7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 16:30:20 +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
Tom Hsu
176b24b737
Merge changes from topic "presubmit-am-86edc02cc89b443ca1d69b5d4139164f"
...
* changes:
[automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac
2p: a7377878be
[automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac
[Panlingual] Fix settings crash due to no content view.
2022-04-11 15:44:52 +00:00
Tom Hsu
2cee15a6cb
Merge changes from topic "presubmit-am-86edc02cc89b443ca1d69b5d4139164f" into tm-mainline-prod
...
* changes:
[automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac
[Panlingual] Fix settings crash due to no content view.
2022-04-11 15:44:52 +00:00
Betty Chang
ad34d17f4d
Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe
am: 080ef875d8
am: 103ae973be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209
Change-Id: I4bc59d78c05cee12dbe2e7d0fac78a71b9d8f2fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-11 15:09:26 +00:00