Commit Graph

104676 Commits

Author SHA1 Message Date
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
Betty Chang
103ae973be Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe am: 080ef875d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ica4020bbf19115143d35ab18a3eee8dc146b24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:49:43 +00:00
Betty Chang
d956e1cdec Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe am: 6b6ae74f41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: If74784db890682edcc9bc4ecfccdcadac623fa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:49:12 +00:00
Betty Chang
080ef875d8 Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ia13a32d105fc1fbf72e42ef133a75e0ae7fd872c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:14:57 +00:00
Betty Chang
6b6ae74f41 Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ib3761f86ff083ae83ea17646428f9f70c9428867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:14:05 +00:00
Edgar Wang
a8d7f3dede [automerge] Fix "Factory Reset" fails to reset the device 2p: f8739eda93 2p: 8b50a41576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I2fa412d8b99e1ce87b1b89f632eb18f477cec167
2022-04-11 13:58:27 +00:00
Edgar Wang
8b50a41576 [automerge] Fix "Factory Reset" fails to reset the device 2p: f8739eda93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I614552d70356794daa34623d26924c0a65f91430
2022-04-11 13:58:18 +00:00
Betty Chang
6ebed73fbe Merge "[LE Audio] Broadcast Sink UI" into tm-dev 2022-04-11 13:57:52 +00:00
Edgar Wang
f8739eda93 Fix "Factory Reset" fails to reset the device
when device didn't support PersistentDataBlockManager, Settings will
crash at get PersistentDataBlock service.
So we need to check if device support PersistentDataBlockManager
before call getService.

Fixes: 196634851
Test: manual verify on aosp build.
Change-Id: I5afba5df8c4831499478490b442c0fcf367d23ae
2022-04-11 21:50:01 +08:00
Edgar Wang
8b2165a414 [automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e 2p: 739a359b07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395

Change-Id: I84b8d5cd0c913106597377a2392489469f8f6c13
2022-04-11 13:29:21 +00:00
Edgar Wang
739a359b07 [automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395

Change-Id: I0d3b1e9416e0928cae610f1b36825b6f325f6b73
2022-04-11 13:29:12 +00:00
Edgar Wang
257ebe4a5e Index the gesture options in System Navigation Settings page
Fixes: 167536360
Test: manual verify & robotest
Change-Id: Ie1a24a7206153dc1405f8a28369a6bade11ddd39
2022-04-11 21:05:37 +08:00
Tsung-Mao Fang
ae4e50dfdd [automerge] Fix color lint 2p: e706ccc59a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394

Change-Id: I9a0136789a69e54ce713724de0bac458eb9161ba
2022-04-11 12:42:57 +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
3558492c55 [automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac 2p: a7377878be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392

Bug: 228563549
Change-Id: I0da02d0abc2eb416c05194748366b8b2e25fc607
2022-04-11 11:11:06 +00:00
tom hsu
a7377878be [automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392

Bug: 228563549
Change-Id: If21482100aa626c077bdd50dda1bd47bd6691636
2022-04-11 11:10:57 +00:00