Commit Graph

47847 Commits

Author SHA1 Message Date
Neil Fuller
811d817368 Merge "Use ICU APIs not impl types" 2018-10-02 12:59:47 +00:00
Neil Fuller
28fe954075 Avoid deprecated PrivateKeyInfo.getAlgorithmId()
Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.

Bug: 113148576
Test: build only / inspection
Merged-In: Iab2d3b23ad969f683d716cb981e32fd554c67a81
Change-Id: I9ed5c96a20d6749bf75212c0fd820d71ca0a6053
2018-10-02 12:29:06 +00:00
Neil Fuller
b81181b9f3 Avoid deprecated PrivateKeyInfo.getAlgorithmId()
Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.

Bug: 113148576
Test: build only / inspection
Change-Id: Iab2d3b23ad969f683d716cb981e32fd554c67a81
2018-10-02 13:27:44 +01:00
Stanley Tng
aa8f8fb414 [automerger skipped] Merge changes from topic "hearing-aid" into pi-dev am: f9658e13bb
am: 8b05337e6a  -s ours

Change-Id: I87aff99bdb01b20cee9ff877edecbec3077aa5c4
2018-10-02 04:22:19 -07:00
timhypeng
8019f9089c [automerger skipped] To show hearing aids device in the available devices group am: 79d7fdc4f3
am: 6443247f8f  -s ours

Change-Id: If899bc3294def4a4128789938a8ff306f95257a3
2018-10-02 04:21:34 -07:00
Stanley Tng
8b05337e6a Merge changes from topic "hearing-aid" into pi-dev
am: f9658e13bb

Change-Id: Ibdf40cc0a1712292fd41c1e38bbf879cfe3c4a65
2018-10-02 03:54:35 -07:00
timhypeng
6443247f8f To show hearing aids device in the available devices group
am: 79d7fdc4f3

Change-Id: Ie4e4014c98701d69e20f0f9244e57b5293e07f15
2018-10-02 03:53:36 -07:00
Neil Fuller
11be3acfe0 Use ICU APIs not impl types
It's possible to use BasicTimeZone in place of OlsonTimeZone.
Although neither are currently public SDK APIs the BasicTimeZone
is preferable.

Bug: 113148576
Test: build
Change-Id: I745b17feee678ecd053fadc6c447107fa80918e8
2018-10-02 10:15:36 +01:00
Raff Tsai
3936e9f3d6 Add SettingsContextualCardProvider
- provide contextual cards for SettingsIntelligence
- add contextualcards libs

Fixes: 116837093
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage.contextualcards"

Change-Id: I873e77fa43e9a8f6056be1f583b1910002efbd2e
2018-10-02 15:04:58 +08:00
TreeHugger Robot
ab7dba0d97 Merge "Support phone number in Settings slices" 2018-10-02 02:43:17 +00:00
Kevin Chyn
71614a1023 Merge "Do PackageManager check before getting system service" 2018-10-02 02:08:56 +00:00
TreeHugger Robot
3e5a0a0fa9 Merge "Extend limitation of A2DP HW offload related string." 2018-10-02 02:05:41 +00:00
Stanley Tng
69e1bb1cf3 Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Bug: 116725094
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.

Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-02 00:55:19 +00:00
TreeHugger Robot
f9658e13bb Merge changes from topic "hearing-aid" into pi-dev
* changes:
  Add Feature Flag for Hearing Aid Profile
  To show hearing aids device in the available devices group
2018-10-02 00:53:40 +00:00
Kevin Chyn
d15bcdeb60 Do PackageManager check before getting system service
Fixes: 117074737

