Commit Graph

103902 Commits

Author SHA1 Message Date
TreeHugger Robot
4b92f32bce Merge "Add missing extra when launching apps" into tm-dev am: 14a3861f0b am: 628dd51d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

Change-Id: I8dabb8240062f5e1af7aac7ae9ead69c40c26f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:21:46 +00:00
Julia Reynolds
773c7e937e [automerge] Add missing extra when launching apps 2p: 87bb1b34c5 am: 3d8de3e21f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

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

Change-Id: I85b0462d686e9893982588e5d5cb606faaa781ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:43:55 +00:00
Julia Reynolds
82f3a1e68a Merge changes from topic "presubmit-am-1e7fa8f458a24c9bb07a3501870823fc" into tm-mainline-prod am: 7ba6728cd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594

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

Change-Id: I221b376e3d1f844aa970b84936570d6bfd5c70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:36:36 +00:00
TreeHugger Robot
628dd51d0d 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: I80b10681ce6d99697eacd905210e21b317edd4b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:34:23 +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
3d8de3e21f [automerge] Add missing extra when launching apps 2p: 87bb1b34c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

Change-Id: Ib37af2c92b1da8de0ce14f643db2e4ad1775408b
2022-04-12 20:21:07 +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
e2ef0bcdfc 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: Ib20da3b6a4d75fab7fd4aef8b3acf35216c9643c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 17:43:45 +00:00
Julia Reynolds
7ba6728cd8 Merge changes from topic "presubmit-am-1e7fa8f458a24c9bb07a3501870823fc" into tm-mainline-prod
* changes:
  [automerge] Fix some history issues 2p: 4d46dddbe7
  Fix some history issues
2022-04-12 17:39:55 +00:00
Julia Reynolds
45dccd14f3 Merge changes from topic "presubmit-am-1e7fa8f458a24c9bb07a3501870823fc"
* changes:
  [automerge] Fix some history issues 2p: 4d46dddbe7 2p: cf0c8f9868
  [automerge] Fix some history issues 2p: 4d46dddbe7
  Fix some history issues
2022-04-12 17:39:55 +00:00
Julia Reynolds
b28925ad48 Merge "Fix some history issues" into tm-dev 2022-04-12 17:39:55 +00:00
TreeHugger Robot
54f6f65f13 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: I15d78ec410d16d8e13e96a0ece2c583fa722010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 17:28:52 +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
1a35538f72 Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a am: 1f977b0e8c am: 00047b4c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388

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

Change-Id: I93c4c904c82be8f9caa2c8e278bc8d3bf561594e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 16:26:49 +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
9475c3d575 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: I098d86efd92d1cf4db45360482aabb88be2380de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 16:05:05 +00:00
Julia Reynolds
9987091312 [automerge] Fix some history issues 2p: 4d46dddbe7 2p: cf0c8f9868
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594

Change-Id: Ifd3bfdd17efdd12b4e0aa49a83d96d570d3942dd
2022-04-12 15:16:12 +00:00
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