Commit Graph

106818 Commits

Author SHA1 Message Date
Yi-Ling Chuang
daefa66c33 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: efbd45873b am: e2db0ca0a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I88356e3d511ce25e67da744fa30769b7e55e8a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:25:39 +00:00
Yi-Ling Chuang
bdfb64cd38 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: db73382e8b am: 9be24d9bd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I1c78443d60f050a31b0088a4b64240256b4e7aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:25:21 +00:00
Yi-Ling Chuang
e2db0ca0a0 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: efbd45873b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I29c07f3489be22a08338192a52be5ca860d7b9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:06:48 +00:00
Yi-Ling Chuang
9be24d9bd5 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: db73382e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I9877cc5198d934b89d5aeda83911e1bb4ff3f6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:06:22 +00:00
Yi-Ling Chuang
db73382e8b 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: I69ffdeda8f6accb6557395e4725a45aa2d1b2aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:53:27 +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
ff9c2228d3 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 9a55ef5d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I3de0f134ac8f074f2a7a831b2e31dd60b76871ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:52:50 +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
TreeHugger Robot
d73a7403d6 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: 01afe2287f am: a3986ac0f8 am: 02ddc3c758
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I07b5bcba5767a4b027cdea8c4cbf6a202e0b42dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:54 +00:00
TreeHugger Robot
0f09db4392 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: a636c1e104 am: d6f947ea66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I84c7803311780380e6bf82c6c7b195730e34921d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:47 +00:00
TreeHugger Robot
bdcd5f4f8a Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: 1d27f67bfb am: 676d56a3a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I8560fba12321bd23d966333bc31c66c13ebe5533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:38 +00:00
Yi-Ling Chuang
9a55ef5d47 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: I739722df090b9b5799944aac03ca31bb8d14a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:01 +00:00
TreeHugger Robot
02ddc3c758 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: 01afe2287f am: a3986ac0f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I4a6f3ed44aa5996346d985dcfd2404850d390250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:32 +00:00
TreeHugger Robot
d6f947ea66 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: a636c1e104
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I9683edf17b64bcbd8a75a35c156289375e0b5100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:25 +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
676d56a3a6 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: 1d27f67bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Iaf9cfaeab21014cd257d3e2cfd0abb73ad8f7a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:06 +00:00
TreeHugger Robot
a5470e4c24 Merge "Fix Settings getProfileIdsWithDisabled usage" 2022-05-06 03:16:37 +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
1d27f67bfb 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: I2bf19dba3f1361116735868b8452c72cf7069293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:00:47 +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
cb27ca6485 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: 8397becc7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Idfa21fe2fa1261c8e8aed617d95b6c90d6f364f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:00:19 +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
8397becc7a 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: Ic4db3f53a3b5ad9bca6ea933838974f3790e3e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:41:39 +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
David Coffin
4315723444 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: e65b3bda30 am: 55f64671d2 am: 1bd7090158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I3240deacce675e0e224530bd4629c3d0c1f58be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 22:13:45 +00:00
Automerger Merge Worker
e6243f2645 Merge "Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: b457d2197d" into tm-d1-dev-plus-aosp am: ac033fe4cc am: 49d343f751
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I1ae34642ab853449c269ed65447b191145c50b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 22:13:18 +00:00
David Coffin
c2d368bd3a Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: e65b3bda30 am: a3b50a149b am: 0b864a1874
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: If4be02c3c1c89fbf9482ec768a6d2ab83736269e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 22:12:37 +00:00
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
68e969a586 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: 7db0062f6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I7b77a426813ac172512997a53a5239b69156c802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:28:01 +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
7db0062f6b 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: Ib0e42665fe4daa02afcf249639f46ff2b8ec0879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:10:53 +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
30732fe61e Merge "Add missing settings strings." into tm-dev am: af5a015198 am: 3e01dd0296
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ifdb670fd69ac1c79a42efa092bafbf780148cc9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:28:49 +00:00
YK Hung
9549bf9782 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 272c5b99cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: Ibaa214d53cadaa02770d8adbc216de35dd283bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:23:07 +00:00
SongFerng Wang
d48c8389b1 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: 8c7cda2140
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ib0c4abcb8b533d81f6ccc4e21e2e5781336c8019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:18:53 +00:00
Tsung-Mao Fang
e7cb947b0e Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: c1fe17de0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I0ae0177568a308ab4f842f053b7379ec0cc5b8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:18:39 +00:00
Tom Hsu
9b681c34dd [Panlingual] Fix conflict am: 70fe2d1fdd am: 370840ff0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I0b4dfddbcd97780dfe5b913c17f4a84452214506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:18:23 +00:00
Ronish Kalia
7cb0d26b31 Merge "Add intent filters for language and wallpaper setting" 2022-05-05 18:35:01 +00:00
Daniel Huang
d4d78df638 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 90292ac568
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I0945826755b4cb41edddcd278446067e928fb8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 18:32:24 +00:00
Bill Yi
9c780d3b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 3081f3b059 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If886db427043ecd65d9e63c809fe660c9387430e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 18:09:50 +00:00
Bill Yi
80adf23dc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: c7ab71848a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id62b980f80b936061722b504f6e3fd9d441519e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 18:05:23 +00:00
Bill Yi
e5f34f8877 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 25591b4896 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49e3f68821aeec549d67336e967902467d35f75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 18:05:04 +00:00