Test: Does not crash
Change-Id: I51b04f46f8d467c3a854c132415a2cad90b77203
2018-10-01 17:50:09 -07:00
TreeHugger Robot
bf9562b21b Merge "Do not resolve permission in settings." 2018-10-01 22:00:30 +00:00
Doris Ling
6548d21839 Merge "Add version 2 of AppDataUsagePreferenceController." 2018-10-01 21:46:08 +00:00
TreeHugger Robot
4da85f6af3 Merge "Use BidiFormatter in ZenDeleteRuleDialog" 2018-10-01 21:16:02 +00:00
TreeHugger Robot
1161052e70 Merge "Application accepts null intents causing a crash" 2018-10-01 21:11:56 +00:00
Philip P. Moltmann
cf809c34b7 Do not resolve permission in settings.
Settings already uses the RuntimePermissionPresenter to resolve
permissions for an app. This code must be the previous implementation.

It can be removed without any issues.

Test: Built
Change-Id: Ie1375de1e23f4c9bb882a13ef7ade9adc543c82a
2018-10-01 13:48:43 -07:00
Beverly
5fbdeaae7c Use BidiFormatter in ZenDeleteRuleDialog
Test: visual inspection
Change-Id: I99231ed5801f3286421f331554fc5c51c2a2d08c
Fixes: 35960612
2018-10-01 14:47:28 -04:00
Doris Ling
863c60ffcf Add version 2 of AppDataUsagePreferenceController.
- a simple copy of AppDataUsagePreferenceController to
AppDataUsagePreferenceControllerV2, so that future modification can
be compared more easily.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ibeed7775a223794bf50f36b3b933e270a55e3b39
2018-10-01 11:47:21 -07:00
Raff Tsai
af9eb2d7a7 Application accepts null intents causing a crash
Change-Id: Ia7f98f43567f25ae7abc6e5ac7e07323e75d9047
Fixes: 116869239
Test: adb shell am start -n com.android.settings/com.android.settings.Settings\\\$ApnEditorActivity
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.network"
2018-10-02 02:04:41 +08:00
Fan Zhang
3600c03392 Merge "Support some phone information in Settings slice" 2018-10-01 16:46:19 +00:00
Fan Zhang
f9f6200b28 Merge "Remove FragmentUtilsTest class" 2018-10-01 16:45:19 +00:00
Chienyuan
92dce91968 Extend limitation of A2DP HW offload related string.
With current limitation, the UI of A2DP HW offload can't be
display in some language, e.g., Arabic (ar) and Hindi (hi).

Bug: 80149220
Bug: 80164750
Bug: 80149375
Test: build pass
Change-Id: I95f6b4b21201bb466260b71f238b9c6b700bc850
2018-10-01 12:55:34 +00:00
Irina Dumitrescu
e9c8a0f264 Settings change for device-wide unknown sources block.
Update the "Install unknown apps" preferences to display the option is
disabled if the global user restriction for unknown apps is turned on.

Test: Manual test, disallowing installs in TestDPC disables installing
unknown sources apps. Also:
atest packages/apps/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
Bug: 111335021
Change-Id: I235e5fd110e296ed43aa89d7a5ec0d48470c4023
2018-10-01 12:15:00 +01:00
tmfang
e402cb2744 Support phone number in Settings slices
- Let controller of phoner number extends BasePreferenceController,
so it can be supported showing slice view by SettingsSliceProvider.

Test: make RunSettingsRoboTests
Bug: 74900516
Change-Id: Id98e6aac981025159a0530c6e0709ba0f2ebcd15
2018-10-01 11:15:02 +08:00
tmfang
4f40a8e287 Support some phone information in Settings slice
- Android version
- Device model

Test: robo test, manual test
Change-Id: Ic047caaf4ab699082f6420ad8fa1d2f455abfcb0
Fixes: 74900516
2018-10-01 10:38:21 +08:00
Bill Yi
81e2d88c93 [automerger skipped] Import translations. DO NOT MERGE am: 0b7858e7d9 -s ours
am: 9369f59131  -s ours

Change-Id: Ibf293a087017e09941ccbf5967e3689a27ce44bc
2018-09-29 16:30:44 -07:00
Bill Yi
9369f59131 [automerger skipped] Import translations. DO NOT MERGE
am: 0b7858e7d9  -s ours

