Commit Graph

12540 Commits

Author SHA1 Message Date
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
Kevin Chyn
2e7fc5a0d7 Merge "Update settings together with frameworks/base" 2020-07-02 02:57:48 +00:00
Kevin Chyn
4624a1ca5d Update settings together with frameworks/base
Bug: 157790417

Test: SettingsRoboTests
Change-Id: Ib99d1cc2cb3196dd7231d0b78403427467a787b2
2020-07-01 00:08:40 -07: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
fdb6ff079c Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd am: 4ff2999126
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I35c7c18c370db76bd1d82f319003cb164d9b7246
2020-06-30 11:10:44 +00: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
Kevin Chyn
74ed9014a8 Merge "Update Settings together with generateChallenge/revokeChallenge" 2020-06-30 00:41:05 +00:00
Treehugger Robot
49954a28b7 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I97b1e64a713fddd5325c716ee758c58ade66c593
2020-06-29 15:27:58 +00: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
Kevin Chyn
cbe32ed1cf Update Settings together with generateChallenge/revokeChallenge
The internal implementation of generate/revoke in system_server is now
asynchronous. To keep existing clients working, the manager classes
introduce a blocking version of the generateChallenge calls. This change
updates Settings to use the backward-compatible blocking calls.

Bug: 157790417

Test: Enroll fingerprint/face
Test: After enrollment, toggle setFeature or do subsequent enrollment
      in face/fingerprint settings
Change-Id: Ib4dfdc5f12530b938ab9b1745f5a19cd9e2eceee
2020-06-25 17:12:46 -07:00
govenliu
d9644462fa [Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case
onDestroy_quitWorkerThread in AddAppNetworksFragmentTest failed due to java.lang.IllegalStateException: no event down from INITIALIZED
Solution: Initialize fragment before calling the onDestroy API.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I80d28c6e7490a36a7ff26313d30d33b2f7d727c1
2020-06-25 19:37:12 +08:00
TreeHugger Robot
952816df60 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: adb65f0f4e am: bd06683934
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I907eeff27eb2bc685e08fa4d41e6cca73276c3ef
2020-06-24 13:33:23 +00: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
17daba9a02 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 0b04a19565 am: 59833aaddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I0ce4b7c98f7932d1b20893cca503b071eb3bb057
2020-06-24 06:34:08 +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
5c5f5bdef0 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 1388e13655 am: 5bd3b9069e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I949c89b01ebb5e72810c4325370ab4443b9728bc
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
TreeHugger Robot
6ec8c41b47 Merge "Add toggle for media resumption" 2020-06-22 15:24:29 +00:00
Stanley Wang
defbe1ad65 Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc am: b1895fc072 am: 69eaf216eb am: dc3ad75817
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297

Change-Id: Ifcdac2031c098926a3f0f3dd11aef20ca331e6f6
2020-06-22 11:14:51 +00: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
TreeHugger Robot
3ab6e990ab Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec am: f339f5a25d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: Ic02e9129f844255524ba8f9f00e3902562b68882
2020-06-22 04:24:46 +00:00
TreeHugger Robot
f339f5a25d Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: Id2c6a16fe7318f2627c309b95609eacdc453cfdb
2020-06-22 04:10:58 +00:00
TreeHugger Robot
009de48ded Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: I77d3bf02a641854f2388fd40704bc590437842e4
2020-06-22 03:54:55 +00:00
TreeHugger Robot
11018b11c1 Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: I9b287ae61c3c1d1bad877859bb8b1ee80a9421fd
2020-06-22 03:44:29 +00:00
TreeHugger Robot
2b697fac94 Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: I97fcaa6787a5f9a205e8027d3bfe9d52fa358b6a
2020-06-22 03:44:17 +00:00
TreeHugger Robot
fbabf8f251 Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev 2020-06-22 03:27:01 +00:00
Arc Wang
fb2b144413 Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment" 2020-06-21 14:25:18 +00:00
tim peng
4d956498e4 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 am: 826cd4f88f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I7caf8d437cfd45979b1e33882c38d65c4fa43f63
2020-06-20 11:05:46 +00:00