Ayush Sharma
2f5f7c96d1
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ieaafe1022101cc6d66e5e3518846e3c68b71cd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:14 +00:00
SongFerng Wang
a7af4d2965
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: Id200031fbfb965fb97fe4b87a7bbb820dbf0a970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:09:32 +00:00
Ayush Sharma
938200e3a8
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ib944ba6daa832409c6f5ae2b6b3921e4038dea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:08:55 +00:00
SongFerng Wang
286682ec8a
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev
2022-05-06 11:08:21 +00:00
Ayush Sharma
6e4579a816
Merge "Move set work lock message from header to footer" into tm-dev
2022-05-06 10:42:10 +00:00
Arc Wang
6f41c5de15
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
am: dcf9e31c1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: I66da7a73cdbf21fb8e5b33c09ca03c0d0e7b6522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 10:13:26 +00:00
Arc Wang
3f5f9aea7f
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
am: 80d5ebdf8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: Ie3a1dd48763ca274d74e357838dd5b56de3a9730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 10:13:06 +00:00
Arc Wang
80d5ebdf8d
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: Iaf4585840b034fed6411e34a793fb57c5176ea30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 09:50:08 +00:00
Arc Wang
dcf9e31c1b
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: I4674ee0f1cea5c695b571055daa9492ef438bc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 09:48:08 +00:00
Arc Wang
e4c22580c9
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-06 17:42:30 +08:00
Arc Wang
64b42270ab
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev
2022-05-06 09:24:42 +00:00
Arc Wang
358dd2b494
Revert "Prevent side channel package installation enumeration"
...
This reverts commit 263592e3dd
.
Reason for revert: <To fix test breaks b/231461076 & 231164585>
Bug: b/231461076
Bug: b/231164585
Change-Id: I29211e5de9d7edef8c61125b8be047b6247c8773
2022-05-06 04:07:50 +00:00
Yi-Ling Chuang
e6501e1249
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
am: dd6dd8ad13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I20f17879e46c24444d45f93853cd46ee58ad0947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:53:47 +00:00
Yi-Ling Chuang
efbd45873b
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
am: 0fddcd3f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I5656707b6503997d9cd05589bb4c51d8cc113101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:53:22 +00:00
Yi-Ling Chuang
0fddcd3f80
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I2802a6770e187e6ac8d2f76286f0ffa0ee5adac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:33:57 +00:00
Yi-Ling Chuang
dd6dd8ad13
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I5e72367a25b57f91014bf983289019a399b53792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:33:03 +00:00
Yi-Ling Chuang
9a14f087cd
Merge "Show previous query upon configuration change" into tm-dev
2022-05-06 03:17:22 +00:00
TreeHugger Robot
a3986ac0f8
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
am: 01afe2287f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: Ie068ae597e35f38f168586189efca34f88843a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:00:51 +00:00
TreeHugger Robot
a636c1e104
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
am: a64b3585c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I4da85f0178f60d6fb9c692e900f25bb333c1f8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a64b3585c2
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I7830bae523e7fe0464af2c4ff821c87e46ca4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:42:35 +00:00
TreeHugger Robot
01afe2287f
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: Ieb6aa225ddbae799d999bb018e659d7514bf014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:41:16 +00:00
TreeHugger Robot
b2dd7913c0
Merge "Fix Learn more link not work" into tm-dev
2022-05-06 02:27:19 +00:00
Milton Wu
2cb52b2353
Update SUW biometric string product
...
Fingerprint strings for SUW is not consider product. Update string to
use 3 different products. They are tablet, device, and default.
Bug: 228021544
Test: Check SUW fingerprint string in tabet and phone
Change-Id: I728f52360e0c7e4972190caf47bea75a64f873ec
2022-05-06 09:59:26 +08: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
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
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
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
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
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
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
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
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
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
SongFerng Wang
e00cbc7885
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:25 +00:00
SongFerng Wang
411d3acb66
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:22 +00:00