Michael Groover
cbe099936b
[automerger skipped] [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8
am: e2e59e35ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22102862
Change-Id: Ia9006db818ff45158278789e0e15b40d1c84a586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:55:49 +00:00
Michael Groover
e2e59e35ba
[RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22102862
Change-Id: Ia636db0342f676b2aff5b57399941ff05fb5aa89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:33:39 +00:00
Michael Groover
5b5da43ef8
[RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest
...
Change-Id: I34f808bc497971aa53fc7842159795d8407ed113
Fixes: 273763249
Test: atest CredentialManagerPreferenceControllerTest
2023-03-15 19:28:36 +00:00
Julia Reynolds
0b188773d0
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
am: c410a2c9ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: Ie3a446e61fb67ee1a1302a7a49733037c4b1242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:48:52 +00:00
Julia Reynolds
ec75b98047
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
am: 22e40c5184
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I82f742554d77278d8853499505cc37010ab5bab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:48:23 +00:00
Julia Reynolds
31b021a570
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
am: 1619d4cd25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: Ibb21322fe957713ce05000dea5224b90f97a4c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:38:16 +00:00
Julia Reynolds
686e7169ca
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
am: 84671635cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:37:08 +00:00
Julia Reynolds
22e40c5184
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I4aedc78dc4646c90e196be2501a1cfcb5b8add55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:11:47 +00:00
Julia Reynolds
1619d4cd25
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: I569c9eebdb67f5715b0546ffb6effbac5eacc42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:11:28 +00:00
Julia Reynolds
c410a2c9ae
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: Ic1210a586808bfb8080e17f6ecfd5ec69b7e3be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:09:15 +00:00
Julia Reynolds
84671635cb
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: Ib8b029ddfcd77aa82c94c698fb7e2830014bdcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:07:36 +00:00
Julia Reynolds
4d1535441e
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I03d1f3a7b40598abfa3bbd1fee85b457a471acd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:00:44 +00:00
Julia Reynolds
068a55384b
Merge "Reduce jank when revoking notification permission" into udc-dev
2023-03-15 14:50:07 +00:00
Julia Reynolds
ce0c1c4de7
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I90173ce86cc356ba97e4ff51dffd6b6588bb0c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 14:27:39 +00:00
Julia Reynolds
7626600bbf
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev
2023-03-15 13:59:23 +00:00
Julia Reynolds
a331c50b53
Reduce jank when revoking notification permission
...
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields
Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Jason Hsu
44d0882f80
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
am: a14e57b917
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I1477e47557eb7e63c69ba505c7ea13265923071d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:52:15 +00:00
TreeHugger Robot
daf85805f6
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
am: 2dfc20bb43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: Ica6d30bcd5478be64cbc132ec14c9d76ce7fb7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:51:18 +00:00
Jason Hsu
c2dffa7aa4
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
am: 54fffdc6ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I3d8dc59a5ade8161d2d43e6b1ee9fdf78f0bb9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:50:52 +00:00
TreeHugger Robot
db2bd32285
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
am: 59b7f47307
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: I95a3d90e0b6f6bcd213c11ec3c4cb33e2132a4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:49:19 +00:00
Jason Hsu
54fffdc6ec
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I57f2f6fcedac3abfc8dd65d70ea9b85e5244b10b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:50 +00:00
Jason Hsu
a14e57b917
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I63879c27940834f5dfde70e1252c7b3c953af158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:45 +00:00
TreeHugger Robot
59b7f47307
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: Ib02077e90eb31f378ce1fe54d99ec408dea8e18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:27 +00:00
TreeHugger Robot
2dfc20bb43
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: If6222c00ef5746db591519644f8a4b70853233a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:00 +00:00
Jason Hsu
9f29b957e7
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev
2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d
Merge "Hide Dock speaker plays from sound pages" into udc-dev
2023-03-15 11:52:38 +00:00
Matías Hernández
88ea5f9dae
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
am: f38b8aa4c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: I186dba052ad815e341651c745828e11dff97b3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 11:00:52 +00:00
SongFerng Wang
e7e8ffef71
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
am: 53255717ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: I9e440d1c2674bd453491e58f50af1ff7656b611b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 11:00:15 +00:00
Matías Hernández
6b13d794bc
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
am: be3c8b66ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:59:30 +00:00
SongFerng Wang
1576e0a241
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
am: ea5a05780f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: Ia6aeaffc1755f4b669864abd5ba9313f66cf8764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:58:47 +00:00
Matías Hernández
be3c8b66ba
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: I580fb71a42be1e400596c62425334b8ab5433d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:26:32 +00:00
Matías Hernández
f38b8aa4c1
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: Ie517a41e5e5f80f1fb81c037af235d0aac0bb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:26:11 +00:00
SongFerng Wang
53255717ca
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: I1f6c815adae2fbe8ee0ae09e60ab18137a89da18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:25:45 +00:00
SongFerng Wang
ea5a05780f
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: I730250b01635eb082650d5de077975ace509b540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:25:41 +00:00
Mill Chen
a860bf3220
Hide Dock speaker plays from sound pages
...
In order to ensure the setting only works on the analog docks, adding
the docking state checks.
Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
displayed
Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev
2023-03-15 10:12:23 +00:00
TreeHugger Robot
83289a7b29
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3
am: ff5badcecd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475
Change-Id: Ic5fa8faab2b126955bdef717a7a771a1d58b3078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:47:31 +00:00
Daniel Huang
e789fa94ca
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
am: 91f72db16a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546
Change-Id: I85a0a41b4a261c2d626135f59f1c310c698ffb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:47:23 +00:00
TreeHugger Robot
f96a7553a2
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3
am: 05da9199bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475
Change-Id: I9420e554b4dfd9af4d74107044f445a5f10c7ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:46:33 +00:00
SongFerng Wang
40cf9a2132
Merge "Avoid ANR when UI query network selection state" into udc-dev
2023-03-15 09:46:21 +00:00
Daniel Huang
8c87d9233d
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
am: fd695cd189
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546
Change-Id: Ida6029fe696b145b625949e6ac0287cc27d2d119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:45:49 +00:00
TreeHugger Robot
05da9199bd
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475
Change-Id: I109e6ac5d761f9a246991b34e4434bbf951b3d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:13:34 +00:00
TreeHugger Robot
ff5badcecd
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475
Change-Id: I999e83a1de7a66111ae493e1fc976a88119897d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:13:32 +00:00
TreeHugger Robot
bec6e40dd3
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev
2023-03-15 08:55:50 +00:00
Daniel Huang
fd695cd189
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546
Change-Id: I537e15066169748cc3a024383c3e164f55eb08d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 08:55:44 +00:00
Daniel Huang
91f72db16a
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546
Change-Id: I46094521cb3171f1444b7fe8387e95e009df486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 08:55:39 +00:00
Daniel Huang
f826b3f427
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev
2023-03-15 08:15:07 +00:00
SongFerngWang
7b9c22348a
Avoid ANR when UI query network selection state
...
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.
Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9
)
2023-03-15 07:54:06 +00:00
SongFerng Wang
65734dd29b
Merge "Avoid ANR when UI query network selection state"
2023-03-15 07:52:59 +00:00
Jason Hsu
1ceac581de
Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e
am: 42fc665f48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662
Change-Id: I22d3b8499aec10b1d7c10f0d1fa9162698c82553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 07:39:37 +00:00