Commit Graph

11373 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Stanley Wang
ca05c7fabd Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I132e88d5b1cb22db5042c0e66b6bc61ab30efcba
2020-06-30 10:41:41 +00:00
Stanley Wang
db0687c447 Remove the prefix "Model:" from the summary of hardware.
Fixes: 159529327
Test: run robotest and observe the UI
Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27
2020-06-30 16:45:47 +08:00
Treehugger Robot
d1051792b1 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
2020-06-29 15:01:17 +00:00
Treehugger Robot
3947998755 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
2020-06-29 14:39:26 +00:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
TreeHugger Robot
adb65f0f4e Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I21d2303110af212bceed2855e671aec1e394f166
2020-06-24 13:01:18 +00:00
TreeHugger Robot
821d3a21f1 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I9ef98879c2581fbe8bf0c466a43ebe6602e3ed7f
2020-06-24 12:43:25 +00:00
TreeHugger Robot
35d0304067 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I91ffd5a10cf3b583d8a645951550a11e49891366
2020-06-24 12:43:23 +00:00
TreeHugger Robot
6f4aa6e5e0 Merge "Fix the Night Light page UI shrinking" into rvc-dev 2020-06-24 12:24:02 +00:00
Sunny Shao
8d74809e96 Fix the Night Light page UI shrinking
- This problem causes the TwilightLocationPreferenceController too late
  to decide the preference display or not.
- Move the display criteria into the getAvailabilityStatus

Fixes: 159032276
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Test: manual review
Change-Id: I5850479e8a891f837c0e6772ad1096e702f95e34
2020-06-24 12:22:59 +00:00
TreeHugger Robot
0b04a19565 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
2020-06-24 06:08:49 +00:00
TreeHugger Robot
2309e1c188 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
2020-06-24 05:52:51 +00:00
TreeHugger Robot
eadd54e1d9 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
2020-06-24 05:52:43 +00:00
TreeHugger Robot
1676454b3b Merge "Fix failed test cases" into rvc-dev 2020-06-24 05:41:14 +00:00
TreeHugger Robot
1388e13655 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Ida02e2c58f68842444371a30c777d7742b6522ad
2020-06-24 05:26:57 +00:00
TreeHugger Robot
1431d7647a Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d
2020-06-24 05:10:36 +00:00
TreeHugger Robot
3882212b26 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I48656a2ca05350bec1d304a05fbb00ff99b137d7
2020-06-24 05:10:32 +00:00
Jason Chiu
98a8640de2 Fix failed test cases
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
2020-06-24 10:55:31 +08:00
Hugh Chen
336ff700a2 Fix com.android.settings.media test case fail
Bug: 159760643
Test: make -j42 RunSettingsRoboTests
Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574
2020-06-24 10:54:43 +08:00
Stanley Wang
69eaf216eb Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc am: b1895fc072
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297

Change-Id: I06655ae21068d4f9bd0f9430e88be8b3a69eacf9
2020-06-22 10:50:39 +00:00
Stanley Wang
7c0f60f24e Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297

Change-Id: I2f29322ed4c14d9ed093777d330e9df7b364feb4
2020-06-22 10:38:20 +00:00
Stanley Wang
b1895fc072 Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297

Change-Id: I7bda54792d81ace1bcdee9f018fb3e5f3db0fc1b
2020-06-22 10:38:04 +00:00
Stanley Wang
7afb61e6dc Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev 2020-06-22 10:25:58 +00:00
Stanley Wang
f1a0801c00 Fix the bug of not showing lock screen before entering Smart Lock page.
Controller can't find the target preference to handle the click event.
Store the preference keys to match the clicked item.

Fixes: 158716163
Test: run robotest and manually test the click behavior

Change-Id: Ie243206ceffef013c56c4ea29c14fe56da510fb6
2020-06-22 16:49:02 +08:00