PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,307 Commits 1 Branch 0 Tags
00b3075d4e16b7096014a38afb0d83d7b667133f
Commit Graph

107307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Bill Yi
afc7c40f3c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-05 16:42:15 +00:00
TreeHugger Robot
db37eb8c1f Merge "Add missing settings strings." into tm-dev am: af5a015198 am: f01fbbcec3 am: 036373b278 am: 71b2ca5b14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ifdde6ba293a538ae3cefa2db3a4af002b84a420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 14:53:10 +00:00
TreeHugger Robot
b8b213ef19 Merge "Add missing settings strings." into tm-dev am: af5a015198 am: f01fbbcec3 am: 926646c774 am: 2f954f9dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: I747c8eef5358d2b5279397070096d1a318611699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 14:53:02 +00:00
TreeHugger Robot
3de43826cb Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480 am: 844772713f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ie359cdd4a2b8481319fe918ebff0478fe2877c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 14:52:43 +00: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
YK Hung
dc050d61b2 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 75238622bf am: d3febabb1f am: e64c931b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: Ied86d5c3d0570a1dcaf5345da662dada603258b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:58:57 +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
YK Hung
ec9d0e6dd8 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18 am: 5accce3e05 am: e267d7c17d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: I6cc8dc6f974ffa8143cd35dd953419a1b34f7969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:58:43 +00:00
YK Hung
1c7c008cc7 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18 am: f623e0a8d3 am: eab6352317 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: I87e0eccec3a24a60fdf73f395c2598ee1d5a15d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:58:26 +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
3e01dd0296 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: Id1974b8956c55a506dd0e3d8da6b65fe861de96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:43:45 +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