Commit Graph

56807 Commits

Author SHA1 Message Date
Joshua Mccloskey
648db67fec Merge "Updated security settings string." into qt-r1-dev
am: b7ac44e643

Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643 Merge "Updated security settings string." into qt-r1-dev 2019-09-05 19:22:29 +00:00
TreeHugger Robot
e90244ba5f Merge "Fix Battery usage page refresh issue" 2019-09-05 17:14:15 +00:00
Xin Li
d7a8e234e9 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:18 +00:00
Yanting Yang
afe788ca19 Set phone number preference unselectable
For multiple sim case, there are two or more phone number preferences in
About page. They should be grayed out because they don't have actions.

Fixes: 138263122
Test: Visual
Change-Id: I86ec37d049983c23b8990dda0e12bfadebf70d1e
2019-09-05 22:22:10 +08:00
TreeHugger Robot
8703bb99b1 Merge "Fix upper back button behavior of LocationSettingsActivity" 2019-09-05 10:34:41 +00:00
TreeHugger Robot
9ea11ac24d Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" 2019-09-05 10:09:32 +00:00
Yanting Yang
5edcc30ada Fix upper back button behavior of LocationSettingsActivity
In acrossing different apps, it should go back to previous app if user
click the upper back button on LocationSettingsActivity. So remove the
android:parentActivityName attribute of LocationSettingsActivity from
AndroidManifest.