Change-Id: Ia903bff0e22b013664c0086dc11fdd5e3d8d8b50
2018-09-29 16:23:42 -07:00
TreeHugger Robot
1aef680511 Merge "Import translations. DO NOT MERGE" 2018-09-29 21:32:19 +00:00
Bill Yi
0b7858e7d9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
2018-09-29 14:09:31 -07:00
Bill Yi
d1bfe2311f Import translations. DO NOT MERGE
Change-Id: Ifda79e0492153a90fbb894757ffd9d8f7c8b7ac0
Auto-generated-cl: translation import
2018-09-29 13:00:15 -07:00
Lucas Dupin
3b686f77c4 Merge "Wake screen gesture" 2018-09-29 17:32:30 +00:00
TreeHugger Robot
c3d1d33683 Merge "Move search resources to settingslib-search" 2018-09-29 02:46:36 +00:00
TreeHugger Robot
16375fc150 Merge "Rename NetworkCycleData to NetworkCycleChartData." 2018-09-29 01:14:24 +00:00
Doris Ling
4a99c36572 Rename NetworkCycleData to NetworkCycleChartData.
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I47c1bbe09f11f4d0bd0d41c1f9d4c3e5a3773f05
2018-09-28 16:40:38 -07:00
Fan Zhang
6acbc9337e Move search resources to settingslib-search
Bug: 113128828
Test: manual
Change-Id: I2c513dd22e84d5f86bd282e10d0b0df19f9ce407
2018-09-28 16:38:23 -07:00
Lucas Dupin
8e57afb2cb Wake screen gesture
Settings page for gesture that allows the display to wake up.
Can be configured via overlays using config_dozeWakeScreenSensorType

Bug: 111414690
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGestureSettingsTest
Change-Id: Ic44f0ee9e781bda3b06cf4896217b324b9e3606c
2018-09-28 16:25:47 -07:00
TreeHugger Robot
dac739de2a Merge changes from topic "angle_integration4"
* changes:
  Add ANGLE enable to Developer Options
  Allow AppPicker to filter only non-system apps
2018-09-28 23:12:30 +00:00
TreeHugger Robot
f53f814be0 Merge "Create the default static cards for Contextual Settings Homepage" 2018-09-28 22:40:38 +00:00
Lucas Dupin
02fe52963a Merge "Renaming gesture" 2018-09-28 22:00:56 +00:00
Mill Chen
623eb5a904 Create the default static cards for Contextual Settings Homepage
Adding three default ContextualCard data to CardContentProvider, in case
of empty database or no SettingsIntelligence, to keep Contextual
Settings Homepage working well.

Bug: 113372471
Test: visual, atest SettingsHomepageActivityTest
Change-Id: Id7b26818e10f7945b2618100901310a005d8cc0d
2018-09-28 14:23:14 -07:00
Lucas Dupin
ade9180e7b Renaming gesture
Bug: 111414690
Test: manual
Test: ReachGesturePreferenceControllerTest, ReachGestureSettingsTest
Change-Id: I34cd4aacabc912122c553bf9c955a8ca4494230b
2018-09-28 12:53:12 -07:00
Jordan Liu
6fd429f388 [automerger skipped] Merge "Refresh subscription info when subid changes" into pi-dev am: c07bb01f75
am: ff1e05840f  -s ours

Change-Id: I3ba9aad5f375c1b1c8c9e0ab37a687336ac2b6b2
2018-09-28 12:25:48 -07:00
Jordan Liu
ff1e05840f Merge "Refresh subscription info when subid changes" into pi-dev
am: c07bb01f75

Change-Id: I955728bbde5ea462ebce0dc2099ccfd965862727
2018-09-28 12:17:49 -07:00
TreeHugger Robot
c07bb01f75 Merge "Refresh subscription info when subid changes" into pi-dev 2018-09-28 19:00:35 +00:00
Doris Ling
5d397194ec Merge "Add version 2 of AppDataUsage." 2018-09-28 17:33:07 +00:00
TreeHugger Robot
cc9ffafb80 Merge "Remove custom Robolectric util class." 2018-09-28 16:18:28 +00:00