PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,865 Commits 1 Branch 0 Tags
ecb9abf8fc398f688d45ed9fe08444380dd881e6
Commit Graph

11398 Commits

Author SHA1 Message Date
Blake Kragten
aea24e652a Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ib24274b8006238992cbaea5701e799a392b2edc3
 2020-07-29 23:45:51 +00:00
Blake Kragten
9efa2b85f0 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I00117ec751f2e097e11dca61c9bb25e37e6b3016
 2020-07-29 23:27:51 +00:00
Treehugger Robot
033bbb2df6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 am: 2d6884929e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I309ee3bbc1e950f0a77099da008a0660c4c602d6
 2020-07-29 07:01:28 +00:00
Treehugger Robot
2d6884929e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If5c1b0a191bd1695f73c20eb7a6bb535cd8d7217
 2020-07-29 06:46:24 +00:00
Treehugger Robot
0dd2798bf6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I72db12567fbe5febdb09e67535904ad82925484d
 2020-07-29 06:28:35 +00:00
Treehugger Robot
2c5a28bb2d Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:51:09 +00:00
Treehugger Robot
78399afc0f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 am: 0093ecd57f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I0f68a475fcfc214b4b8b39a0f80fe8fd99558879
 2020-07-29 03:25:37 +00:00
Treehugger Robot
0093ecd57f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: Ie8d9822dba24a284fb18fe6c3a167fd747bebd17
 2020-07-29 03:08:10 +00:00
Treehugger Robot
0a318adf46 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I497a616313d2f9465f9a33fc296cd26ded64c835
 2020-07-29 02:48:12 +00:00
Blake Kragten
eda0a42118 Remove Enhanced Connectivity Dev Option 
Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f
 2020-07-28 22:44:06 +00:00
Curtis Belmonte
5612e2c5c7 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
 2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
 2020-07-28 20:16:03 +00:00
Arc Wang
f420f94e7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284

Change-Id: I14788fb9f4ce105fc4f095ccd2fdd4862022bcc9
 2020-07-25 01:03:34 +00:00
Arc Wang
55bce77aea Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" 
This reverts commit ebf8ffd8fd.

Reason for revert: b/161659380

Bug: 161659380
Test: manual, observe threads after launching 'Network & internet'.
Change-Id: I28773eac40c6bf194e3410b829a1a7b744f79597
Merged-In: Id4901d632f7f4634461ebbbc096e36d348a33365
 2020-07-25 00:51:50 +00:00
Anton Hansson
0f6b2ec233 Merge "Add explicit dep on ims-common" 2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246 Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-22 14:40:27 +00:00
Treehugger Robot
81d394261d Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 am: b33b295586 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2e5ec07200ea2e2a57f87be40284753fe4ccb2cc
 2020-07-22 09:33:09 +00:00
Treehugger Robot
b33b295586 Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I474c32b3800cbf5a9c48a6086655b6c5ea8953eb
 2020-07-22 09:22:13 +00:00
Treehugger Robot
7643891ae7 Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2e9fc90f247f4b088f749afeb75a0b3e67e73198
 2020-07-22 09:07:27 +00:00
Treehugger Robot
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +00:00
Anton Hansson
a8bae3391c Add explicit dep on framework-wifi.impl am: 40a8846e54 am: 668e8678aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165

Change-Id: I4e632b7d812dbe855e3bfbc89aacfeec58043eee
 2020-07-21 18:29:13 +00:00
Anton Hansson
668e8678aa Add explicit dep on framework-wifi.impl am: 40a8846e54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194165

Change-Id: I4609cf27376e2fe82540cd855a95ecf2b117d27e
 2020-07-21 18:11:38 +00:00
joffenberg
43ee102921 Remove "storage type" preference from Settings 
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.

Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
 2020-07-21 17:18:47 +02:00
Anton Hansson
784b908bbb Add explicit dep on ims-common am: d3c9df3e7e am: cf29ee30f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164

Change-Id: Id6f89d1188248c7838925df62425b53a9c3d1594
 2020-07-21 12:48:40 +00:00
Anton Hansson
cf29ee30f0 Add explicit dep on ims-common am: d3c9df3e7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12194164

