Commit Graph

111630 Commits

Author SHA1 Message Date
Tsung-Mao Fang
84a63ef6ce [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours am: ee39631cdb -s ours am: f70458cdd9 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1d28a0c139c336ae6dec56734d54144ce1c1e1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:54 +00:00
Tsung-Mao Fang
5623c07822 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours am: 0f05806ab5 -s ours am: 5fd32e90b6 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: I048ba0a93f603192e3bb0864ff3ac045a45b00db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:45 +00:00
Tsung-Mao Fang
322e0d684d [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia726a7ef8c5b01d38600a55156195e9e717afb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:43 +00:00
Arc Wang
999bc0b0d0 [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am: ecf1846617 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: I510fb01461bb9f9c3e3512e8a2453c3e2ada6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:37 +00:00
Tsung-Mao Fang
d9b063c4a8 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2cffee6eed121dbf8b581eff8eb1c848c1eae78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:36 +00:00
Tsung-Mao Fang
4423f3e0b6 [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours am: 38ee0a345a -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Id5bb6d930eb0c0c8fdeef3b9dfa9bb1a0399018f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:27:35 +00:00
Arc Wang
9ab2f7b65b [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours am: 8cf511b709 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: Ie4a72b916f5ccaeafa234150f6619c2666e03719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:55:34 +00:00
Tsung-Mao Fang
f70458cdd9 [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours am: ee39631cdb -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I9497386a645e3fe4817da89ce597a6dad00dc7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:55:33 +00:00
Tsung-Mao Fang
5fd32e90b6 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours am: 0f05806ab5 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Iba760e28f5d6dde8384873f171544772a5af2318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:55:26 +00:00
Arc Wang
ecf1846617 [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Ic02f075561163bbe76ec94cea2640e1bbdee5915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:55:19 +00:00
Tsung-Mao Fang
38ee0a345a [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Id0a41a267ae5106ed4fc236500c92a949f1f7f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:55:18 +00:00
Tsung-Mao Fang
a5904fed59 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I457040da17e352a4d1cee1453e11daeffb1f5eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:52:16 +00:00
Tsung-Mao Fang
e57ce41bf1 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19e026e0dccec0e45dbc02fb926fda24c3c45f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:52:10 +00:00
Arc Wang
8cf511b709 [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I8bf03238620201496af8077768303e1fbbdb16d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:36:24 +00:00
Tsung-Mao Fang
ee39631cdb [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1d1009c07ea93deac60efb8fc1467bf95f074a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:36:21 +00:00
Tsung-Mao Fang
0f05806ab5 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Ibe913743375e295c5fcc2e2acbbc4f90f8c65eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:36:12 +00:00
Arc Wang
57643513e3 [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1462714a0484f6a2dc310a9a8b079a6a7bac0e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:21:28 +00:00
Tsung-Mao Fang
fc17db496f [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I02b849dc2f0705021a168985057ff725c9b9f415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:21:27 +00:00
Tsung-Mao Fang
9764e1f9fd [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Iaa0029076d6b0eb1960b3a7c2d6abc49316e1b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:21:08 +00:00
Tsung-Mao Fang
ac092ac06f [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie83ac1cc02b260d9468438076e8ca8ff11e72a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:51 +00:00
Arc Wang
eeafd49d4e [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: I07c9886a2bceaab3eccf3e1690ced01118240717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:41 +00:00
Tsung-Mao Fang
b8fd889067 [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: I326f27db0a1247719b08e84597051477baad4266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:37 +00:00
Tsung-Mao Fang
c923d29c08 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic31163255a4a53af7b3473067afbd6e21ba11147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:33 +00:00
Tsung-Mao Fang
4332b3266e [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 b34ff2f272 is already in history

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

Change-Id: Ia867eecc252f5bc5e95e2fd49e2802e9f1d413dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:27 +00:00
Arc Wang
4b12201ec4 Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev
* changes:
  [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
  FRP bypass defense in the settings app
2023-01-04 01:52:01 +00:00
Arc Wang
9a6c84c47e Merge "FRP bypass defense in the settings app" into sc-v2-dev 2023-01-04 01:51:22 +00:00
Grace Cheng
8ada95641a Updates sfps animations for natural orientation
Updates enroll find sensor animations given sfps natural orientation switch from landscape to portrait

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollFindSensorTest
Fixes: 264274708
Change-Id: I392767d2bde98e3509eef29f3095b2dafee16a30
2023-01-04 00:00:45 +00:00
Yasin Kilicdere
541a984ce0 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 23:03:32 +00:00
TreeHugger Robot
a1903f88aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20d80e79da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53d89a62410dfdd0601771857cde28fdbfab92ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:08:01 +00:00
Bill Yi
1dbf29aa1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5baeaab354 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0cee3b35f9e58f571a1cbf368dbbf80e7b11baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:58 +00:00
TreeHugger Robot
300534f327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3988c628f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icec8066206f26fcf53ec7a9cb68c36fd11f4dfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:49 +00:00
Bill Yi
e2b79d8fcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5c5fb43da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93b51be84ce0fa9bac390f000f251e576e3c2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:28 +00:00
Bill Yi
e192853dd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca33157e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50d45da7db6f6c3e0691efea1dcaa0211568de45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:09 +00:00
Yasin Kilicdere
85379e9452 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev 2023-01-03 12:18:58 +00:00
changbetty
0dcd6a5492 [RESTRICT AUTOMERGE] Change the intent flag to immutable
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
Merged-In: I68132f863027fab19351b4fdbc363e5c274e3327
2023-01-03 10:25:29 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Grace Cheng
04c630ca8a Adding product string variants on choose lock page
Adding product string variants on choose lock page

Test: (manual) observe fixed string on tablet on choose lock page
Fixes: 250807976
Change-Id: I4a0ab0a019708f3e0d81602967b187f6a7089dc5
2023-01-01 21:26:52 +00:00
TreeHugger Robot
20d80e79da Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
TreeHugger Robot
3988c628f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
Bill Yi
5baeaab354 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If04ffff758b1c88b3b7576858f8760893ee04bcf
2022-12-29 20:55:43 -08:00
Bill Yi
c5c5fb43da Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaabefc3fcd1e7c28c769f416ad25a32c37beaac0
2022-12-29 20:54:14 -08:00
Bill Yi
aca33157e1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia82d4eaed61ad8144ea278b4b64f6391cb044fb3
2022-12-29 20:51:10 -08:00
Sorin Basca
e81d98cc08 Use Mockito 4.6.1 API
Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-12-29 00:47:06 +00:00
Behnam Heydarshahi
4f87dd4b56 Implement a separate controller for ring volume
When ring volume is separated from notification, a new xml preferece and
controller is needed for it, so that the settings search can show/hide
the slice correctly.

1. Use a separate preference and controller for ring volume (vs ring &
notification combined)
2. Notification slice in settings no longer grays out when ringer mode
is set to mute or vibrate.
3. Introduce an abstract RingerModeAffected preference controller class
to factor out duplicate code among ring, notification, and separate-ring
controller classes.

Bug: b/259084354

Test:   make ROBOTEST_FILTER=RingVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=SeparateRingVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=VolumePanelTest RunSettingsRoboTests -j40
	make
ROBOTEST_FILTER=RingerModeAffectedVolumePreferenceControllerTest -j40

Known Issue:
1. When streams are separate and ring volume set to mute/vibrate,
notification is set to zero, but not disabled. So it can be turned on
by user (and in settings the icon will stay mute/vibrate instead of
changing to the normal notification icon).

2. In the above scenario after notification is unmuted in settings,
the notification icon continues to stay vibrate/mute -- should change
to the normal notification icon.

Note: This feature is controlled using a boolean DeviceConfig flag:
systemui/"volume_separate_ring". The default value is 'false', which is
meant to keep the experience the same as before. It will be set to
'true' for teamfood and dogfood. Eventually the flag will be removed and
the code in the 'true' branch will prevail.


Change-Id: Ibec871eafeef4081e96c5e0dd04535565d50a077
2022-12-28 22:33:50 +00:00
Ale Nijamkin
3802fbf7a2 Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a81a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20824496

Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-28 18:37:37 +00:00
Ale Nijamkin
53b342a81a Merge "Renames customization content provider (2/7)." into tm-qpr-dev 2022-12-28 17:42:20 +00:00
TreeHugger Robot
420afe232b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c9dead089 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieacff4cba7da4c415de0dd2cc1bd701b8076d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-28 06:16:08 +00:00
Bill Yi
6632af6cda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33f9bd645a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1327e057945f138c394950771e7664af707298b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-28 06:15:46 +00:00