Commit Graph

57149 Commits

Author SHA1 Message Date
Bonian Chen
6c25c29464 [Settings] Fix test case
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
2019-11-25 22:28:22 +08:00
Bonian Chen
8efd95c413 Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
am: d7f0fb6cc1

Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Raff Tsai
056e99b053 Merge "Remove unused string" 2019-11-25 13:09:34 +00:00
Alan Stokes
3596aeeca7 Merge "Stop relying on PACKAGE_VERIFIER_ENABLE." 2019-11-25 11:27:51 +00:00
TreeHugger Robot
fbc8bbf870 Merge "Fix crash while lauching location settings" 2019-11-25 10:10:49 +00:00
TreeHugger Robot
901ba391d3 Merge "[Wi-Fi] Fix unit test fails" 2019-11-25 08:33:35 +00:00
Tsung-Mao Fang
9c8a1b0db9 Fix crash while lauching location settings
Use a regular drawable icon instead.

Change-Id: I53e437c8f68eed1ea64e6fed30c1823c7807d0bf
Fix: 144578394
Test: Rebuild
2019-11-25 16:09:00 +08:00
Arc Wang
0614a7d1ea [Wi-Fi] Fix unit test fails
Bug: 144405885
Test: WifiSettingsTest
      WifiSettings2Test
      WifiDetailPreferenceControllerTest
      WifiDetailPreferenceController2Test

Change-Id: Ib6a34364c3eb47d59a153f07e31c9cddddcf1f8a
2019-11-25 14:46:03 +08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
Raff Tsai
2229585e88 Refactor LocationSettings
- Extends BasePreferenceController in LocationBasePreferenceController
which binds preference key based on xml file instead of writing the key
in java code. Then the controller can be used in many xmls.
- Modify LocationServicePreferenceController to support only personal or
profile user.

Bug: 141601408
Test: manual, robolectric
Change-Id: I51ee950dfb87474df84a8dc3db55fb911edcf599
2019-11-25 13:11:12 +08:00
TreeHugger Robot
a6198c25be Merge "Adjust lock screen tests" 2019-11-25 03:29:24 +00:00
Bonian Chen
95e1c8d099 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 2019-11-25 03:07:16 +00:00
Jason Chiu
bfbb0181a3 Merge "[Settings] Support master switch of inline toggle of Settings Injection v2" 2019-11-25 02:36:09 +00:00
Lucas Dupin
b5c17fb361 Adjust lock screen tests
Lock screen dashboard is now always visible, and tests should reflect
the new behavior.

Fixes: 144899234
Test: treehugger
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockScreenPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenDashboardFragmentTest
Change-Id: Ia1cd79c5d8f6ea74525f6afdea900c230806fd88
2019-11-24 16:34:25 -08:00
Bonian Chen
a6e7aa1237 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours am: 88594b8bf7 -s ours
am: 3f413f1a17 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 7a4c679790 is in history

