Commit Graph

102065 Commits

Author SHA1 Message Date
TreeHugger Robot
41c6a85a20 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3 am: f0d733d51f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927

Change-Id: Ia781bbcbc379862db4fd7dce1babc9a57cd3a770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 10:47:04 +00:00
TreeHugger Robot
f0d733d51f Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927

Change-Id: Idf69f945ca458d3abcc71be9a0f98f18193afd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 17:28:36 +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
Victor Truong
00047b4c64 Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a am: 1f977b0e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388

Change-Id: I6f6a255a1a9c195e324e0934b44440954025831a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 16:26:34 +00:00
Victor Truong
1f977b0e8c Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388

Change-Id: I4b14a6811de245ab6f44f650e7d9ce71d20f6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 16:06:13 +00: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
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
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
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
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
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
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
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
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
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
e79605c652 Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev 2022-04-11 15:44:52 +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
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
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
4401a4ce15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours am: e23c8f1689 -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: Ib0f9c8f94e4a4ff0c5abf2d2b9ba7fc7deaf1f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:56:32 +00:00
Bill Yi
31360b1240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours am: 481bdb2265 -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: I0d779ac96dbf7827a1b1f59f0869a16bbdfe2de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:56:31 +00:00
TreeHugger Robot
e23c8f1689 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -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: I8715452e0a3d627dd01eea156af17c2afd1bb913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:33:59 +00:00
Bill Yi
481bdb2265 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -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: Ib3c055fbd1fd16499e0238a6774e504d4b039073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:33:57 +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
0bd17b37e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours am: 1a01f1b93e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672484

Change-Id: I4f3476a75af56cfc2772bccf74035836323e6e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:42 +00:00
Bill Yi
b3f705b1ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours am: 9b908935b2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672484

Change-Id: I2cea91a0675a0dfd997649d413ceed5db490b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:41 +00:00
TreeHugger Robot
23f4789154 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -s ours am: 6cf3ba6730 -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: Ia3c9fe7e84d9ad59e50be0bcfad272c54c024827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:36 +00:00
TreeHugger Robot
48b1d507f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours am: 579f0df02b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672493

Change-Id: I34e6993bbcd3fda46b2e4095dcb455aca77595d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:30 +00:00
Bill Yi
3d8e4e273c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29510c162d -s ours am: 60089ac6c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672493

Change-Id: I57e50f08f2fcef74cb95e470a64ebb7409d3fd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:28 +00:00
TreeHugger Robot
b2c2163966 Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46bc am: 068af6fb61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004

Change-Id: I7f819456179ae0b99dd6e7d177f14f0cfbb5ab8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:22 +00:00
Bill Yi
0edffb6516 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 am: 7f2b0a3e06 -s ours am: 29b997cff3 -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: I29658c67ede1f2f220639cd21570109926633adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:21 +00:00
TreeHugger Robot
1a01f1b93e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672484

Change-Id: I67d14af8f03da2bdd4edbc5d5261f812489e86ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:18 +00:00
Bill Yi
9b908935b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672484

Change-Id: I9490a0b0eba197d8f16c537d5980636839bf6d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:17 +00:00
Bill Yi
5fe4742648 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours am: 80f9c4f88d -s ours am: b4736f8091 -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: Id861b797f99e575fc099ae24a6043b97f666c7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:10 +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
3dfa1dbed5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-11 06:44:11 +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
6cf3ba6730 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -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: Idf77a706bd988d57c318fa99d953941bc97bee1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:33:59 +00:00
TreeHugger Robot
579f0df02b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672493

Change-Id: I758a6b99732b4652b18c2534579adae5e47d655a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:32:27 +00:00
Bill Yi
60089ac6c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29510c162d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17672493

Change-Id: I618bcafe2e96012984d2fd60c1091f4bd6cdaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:32:25 +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