Commit Graph

56173 Commits

Author SHA1 Message Date
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
Bill Yi
d595d265f0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
2019-08-30 16:49:34 -07:00
TreeHugger Robot
aa5b3311dd Merge "Update ring volume string" 2019-08-30 23:46:35 +00:00
Bill Yi
3f03bfd208 Import translations. DO NOT MERGE
Change-Id: Ib27cc47a72efb1ae561803f95d5e955c7220ffca
Auto-generated-cl: translation import
2019-08-30 16:33:44 -07:00
Hyunyoung Song
95b8ea80ee [DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
Test: presubmit setup on source branch
Change-Id: I4ff876bd5e711e04be5148008fdaa6ef29df0cbe
2019-08-30 14:56:34 -07:00
Mady Mellor
12f25a6985 Merge "qt-r1-bubbles-dev @ build 5835883" 2019-08-30 18:11:37 +00:00
Sarah Chin
257932e044 Merge "Handle 5G meteredness in telephony framework" 2019-08-30 17:41:22 +00:00
Julia Reynolds
88a574552b Update ring volume string
Fixes: 139187359
Test: manual
Change-Id: I7bd928ffeaa4e311548aab67ca9a1b66464bd4dd
2019-08-30 11:01:54 -04:00
Sarah Chin
2136bc92fe Handle 5G meteredness in telephony framework
Edit onSubscriptionOverride method for NetworkPolicyListener

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests

Change-Id: Ided2e445d3758ebc6c4f4df63145f61f9a56f64e
2019-08-30 14:27:51 +00:00
Mady Mellor
0c47113a5b qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: If2b813f24cf5998829fe417e32179c5e8283d308
2019-08-29 17:54:26 -07:00
TreeHugger Robot
34b1e00ca7 Merge "Fix Battery page animation" 2019-08-29 03:41:25 +00:00
Raff Tsai
4b9171679a Remove useless folder
Bug: 140207811
Test: make RunSettingsRoboTests
Change-Id: Ia8283cc648b829d573f3ecd29f134701b6168b84
2019-08-29 09:58:46 +08:00
Christopher Tate
9efc5ab929 Track framework changes to crashApplication API
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
2019-08-28 16:48:04 -07:00
Jimmy Chen
7157508edc Merge "wifi: support SAE password identifier in wifi dialog" 2019-08-28 15:31:18 +00:00
TreeHugger Robot
cea963b4ab Merge "Add RoleControllerManager.isApplicationVisibleForRole()." 2019-08-28 11:19:51 +00:00
Al Sutton
b943be7e59 Merge "Adapt to refactoring of display config code in SettingsLib" 2019-08-28 08:22:53 +00:00