Change-Id: I3e0b30e399e85cf29128062dbbe9abfb843d5f63
 2020-07-21 12:34:11 +00:00
Anton Hansson
40a8846e54 Add explicit dep on framework-wifi.impl 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: I800b434c8049121db115cff87d51e164e4529999
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
 2020-07-21 10:18:51 +01:00
Anton Hansson
d3c9df3e7e Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-21 10:18:39 +01:00
Neil Fuller
09cd543262 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 am: 11ed9a5133 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Id36b65955f7f41c8e825c9727dad5c65685f3117
 2020-07-20 15:34:06 +00:00
Neil Fuller
11ed9a5133 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ieb4ebc79685777bc660df1c3c3aa19e0216dfec3
 2020-07-20 15:21:18 +00:00
Neil Fuller
173a7e73b3 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
 2020-07-20 15:07:02 +00:00
Neil Fuller
1d45573eb2 Merge "Track core platform API change" 2020-07-20 14:39:35 +00:00
Neil Fuller
d1c4ea906f Track core platform API change 
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.

Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
 2020-07-20 11:26:14 +01:00
Julia Reynolds
c27cd002c6 Fix overlapping importance icons am: 2f8bc4954c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12171961

Change-Id: I94432f5eccbd7f9acdf6a187c4852594034431a3
 2020-07-16 18:07:59 +00:00
Julia Reynolds
2f8bc4954c Fix overlapping importance icons 
We can't re-use the same background because not
all of the buttons are the same size

Test: manual
Fixes: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
 2020-07-16 14:31:19 +00:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R 
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
 2020-07-15 15:12:06 +01:00
TreeHugger Robot
8870591ab3 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: I3a2a93b4cc2f0e5630f51635cc9313845bb05015
 2020-07-13 23:46:24 +00:00
Julia Reynolds
2700b83c48 Restore original importance when unblocking notif channel 
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328)
 2020-07-13 20:13:43 +00:00
Lucas Dupin
162d505e14 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Iebc0844230afdb44868f4f1a6245808aee291dfb
 2020-07-13 17:13:42 +00:00
Lucas Dupin
03edb83f56 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
 2020-07-13 16:55:39 +00:00
Lucas Dupin
91ba077612 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Ie6859a17ba1f1d420f231ba6d9385a48ce442923
 2020-07-13 16:55:38 +00:00
Lucas Dupin
9b01b8510a Merge "Delete media feature flag" into rvc-dev 2020-07-13 16:44:15 +00:00
Lucas Dupin
42219fb395 Delete media feature flag 
The feature will always be available, even for users who disabled it
on Beta 1.

Bug: 160826507
Test: manual
Test: MediaControlsParentPreferenceControllerTest
Test: MediaControlsPreferenceControllerTest
Change-Id: Ia2835e7c8156d753a8f8fbf248f2509003309fd2
 2020-07-09 11:57:27 -07:00
Zhen Zhang
29433c163d Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: If6b249b1a028de832228c146982e4397addac95c
 2020-07-06 19:17:26 +00:00
Zhen Zhang
07edb930c2 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I375e6de0cfa3c6c0e2cbc0110194352885379e72
 2020-07-06 19:04:54 +00:00
Zhen Zhang
c570eb8c9a Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I5b0fbdb7f52f6570f273bc4510cd0fdecf2f7a63
 2020-07-06 19:04:48 +00:00
vichang
56a24f9ac1 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8d99d5ce1a84db343dac195a38c47041b7bf66f3
 2020-07-02 11:03:47 +00:00
vichang
bc7f639e15 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
 2020-07-02 10:50:06 +00:00
vichang
268371c44e Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
Zhen Zhang
222be02b34 Fix bug: "Hotspot & Tethering" preference doesn't get updated 
Aissign the value of mPrefrence when displayPrefrence() being called.
This can fix the preference doesn't get updated bug. Added test to
ensure it.

Bug: 160169699
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherPreferenceController

Change-Id: If0e7ce421cc46cff2b92837d2d07ea0ff4dc5fd9
 2020-06-30 15:11:02 -07:00
Victor Chang
b07e53c1c8 Move libcore.timezone to the i18n module - Final part 
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
 2020-06-30 14:35:09 +01:00