Fixes: 140370314
Test: visual
Change-Id: I1efa750f1371a313c83844a67862d903cfe65bf6
2019-09-05 16:25:17 +08:00
Arc Wang
9db4bf7dbb [Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
Should only allow saved network UI initialization for once.

Bug: 140362368
Test: WifiConfigControllerTest
      manual:
      Manually change EAP method and other security fields for a saved
      Wi-Fi neterprise network.

Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
2019-09-05 16:07:08 +08:00
Jimmy Chen
3612d3ebc9 wifi: support OCSP in Wifi dialog for certifiate-based EAP type
Bug: 136720092
Test: tested with OCSP supported profile
Change-Id: Ieb0fec5026ea06f88d44361d0c579be2a18ed99a
2019-09-05 15:39:12 +08:00
Arc Wang
31a79feccd [Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
Should only allow saved network UI initialization for once.

Bug: 140362368
Test: WifiConfigControllerTest
      manual:
      Manually change EAP method and other security fields for a saved
      Wi-Fi neterprise network.

Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
2019-09-05 14:57:07 +08:00
Raff Tsai
577240642d Fix Battery usage page refresh issue
restartBatteryStatsLoader made a loader existed in fragment. onStart
will resume the loader. onResume registers mBatteryBroadcastReceiver
will caused the loader activated the second time. We move
restartBatteryStatsLoader to onStart can reduce the loader runs only
once.

Fixes: 140488811
Test: manual
Change-Id: I4cac574ea8e9c07c1a9df48a57fb8140d5687b21
2019-09-05 14:37:21 +08:00
cosmohsieh
98690197e6 [Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.

Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
2019-09-05 14:22:00 +08:00
Cosmo Hsieh
b2e5ebee4a Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" 2019-09-05 03:53:57 +00:00
TreeHugger Robot
eeefcb2812 Merge "Fix subtext didn't change after toggle changed" 2019-09-05 02:17:44 +00:00
Chris Tate
c6410509ce Merge "Track framework changes to crashApplication API" 2019-09-04 20:51:19 +00:00
Xin Li
7195e05dfa DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-04 13:34:43 -07:00
TreeHugger Robot
147b362be6 Merge "Remove the duplicated attribute" 2019-09-04 17:08:47 +00:00
cosmohsieh
0f2773fb78 [Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.

Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
2019-09-05 01:06:10 +08:00
Sunny Shao
5d33399101 Fix subtext didn't change after toggle changed
Add the ContentObserver to monitor the key value changed in the Settings.System.

Fixes: 140475264
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I3018498ae32fb282bc180db7864a9813a168b9c0
2019-09-04 18:24:18 +08:00
TreeHugger Robot
c63c9e2de4 Merge "Fix media switch slice doesn't display in panel" 2019-09-04 08:36:19 +00:00
Sunny Shao
728146a2fd Remove the duplicated attribute
The footerPreferenceStyle duplicated between Settings and SettingsLib. Remove the one
in the attrs.xml of the Settings.

Bug: 124129485
Test: Compilation
Change-Id: I2b5cea1ea6c7f7739e7ef3732a8ecfb96f136aa5
2019-09-04 15:47:44 +08:00
Sunny Shao
bf4349733d Clean FooterPreferenceMixin and FooterPreferenceMixinCompat
Fixes: 124129485
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.core
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.SettingsPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.bluetooth
Change-Id: I920d0de403b9c7109de0e2e53be7ed99bc8e7390
2019-09-04 13:54:19 +08:00
Raff Tsai
ad004e9beb Fix media switch slice doesn't display in panel
Fixes: 140396725
Test: manual
Change-Id: Idf0b766ce5f4316ff90a23faf3083cdee9854562
2019-09-04 11:34:23 +08:00
joshmccloskey
e02042d140 Updated security settings string.
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
2019-09-03 16:33:39 -07:00
Hyunyoung Song
9415f4d312 Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" 2019-09-03 17:30:40 +00:00
TreeHugger Robot
36910bf085 Merge "Remove the unused file" 2019-09-03 11:46:04 +00:00
Sunny Shao
b34eeffd94 Remove the unused file
Remove the unused file power_usage_details.xml.
This xml was used in the PowerUsageDetail.java but PowerUsageDetail was removed now.

Fixes: 140403988
Test: Compilation
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I11577585eb31aa6f373bef85635f2b87d1636e0c
2019-09-03 10:09:31 +00:00
TreeHugger Robot
d8a94e751e Merge "Prevent UI jank" 2019-09-03 10:06:01 +00:00
Raff Tsai
8641986401 Prevent UI jank
Move hide preference logic to getAvailabilityStatus, it can remove
the preference before onresume.

Fixes: 140366463
Test: manual, robolectric
Change-Id: Ie11b5357b1e9340b30b8f19eac60c479cdb7687e
2019-09-03 14:16:27 +08:00
Bill Yi
33d3410e3c [automerger skipped] Import translations. DO NOT MERGE am: 6cf0558c80 -s ours
am: 575d79821a -s ours
am skip reason: subject contains skip directive

Change-Id: I7d283451fd38e28016cb25fc8c683ae86b08e7a2
2019-09-02 09:21:25 -07:00
Bill Yi
575d79821a [automerger skipped] Import translations. DO NOT MERGE
am: 6cf0558c80 -s ours
am skip reason: subject contains skip directive

Change-Id: I0dd23993b72e826f8bf6ac8df3542aa7fee88595
2019-09-02 09:11:06 -07:00
Bill Yi
342026fa8c [automerger skipped] Import translations. DO NOT MERGE
am: 6cf0558c80 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e4886467395d5f362668583a56336f2a3e3da3a
2019-09-02 09:10:52 -07:00
Bill Yi
6cf0558c80 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
2019-09-01 23:17:12 -07:00
Raff Tsai
e5f89ea85d Merge "Remove useless folder" 2019-09-02 03:35:35 +00:00
TreeHugger Robot
c319a57558 Merge "Import translations. DO NOT MERGE" 2019-08-31 06:16:35 +00:00
Bill Yi
f9fb14884e Merge "[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours am: 42b697c5fa -s ours
am: 1d0a2a83f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I661b2ee8ac7f3f98d61f0d00b81b4719ebd20f23
2019-08-30 19:11:56 -07:00
Bill Yi
de7176bfd3 [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours am: a8e6569855 -s ours
am: 231f0109d4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib63369dffaebeef9736c391dbbe639a5d4aeea26
2019-08-30 19:11:23 -07:00
Android Build Merger (Role)
1d0a2a83f6 Merge "[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours am: 42b697c5fa -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-31 02:04:35 +00:00
Bill Yi
ba228ef96b [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours
am: 42b697c5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I6c9235549213d93ed0a86b85fe9833216a459e6f
2019-08-30 19:04:23 -07:00
Bill Yi
7d0a313e1c [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours
am: 42b697c5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I672f90c2d80f4a9141a31211fe5d516a377374b6
2019-08-30 19:04:21 -07:00
Bill Yi
231f0109d4 [automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours
am: a8e6569855 -s ours
am skip reason: subject contains skip directive

Change-Id: I17fb107cd6be736a43ca5acd38fc2b841dad0a70
2019-08-30 19:04:21 -07:00
Bill Yi
a8e6569855 [automerger skipped] Import translations. DO NOT MERGE
am: d595d265f0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifea9af76e490aafd88aabea7515a69de7e3e2301
2019-08-30 18:57:28 -07:00
Bill Yi
42b697c5fa [automerger skipped] Import translations. DO NOT MERGE
am: d595d265f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27
2019-08-30 18:57:26 -07:00
Bill Yi
5e72f9d28b [automerger skipped] Import translations. DO NOT MERGE am: acf9750118 -s ours
am: aa7a7428d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I1527de6687e1be738667cb2467a3f714e9f40a90
2019-08-30 18:43:35 -07:00
Bill Yi
aa7a7428d6 [automerger skipped] Import translations. DO NOT MERGE
am: acf9750118 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd28024fc52f4d01f3fecc3c69a391135290ea04
2019-08-30 18:36:39 -07:00
Bill Yi
384d1455ed [automerger skipped] Import translations. DO NOT MERGE
am: acf9750118 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d44017502a4a676a80ded624af6698cffde9fba
2019-08-30 18:36:39 -07:00
Bill Yi
67a6005f02 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0969b48cec65b4596c96c0da99714858a6923a3
2019-08-30 17:35:08 -07:00
Bill Yi
acf9750118 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
2019-08-30 17:04:50 -07:00