Change-Id: I813e25cef095719329e73b1b24fbccbbc060c875
2019-11-24 05:22:28 -08:00
Hai Shalom
36a13b3714 [automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 775106e40d
am: 59185d0931 -s ours
am skip reason: change_id I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f with SHA1 979b95777a is in history

Change-Id: I982ca7c43ce8683d3139a8960aefd4e520bebd57
2019-11-24 04:57:25 -08:00
Preston O'Neal
a8ebfe6d75 Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev am: a3e26f10f2
am: 1a67e3048e

Change-Id: Ice680ada896b5b0d954e7e4b0c6318a9adfd23d0
2019-11-24 04:57:03 -08:00
Jay Aliomer
1d69613ac1 Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev am: 48f4e5722e
am: 29c4d02b92

Change-Id: I6b79b52853605052e08aa744d8f612a2c35d0eba
2019-11-24 04:56:47 -08:00
Jay Aliomer
0c5b37d602 [automerger skipped] Add settings for scheduling dark theme am: 7141b142df
am: 204b82e2e7 -s ours
am skip reason: SHA1 204b82e2e7 skipped by user beverlyt

Change-Id: If99426f192005bc1d1a7a430aa6d3c9ef14b8f61
2019-11-24 04:50:16 -08:00
Bill Yi
5dd4272ee4 Import translations. DO NOT MERGE
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
2019-11-24 04:38:04 -08:00
Jay Aliomer
c2302a3d93 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
am: 26ce6885c9

Change-Id: If216838715772b9d45624e77213ec81f0c84bd60
2019-11-22 14:42:52 -08:00
Jay Aliomer
26ce6885c9 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev 2019-11-22 22:29:43 +00:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
2019-11-22 20:58:23 +00:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Bill Yi
40785974b5 Merge "Import translations. DO NOT MERGE" 2019-11-22 20:33:46 +00:00
Bill Yi
0014dd2d63 [automerger skipped] Import translations. DO NOT MERGE
am: adfc51a550 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieddaa832f55b0414da39936c058b95c31d7b3aca
2019-11-22 12:05:37 -08:00
Jay Aliomer
abf06340cb Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In:  I3094b655c04f59c23a95162a1be5ee8260e28a48
2019-11-22 19:15:12 +00:00
Bill Yi
adfc51a550 Import translations. DO NOT MERGE
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
2019-11-22 10:44:01 -08:00
Bill Yi
e3655b3a78 Import translations. DO NOT MERGE
Change-Id: Ic2795d74051ea90315a4e74a3de2ef73af8ee049
Auto-generated-cl: translation import
2019-11-22 09:28:51 -08:00
Alan Stokes
2afeb5f43f Stop relying on PACKAGE_VERIFIER_ENABLE.
This setting is being removed, and it no longer controls whether a
package verifier will be invoked. (Each verifier may have its own
controls, but they are outside the framework.)

Test: atest VerifyAppsOverUsbPreferenceControllerTest
Bug: 135751498
Change-Id: I78029c3529f331a88fde42a7aac5c155954f825e
2019-11-22 14:39:01 +00:00
Andrei-Valentin Onea
555425a990 Merge "Add compatibility change preference" am: 0e7b8f7a93
am: 5f2ee93a4b

Change-Id: I04714e52df6c5e967af744d584f5d2db38cb5680
2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b Merge "Add compatibility change preference"
am: 0e7b8f7a93

Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
2019-11-22 06:06:39 -08:00
Raff Tsai
6c45ef5328 Merge "Fix navigation to wrong page" 2019-11-22 13:10:19 +00:00
Andrei-Valentin Onea
0e7b8f7a93 Merge "Add compatibility change preference" 2019-11-22 13:02:45 +00:00
Goven Liu
a9ba39fb16 Merge "[Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature." 2019-11-22 11:21:07 +00:00
Raff Tsai
be39426d08 Fix navigation to wrong page
- Copies fragment argument and pass it to child fragments

Fixes: 144949171
Test: manual
Change-Id: I301d84535d40ad711e0e64d260c3d0d3a98c0314
2019-11-22 17:49:21 +08:00
Bonian Chen
3f413f1a17 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours
am: 88594b8bf7 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: I62b7db5b6b08a48b90c3a23f1d72cb97f36a085f
2019-11-22 01:16:57 -08:00
Bonian Chen
88594b8bf7 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge"
am: 56385ed9f8 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd
2019-11-22 01:13:28 -08:00
Bonian Chen
56385ed9f8 Merge "[Settings] Fix conflict of AOSP merge" 2019-11-22 09:05:29 +00:00
govenliu
d507b56ad1 [Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature.
Add following changes:
1. Add intent receiver.
2. Add panel UI with icon, title, summary.
3. Add two buttons (save and cancel).
4. Add test case for activity and fragment

Bug: 136472483
Test: Add following test cases for checking button and package name in activity and fragment.
      1. AddAppNetworksActivityTest
      2. AddAppNetworksFragmentTest
Change-Id: I5515a96fa3feb0e3e6d68159b2c0dec0894c15ee
2019-11-22 17:02:59 +08:00
Raff Tsai
2037d57405 Change string character limit
Fixes: 129708436
Test: build pass
Change-Id: I50d6a696bcc6a9b88491af1369cc942510238b73
2019-11-22 13:10:41 +08:00
Jason Chiu
10e675d6b5 [Settings] Support master switch of inline toggle of Settings Injection v2
Allow developers to inject MasterSwitchPreference, a switch
preference with two tap targets, to Settings page.

Developers should declare keyhint and switch_uri for the activity
in AndroidManifest,and then implement a SwitchesProvider.

Bug: 132808482
Test: robotest
Change-Id: I64cdf18268be0cfcd38aab2c059144536dd79b32
2019-11-22 04:04:04 +00:00
Hai Shalom
59185d0931 Merge "Revert submission" into qt-qpr1-dev
am: 775106e40d

Change-Id: I90ea8783da54caf1f3e140b7eb768129d8332f61
2019-11-21 19:57:51 -08:00
Hai Shalom
775106e40d Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:02 +00:00
Bonian Chen
821a1259e7 [Settings] Fix conflict of AOSP merge
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
2019-11-22 02:36:11 +00:00
TreeHugger Robot
d7ba70ee54 Merge "Revert submission" 2019-11-22 01:42:21 +00:00
TreeHugger Robot
632958cfb0 Merge "Remove DEVICE_OUT_ALL_SCO." 2019-11-22 00:52:24 +00:00
Hai Shalom
40e7c05e53 Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
2019-11-21 23:09:22 +00:00
Preston O'Neal
1a67e3048e Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
am: a3e26f10f2

Change-Id: I3ab3f5c219789a2b48d90607c17188e634e0c448
2019-11-21 15:01:23 -08:00