Commit Graph

102081 Commits

Author SHA1 Message Date
Edgar Wang
89db307b2a Merge "Fix "Factory Reset" fails to reset the device" into tm-dev am: f797153708 am: 65f1e4eea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: Ibdadbfe39239611efa198aca2f57f434ce3f8602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:24:45 +00:00
PETER LIANG
9d945b6795 Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev am: 8bd6647885 am: c18637a51f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845

Change-Id: I6c6af26d01df82d176edce4a807a9138c78912c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:24:27 +00:00
TreeHugger Robot
6307be190c Merge "Add missing extra when launching apps" into tm-dev am: 14a3861f0b am: 71f87d544e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

Change-Id: I10d3fe39c460d7763364beb8113f7543e2336bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:20:21 +00:00
Julia Reynolds
e646203486 Merge "Fix some history issues" into tm-dev am: b28925ad48 am: 2c6c99e1f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594

Change-Id: I7b413d63b3fcabdded07b2348a6a2db199c56de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:07:45 +00:00
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
Edgar Wang
65f1e4eea5 Merge "Fix "Factory Reset" fails to reset the device" into tm-dev am: f797153708
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I87e656aec7fd22e5e822d075f4a68163bd3cfb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 04:59:32 +00:00
Edgar Wang
f797153708 Merge "Fix "Factory Reset" fails to reset the device" into tm-dev 2022-04-13 04:33:07 +00:00
PETER LIANG
c18637a51f Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev am: 8bd6647885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845

Change-Id: Ia7c99a555600f57989dcecd6afe7235640282a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:44:51 +00:00
PETER LIANG
8bd6647885 Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev 2022-04-13 00:39:27 +00:00
Peter_Liang
09a2a49bd3 Fix that device isn't responding for a while when resetting all settings on “Display size and text” page.
Goal:
Probably has the race condition issue between "Bold text" and  the other features including "Display Size", “Font Size” if they would be enabled at the same time, so our workaround is that the “Bold text” would be reset first and then do the remaining to avoid flickering problem.

Bug: 223747686
Bug: 220082104
Bug: 220070773
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: If1425fe2579bec8dded69680ac73fbfb03c37321
2022-04-13 00:38:44 +00:00
TreeHugger Robot
71f87d544e Merge "Add missing extra when launching apps" into tm-dev am: 14a3861f0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

Change-Id: Ib9e96390eb5b388ce8cc65bc41071de860450083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:35:55 +00:00
TreeHugger Robot
14a3861f0b Merge "Add missing extra when launching apps" into tm-dev 2022-04-12 23:27:14 +00:00
Julia Reynolds
87bb1b34c5 Add missing extra when launching apps
As promised in the api docs

Test: AbstractZenModeAutomaticRulePreferenceControllerTest, view
schedule DND page
Fixes: 221423986

Change-Id: I7ddc1b112950da225afa2ba13ebf5df481922177
2022-04-12 16:20:01 -04:00
Julia Reynolds
2c6c99e1f1 Merge "Fix some history issues" into tm-dev am: b28925ad48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594

Change-Id: I1e3c6396c2a6570bee3d18f68a5c0e9e810f92ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 17:44:43 +00:00
Julia Reynolds
b28925ad48 Merge "Fix some history issues" into tm-dev 2022-04-12 17:39:55 +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
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
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
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
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