PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,219 Commits 1 Branch 0 Tags
465b1caed381befefdfd3032c0deb45c81de2bcd
Commit Graph

92219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a4af82718c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp am: 70b22b2b94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f03033a230035446845b895597ca1871b29ec47
 2021-07-07 18:15:44 +00:00
TreeHugger Robot
315aa32e38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 20cab601c9 -s ours am: 44b8d2022e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e037030a810bbe76340765dca2068239de1816f
 2021-07-07 18:14:52 +00:00
Automerger Merge Worker
70b22b2b94 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp 2021-07-07 17:56:46 +00:00
TreeHugger Robot
f2b4dbf29e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662fd17708384107c65a2402f9ad0c65c5ac10c6
 2021-07-07 17:56:42 +00:00
TreeHugger Robot
44b8d2022e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 20cab601c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95d430d8b1cdc25672374cebc59b889d6b5f8fbe
 2021-07-07 17:56:40 +00:00
TreeHugger Robot
55067965c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 44ae675db1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cd265dfd9028794397b190468dad91f131c98ec
 2021-07-07 17:51:39 +00:00
TreeHugger Robot
20cab601c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9d29403c7efa123b5040bd7e83565463eee25b9
 2021-07-07 17:38:03 +00:00
TreeHugger Robot
798d6c5df4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51f5acdf164503eb543183299dc235e26a9e5c8e
 2021-07-07 17:36:56 +00:00
TreeHugger Robot
44ae675db1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2df4befebd851e5c14d24c1b9f0d00a684555671
 2021-07-07 17:36:47 +00:00
Guojing Yuan
d91fc88b4b Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: fbce4ec0e8 am: 0cf54d33f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I65cdc4cd5adf80b412c1f07a345b366c85709496
 2021-07-07 17:27:29 +00:00
TreeHugger Robot
b65883e22f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-07 17:25:11 +00:00
Guojing Yuan
0cf54d33f2 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: fbce4ec0e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Id7b35be4f8a8713afa551723302fb35a097bebf9
 2021-07-07 17:24:05 +00:00
Guojing Yuan
93f5e31873 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e4b60e48de am: 785acda6d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I74a48f7f1e2a890cb7aff9681ab9cef860e1c0ea
 2021-07-07 17:23:56 +00:00
Guojing Yuan
785acda6d8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e4b60e48de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I966d7f664c72a5ce5234bcf7426afe38fa3d7795
 2021-07-07 17:15:08 +00:00
Guojing Yuan
c042096214 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e28bdeaf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I16e0f9566e32a4b3e6e42e92ca66ad7b98fa142d
 2021-07-07 17:14:17 +00:00
Guojing Yuan
fbce4ec0e8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ic31e9b879e36f0a84c0b735015f8dd93207549ff
 2021-07-07 17:01:30 +00:00
Guojing Yuan
e28bdeaf85 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I5881acc04a189a0fe2de7dcf2532a706fa0966b2
 2021-07-07 17:00:45 +00:00
Guojing Yuan
e4b60e48de Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ia1d8ab6f0fd5e71545bccb67985a9186adb29ef0
 2021-07-07 17:00:39 +00:00
Guojing Yuan
40dc9d519f Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev 2021-07-07 16:50:01 +00:00
ykhung
70304cff07 Add new method to get URI to monitor battery history data is updated 
we will reload the database battery history data if its content is changed, which can be done through monitored the database content observer (a part of this patch cl/383366685)

Bug: 192613268
Test: make SettingsRoboTests
Change-Id: I24ab154b1dfa00ca4bf4e6f7b308f5061578bcb5
 2021-07-07 16:22:37 +00:00
Bonian Chen
4c2dfa26e3 [Settings] Correct some typo 
Bug: 193026761
Test: build pass
Change-Id: Ic710c84e5aca093381c5e06d4f6e987cf6f729a7
 2021-07-07 23:44:04 +08:00
Bill Yi
a9f95702cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f1183b81613d68b64ae7069a571150a634ceead
 2021-07-07 15:24:28 +00:00
Marie Matheson
d488fa4147 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 7ec590a5a1 am: 1d0ed65b74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I183ecf26980465d263a03057dbeca14c29168798
 2021-07-07 12:14:36 +00:00
Marie Matheson
9527cc88e4 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 5023e5613b am: 701bd282da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I5a94388fe863fa2558ff3af3fc71f4dcbd8e78d6
 2021-07-07 12:14:23 +00:00
Marie Matheson
1d0ed65b74 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 7ec590a5a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I3be513c16a88c1cdfaa596f9963bdbcabac27f92
 2021-07-07 11:57:09 +00:00
Marie Matheson
701bd282da Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 5023e5613b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ie1750933714536ce74a3ad79ed4c40e6268d6650
 2021-07-07 11:56:45 +00:00
