David Coffin
1bd7090158
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: e65b3bda30
am: 55f64671d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: Icd722863066c0d624925b993e0fc3b0d1447577e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 22:03:58 +00:00
Automerger Merge Worker
49d343f751
Merge "Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: b457d2197d" into tm-d1-dev-plus-aosp am: ac033fe4cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: I48c4de326cac6dc82552f5aa0dac7a1748798d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:52:19 +00:00
David Coffin
0b864a1874
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: e65b3bda30
am: a3b50a149b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: I186c122f760b210f4f64e7742bd6cbde3e72b43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:51:20 +00:00
Automerger Merge Worker
ac033fe4cc
Merge "Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: b457d2197d" into tm-d1-dev-plus-aosp
2022-05-05 21:28:47 +00:00
David Coffin
0104f06058
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: b457d2197d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: Iab6c29143024f80c4af35ab0afbdf1b29e0c3d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:28:39 +00:00
David Coffin
a3b50a149b
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: e65b3bda30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: I709c8f674ac7059375a712c2a97c27aa3601c0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:28:32 +00:00
David Coffin
55f64671d2
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: e65b3bda30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: If1ecbdb76c24ef61371dec06434ef53f6e75a26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:28:29 +00:00
David Coffin
e65b3bda30
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: Ided2edcaf54e253e9abe20951d4d283510b9b4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:10:55 +00:00
David Coffin
b457d2197d
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: If61633a776e40d968516ccdf5c5d9273473958fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:09:34 +00:00
David Coffin
bf2bec34e0
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev
2022-05-05 20:34:00 +00:00
Yuri Lin
7cbba753dc
Change zen mode schedules page rule handling
...
The approach of reloading all rules (and recreating all ZenRulePreferences) every time the rule set changed causes the switches on the page to stop working.
This change keeps the ZenRulePreference around as long as the rule itself is around and keeps it updated, while re-adding the preferences to the PreferenceCategory if needed due to rules changing.
Fixes: 229879326
Test: manual, ZenModeAutomaticRulesPreferenceControllerTest
Change-Id: I4eba41e8252cedd87ac866e4b97513970ca2d94a
2022-05-05 14:24:42 -04:00
TreeHugger Robot
71b2ca5b14
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: f01fbbcec3
am: 036373b278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I74cb7596dd1aadd3636e03ff9ed6ad51df9470e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:27:08 +00:00
TreeHugger Robot
2f954f9dac
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: f01fbbcec3
am: 926646c774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I4d38ce9b103034434cb7042d3e2768b743d0a1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:19:52 +00:00
TreeHugger Robot
844772713f
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: b3130cd857
am: e4ebac3480
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I4bfd07bcc663935d45c03e250a88a444f7b9e025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:19:45 +00:00
TreeHugger Robot
926646c774
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: f01fbbcec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ia1e3e63699b5f217057d8a3ed1f43eaa92fac326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:06:03 +00:00
TreeHugger Robot
036373b278
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: f01fbbcec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ia062145408e033588a1478b341e7a6c91738ea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:06:01 +00:00
TreeHugger Robot
e4ebac3480
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: b3130cd857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I25d30bd384eefec6661be219aeae5dfa6108a59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:58:46 +00:00
TreeHugger Robot
f01fbbcec3
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I1c10f70954313ca7a15cd83e8d0663440fb1d3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:44:42 +00:00
TreeHugger Robot
b3130cd857
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ib407602d7bdba7e7b60fada3ce53e3418b47efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:42:38 +00:00
YK Hung
e64c931b6e
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 75238622bf
am: d3febabb1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ia8425066f1305ea149bbc9befd92fc119d588f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:34:09 +00:00
YK Hung
e267d7c17d
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 5f597a5f18
am: 5accce3e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ie72ac1503feb6b5eeb745df6c35ec1cb244321fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:33:51 +00:00
YK Hung
eab6352317
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 5f597a5f18
am: f623e0a8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: If5faf3a894aa5a73d6c7be5f21602d46840e91c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:33:43 +00:00
TreeHugger Robot
af5a015198
Merge "Add missing settings strings." into tm-dev
2022-05-05 13:19:07 +00:00
YK Hung
d3febabb1f
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 75238622bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ief260fd134022fdde05d3f7e66109f9b09f37364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:11:40 +00:00
YK Hung
5accce3e05
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ifa54a030b0f028553effdc42965dbab09718515a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:11:15 +00:00
YK Hung
f623e0a8d3
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I519da4dafa403606a6c197bb9c8ab56e3eaf9770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:10:39 +00:00
YK Hung
5f597a5f18
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Id5e216edab65a83c6c7836e719e8dd11c500acb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:41:20 +00:00
YK Hung
75238622bf
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I70e5ed6a5d04f20d0d6364cd3522a35ae0407920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:39:40 +00:00
YK Hung
434009d709
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev
2022-05-05 12:18:10 +00:00
SongFerngWang
e8bb9c9be3
[BT Broadcast Sink] Add the function for leave and scan QRcode buttons
...
Add function for 'leave broadcast' button
Add function for 'Scan QR code' button
Set 'level broadcast' button gray out when device does not have broadcast source
Bug: 228259065
Test: build pass and manually test
Change-Id: Iab4a45e73f49c3f755b95ea3fa38872daac7e745
2022-05-05 18:16:44 +08:00
SongFerng Wang
c77208d54d
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: e00cbc7885
am: 337bb7cf74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I925ddb657876b192e5c60153a05d1754e465dd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:54:00 +00:00
SongFerng Wang
a74107113e
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: 411d3acb66
am: c5618a37b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I6cfa962ff37c3e41629c6c19e06a6f609bd275f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:53:40 +00:00
Tsung-Mao Fang
b5a88deb99
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: c4613ab0d2
am: fdf150573f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I3a92c20a0fb686f49df1ebd3b082cf7e4a89993c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:52:51 +00:00
Automerger Merge Worker
35830e04d6
Merge "[Panlingual] Fix conflict am: 70fe2d1fdd
am: fd09e5c0e8" into tm-d1-dev-plus-aosp am: 1811ddabe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I8bc5a898c79b88d7d6c756261e3c9563519418ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:52:46 +00:00
Tsung-Mao Fang
69328314ce
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: a0100b2171
am: 8998aeb1fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I1d660e44e2795042585334dc36aada70b2867e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:52:39 +00:00
SongFerng Wang
da313f5e1d
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: e00cbc7885
am: 6e60b53542
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Id825f8784b7b6e1bf12e82e277c6a7bc4ca8f236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:51:51 +00:00
Tsung-Mao Fang
6493af118d
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: a0100b2171
am: f9edc98ba7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I1b5fe37f1b85b7aa7e7a693389ffeed55363420e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:51:28 +00:00
Tom Hsu
1d8e73ab2c
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
am: e74b7edb7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I29f2a85b41db7facafec1a6c091dfe94ce3a8f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:50:54 +00:00
Tom Hsu
7c2d110559
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
am: 1c154f9197
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: Iff851855d4f4f8b0c01650b79cc4b52a5ae07780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:50:43 +00:00
SongFerng Wang
337bb7cf74
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: e00cbc7885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Ifb3d2f557370c20df953d752b1ce0281f0deeb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:12 +00:00
SongFerng Wang
6e60b53542
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: e00cbc7885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I04a8820ecc9e3757bd58a49e4e451cc7a004e9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:07 +00:00
SongFerng Wang
c5618a37b4
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: 411d3acb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I58c8d789e9e9b01c1e97acebbbf7d7c4503f6d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:03 +00:00
Tsung-Mao Fang
f9edc98ba7
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: a0100b2171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I09616381905908cfebdc0bcb0bced2f6d8176340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:56 +00:00
Tsung-Mao Fang
fdf150573f
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: c4613ab0d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: If05e4d9274de4f3c637239c12c751e49c4560179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:47 +00:00
Automerger Merge Worker
1811ddabe3
Merge "[Panlingual] Fix conflict am: 70fe2d1fdd
am: fd09e5c0e8" into tm-d1-dev-plus-aosp
2022-05-05 09:27:29 +00:00
Tsung-Mao Fang
8998aeb1fc
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: a0100b2171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: Ieed25319883b72568c1b1c1421452a49578840ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:24 +00:00
Tom Hsu
e8e612c7d5
[Panlingual] Fix conflict am: 70fe2d1fdd
am: fd09e5c0e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: Ice1bd20d3282d30e53e8bb150bc59437144bd02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:22 +00:00
Tom Hsu
e74b7edb7c
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I8154923e9e3db1e4984889d648cf0cfa17e65348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:26:43 +00:00
Tom Hsu
1c154f9197
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I0bd679552d03be99daf1e31d120626cc8b9d4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:26:24 +00:00
Jonathan Scott
b7f4f56cad
Add missing settings strings.
...
Also re-enable and fix tests.
Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624
Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
2022-05-05 09:12:59 +00:00