Marie Matheson
6d2b782514 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 8b8ddb89e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ic3abb93f3e2bdce1bb04dcb806b49c3233c07665
 2021-07-07 11:55:55 +00:00
Marie Matheson
5023e5613b Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: If2147c505c13263f6799d250d70cc437ff0a1c95
 2021-07-07 11:40:14 +00:00
Marie Matheson
8b8ddb89e6 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ibb671b4ef501681f80aa9fafee7b02716b269179
 2021-07-07 11:39:21 +00:00
Marie Matheson
7ec590a5a1 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
 2021-07-07 11:39:18 +00:00
Marie Matheson
67c5c5a58e Merge "Move work profile security settings to bottom of list" into sc-dev 2021-07-07 11:29:22 +00:00
Edgar Wang
2a9ab203aa Adjust Seekbar layout to improve scroll ability 
Fixes: 192362148
Test: visual verify
Change-Id: I0cfc7383c224846885ce9610e25364a964d78410
 2021-07-07 18:11:34 +08:00
Bonian Chen
a229b29737 Merge "[Settings] Settings within each SIM not been displayed to the user" 2021-07-07 09:03:45 +00:00
Marie Matheson
aeafb02074 Move work profile security settings to bottom of list 
Bug: 192540530
Test: atest SettingsUnitTests
Test: make -j80 RunSettingsRoboTests
Test: Tested manually with and without work profile
Change-Id: I29f43202f71388c991948953c3d2c955fd32627e
 2021-07-07 09:02:32 +00:00
Rubin Xu
536a3d1be4 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 91f11c9733 am: 84dda30120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I527a9296982417be35d1fb45337f3101219e3dd7
 2021-07-07 08:13:19 +00:00
Rubin Xu
4c3af5c566 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 973b5cf127 am: efe2e53ba4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I0b60eca820cb01c63f673250ac5e17c02d321dd8
 2021-07-07 08:13:13 +00:00
Rubin Xu
84dda30120 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 91f11c9733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I9583444f4c94d25e28185179fd008c8db41f35f7
 2021-07-07 08:07:07 +00:00
Rubin Xu
efe2e53ba4 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 973b5cf127 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I31e4dbb192e3a78a9deb137700979b5a78ddc8cf
 2021-07-07 07:58:55 +00:00
Rubin Xu
0efe3ae03d Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 841a92e9dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I5ce115f3a382c7d53cbf8168e1c39ad3eb978618
 2021-07-07 07:58:07 +00:00
Rubin Xu
91f11c9733 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I3da274cfa41a19528df5f736093abf1f17995e8d
 2021-07-07 07:50:37 +00:00
Rubin Xu
973b5cf127 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I7dba6fecb8246296a02d38e27316e9256a9cd8c1
 2021-07-07 07:49:43 +00:00
Rubin Xu
841a92e9dc Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I7d5f0798ef53751be363f2d8df44b14a8c7a3d7c
 2021-07-07 07:49:42 +00:00
Peter_Liang
53bae52e65 Update the preview image of caption preference fragment. 
Bug: 192432531
Test: manual test
Change-Id: I5d8960821d5411af39035da4b77fadd9a7b9c26d
 2021-07-07 15:49:34 +08:00
SongFerngWang
193f97c7ba Network selection add NGRAN when device support SA 
Bug: 187148937
Test: build pass.
atest NetworkScanHelperTest (pass)

Change-Id: I1ed3eae3bda39eb702bc135b0c698f8df7c280d7
 2021-07-07 15:36:42 +08:00
Rubin Xu
3e84dd2783 Merge "Delay gargabe collection during onDestroy()" into sc-dev 2021-07-07 07:29:06 +00:00
Linus Tufvesson
c96f60e0cb Merge "Make WifiDppEnrolleeActivity launches explicit" 2021-07-07 07:18:59 +00:00
Bonian Chen
8e3ff612d2 Merge "[Settings] Hide subscriptions not existed within device" 2021-07-07 07:03:10 +00:00
Bonian Chen
75f1450bbf [Settings] Hide subscriptions not existed within device 
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.

Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.

Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
 2021-07-07 07:02:55 +00:00
Weng Su
62560c7210 Hide the entire progress header in Internet Settings 
- Hide the entire progress header to avoid showing the divider

Bug: 191968967
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I59db1c87f1088ac2d29e263a85f149ff866c435b
 2021-07-07 14:19:28 +08:00
Pyuli Naithani
c9dfa59d7c Add stats log for sensor privacy. 
Test: statsd_testdrive 381

BUG: 192269258

Change-Id: I69e766b789b4b4a6ca0ad26b3a312baca3dbccd2
 2021-07-07 05:26:51 +00:00