Commit Graph

3205 Commits

Author SHA1 Message Date
TreeHugger Robot
a15511e9c4 Merge "Preparation task for Settings Fragment Migration" 2018-07-10 05:14:25 +00:00
tmfang
464da581aa Preparation task for Settings Fragment Migration
Create some compatible files.
These files can be used for Settings Fragment Migration task.

Bug: 110259478
Test: make RunSettingsLibRoboTests -j40
Change-Id: Ib3d52e9a5f5bed5c194d429fdfa4b0d01ed07f01
2018-07-09 11:06:43 -07:00
Bill Yi
08709ccffd Import translations. DO NOT MERGE
Change-Id: I48170a5ba97fbc61a7c843032d1d8c121d843e06
Auto-generated-cl: translation import
2018-07-04 16:38:13 -07:00
Lei Yu
333c175985 Add active admin app to power white list.
So user can't restrict it in settings app.

Bug: 110337989
Test: RunSettingsLibTests
Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
2018-07-02 20:59:59 +00:00
Kurt Marcinkiewicz
df88e0d434 Merge "Fix NPE when country is absent from user's locale" 2018-06-27 23:10:55 +00:00
Pasty Chang
be57a0189b Merge "Remove TtsSpan from Ssid" 2018-06-27 05:12:43 +00:00
pastychang
a2998fc3ee Remove TtsSpan from Ssid
Telephone type span caused talkback stop to read next texture in Setupwizard wifi page. Remove it and doesn't impact previous issue ag/1468171.
New Google TTS can recognize work and doesn't only spell words.

Test: atest
Bug: b/110104543
Change-Id: I4f37a6280294446e5f33ea3620366803b6d30a4e
2018-06-27 02:45:45 +00:00
Jong Wook Kim
372c7aa00f Merge "Display "Unavailable" for default MAC" 2018-06-27 02:08:08 +00:00
Jong Wook Kim
ba7fcfd586 Display "Unavailable" for default MAC
Display "Unavailable" when the current MAC address is
"02:00:00:00:00:00" which indicates that we couldn't get the actual
device MAC address.

Bug: 110043449
Test: Unittest (make RunSettingsLibRoboTests -j40)
Change-Id: I2adab477a43262dd0067bc30b0a9ca4d35dc4298
2018-06-26 17:34:31 -07:00
Bill Yi
bb6e1ca813 Import translations. DO NOT MERGE
Change-Id: Ie12b3769f21262a65ac68f414ae32bb1960fa53a
Auto-generated-cl: translation import
2018-06-26 14:39:24 -07:00
Kurt Marcinkiewicz
81c2d33c38 Fix NPE when country is absent from user's locale
Bug: 110189628
Test: atest SettingsLibTests
Change-Id: If5f84ccc124ecd6dc6c2c125ca9d2cc1676217d9
2018-06-26 20:37:16 +00:00
arangelov
24eec2f6eb Add a metadata to control whether an external intent should be opened in
the personal profile when in a managed profile.

This change introduces the com.android.settings.profile metadata with possible values "primary_profile_only" and "all_profiles" (the default value when not specified). If an application declares this metadata with a value of "primary_profile_only", in a work profile the ProfileSelectDialog is never shown and the application is opened straight in the personal profile. If an application specifies a value of "all_profiles" or does not specify anything, the ProfileSelectDialog is shown to the user.

Test: atest frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java
Bug: 79868199
Change-Id: I82860307e5745f4c7044980225114efcdcf0c90f
2018-06-25 13:07:03 +00:00
Doris Ling
0f1dc9004e Add a method to get the total network usage.
- add a method to get the overall total network usage from all of the
network history data.

Bug: 74451774
Test: make RunSettingsLibRoboTests
Change-Id: Icf547b88bbc03c08161a1bc09941a7c31d2a96f5
2018-06-20 16:13:40 -07:00
Fan Zhang
6f6e9563b0 Remove old suggestion code.
Change-Id: I2ab9b32ea7622228b0d61b3a16f0695ab04597d7
Fixes: 110361022
Test: robotests
2018-06-18 16:28:59 -07:00
TreeHugger Robot
7fba4b21e8 Merge "Fix StringIndexOutOfBoundsException in AccessibilityUtils" 2018-06-18 18:28:19 +00:00
Fan Zhang
105908d04c Fix StringIndexOutOfBoundsException in AccessibilityUtils
The string splitter is a sigleton but the access is not thread-safe. So
now it's changed to be a local instance to avoid threading problems.

Also removed a few unused test classes as clean up.

Change-Id: Ia2b3f3058fcbb0b28afff4e3d1b29184072bf45e
Fixes: 110255579
Test: robotests
2018-06-18 10:09:23 -07:00
Colin Cross
ab91ccae91 Merge "Fix ManifestMerger issues" am: 684b5f038b am: c5e5b64b04
am: 6c40e4745d

Change-Id: Ide97a39158b8ec9310ded188fa9f75c6795fc2b5
2018-06-15 22:56:59 -07:00
Colin Cross
c5e5b64b04 Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
2018-06-15 16:59:21 -07:00
Colin Cross
6719222fb7 Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
2018-06-14 15:25:20 -07:00
TreeHugger Robot
3d5d5718f3 Merge "Remove preference_category_material_settings.xml" 2018-06-14 17:06:43 +00:00
Hansong Zhang
28963cdd45 Prevent NPE when profile is null
When CachedBluetoothDevice is checking whether it's a connected
A2DP/HFP/HearingAid device, check profile != null

Bug: 110153306
Test: robolectric
Change-Id: I094d065d29ccbfc76bad00b4a307be8f1b88ec9b
2018-06-13 12:30:17 -07:00
Antony Sargent
c5270721ba Remove preference_category_material_settings.xml
This layout was moved to the support library as a part of the work for
b/64689839, so we don't need a copy of it in SettingsLib anymore.

Bug: 110037570
Test: compile (all consumers of SettingsLib should no longer be
referencing this layout)

Change-Id: I084898a35f18427ca15c8e103af34b3e90b9a85e
2018-06-13 10:37:57 -07:00
TreeHugger Robot
5f974a17aa Merge "Dump keyguard status bar state" 2018-06-12 22:01:23 +00:00
Lucas Dupin
c510d41596 Dump keyguard status bar state
We didn't have KeyguardStatusBarView dumps in our dumpsys,
adding more info will make our lives easier in the future.

Test: adb shell dumpsys activity service com.android.systemui
Change-Id: I07af14922501889cc15005f01463674f0651dfde
Fixes: 109899206
2018-06-12 13:08:23 -07:00
timhypeng
c509a65541 Add isConnectedHearingAidDevice function to check if it supports Hearing Aid
profile

Bug: 79553082
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I2950f63c4a95d692b77cfffeacc9d1d319243e0d
2018-06-12 17:46:10 +08:00
Antony Sargent
da9ccded0a Go back to using PreferenceThemeOverlay.v14.Material
We temporarily need to go back to having
PreferenceThemeOverlay.SettingsBase inherit from
PreferenceThemeOverlay.v14.Material. This v14.Material version has been
deprecated in the support library source in favor of just having those
styles be what's in PreferenceThemeOverlay, but the prebuilt with those
changes hasn't made it to the master branch yet.

Bug: 110048976
Test: visual (settings should not have dividers between each Preference)
Change-Id: Id9c33f6f235b1cb39cf78830da901413f7aa6815
2018-06-11 14:59:05 -07:00
TreeHugger Robot
405b86acad Merge "Remove custom styles that have moved to supportlib" 2018-06-11 18:05:32 +00:00
Antony Sargent
51514b2031 Remove custom styles that have moved to supportlib
We moved several preference styles defined here in settingslib into the
support library, and don't need them here anymore.

Bug: 64689839
Test: visual (styles for things like icon spacing, dividers, etc. should
be the same)

Change-Id: Ic6c9c693dfc94a4dc7abb047a23fad06323f2855
2018-06-08 14:25:55 -07:00
Fan Zhang
fb48015c0e Fix memory leak in ApplicationStates
- Use app context in dreambackend
- Use WeakReference in LocalBluetoothManager to track foreground
  activity
- Use WeakReference in ApplicationsState to track active sessions

Bug: 109894607
Test: hprof
Change-Id: I0e868182a364efbd110eb77ebd6cdbd83f164669
2018-06-08 12:16:33 -07:00
Maurice Lam
9482c2b679 Fix Robolectric tests
Test: TreeHugger
Change-Id: Iea7c6f9bdcc19ddaddcedd03c3ebcf512bedb720
2018-06-07 20:22:12 +00:00
Ying Zheng
227eb4bf59 Merge "Fix a calling loop for getAllUsers." into pi-dev am: e02f32b921
am: abb6aad8e5

Change-Id: Ic7cf84ebb2d054b73641fa98117da356d254ee67
2018-06-05 17:40:54 -07:00
Ying Zheng
abb6aad8e5 Merge "Fix a calling loop for getAllUsers." into pi-dev
am: e02f32b921

Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f
2018-06-05 17:25:13 -07:00
Ying Zheng
9b3422a5e1 Fix a calling loop for getAllUsers.
Bug: 109698349
Test: Manual
Change-Id: Id5def3c876ccfb390dd91f7cb24ebd43ebdeaef0
2018-06-05 11:47:40 -07:00
TreeHugger Robot
1eb3fa00ad Merge "Import translations. DO NOT MERGE" 2018-06-05 05:35:13 +00:00
Ying Zheng
0b9c2adcf1 Merge "Read build flag to determine user model." into pi-dev am: 9b5267f914
am: bbb033e6e4

Change-Id: I10ce3a986863de596f136b7d59fc03f25a27d960
2018-06-04 18:28:47 -07:00
Ying Zheng
bbb033e6e4 Merge "Read build flag to determine user model." into pi-dev
am: 9b5267f914

Change-Id: I08c8e72fdbad7b20ac6039c441feabf2ac31205c
2018-06-04 17:16:19 -07:00
Ying Zheng
04e1ca0242 Read build flag to determine user model.
Bug: 109698349
Test: Manual
Change-Id: I180b6a877ead576b0ed1292376fe0e74b0df1fd9
2018-06-04 16:02:39 -07:00
Bill Yi
5d22d066f2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id3ec2d329e661c984e51de0960c46c136ca69627
2018-05-31 19:29:24 -07:00
Bill Yi
30f1952571 Import translations. DO NOT MERGE
Change-Id: Id66eec75c88136a9b2bedd3cdea80868c25dbc9c
Auto-generated-cl: translation import
2018-05-31 19:09:53 -07:00
Bill Yi
bf77fe8ad9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia217e53a5c9e1c832f986eb4c90b6099f566d941
2018-05-30 21:32:21 -07:00
Fan Zhang
32cb24c5c9 Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am: 89722d829e

Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5
2018-05-29 20:20:08 -07:00
Fan Zhang
091a057301 Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.

Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Merged-In: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes: 76435804
Bug: 80428049
Test: robotests
2018-05-29 22:30:49 +00:00
Fan Zhang
1b2793b1c9 Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.

Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes: 76435804
Bug: 80428049
Test: robotests
2018-05-29 15:30:19 -07:00
Evan Laird
bfafdf9593 Merge "Merge "Update location icons (qs + status)" into pi-dev am: 478923bded" into pi-dev-plus-aosp
am: f4381335cf

Change-Id: I8eb61c9400da2db19f94972d3fc86c3cee69d6f3
2018-05-24 21:25:04 -07:00
Evan Laird
e8682fbbe0 Merge "Update location icons (qs + status)" into pi-dev
am: 478923bded

Change-Id: I524eb54f32c297de6a5eca1d4ed7f2f753adce3d
2018-05-24 14:48:35 -07:00
TreeHugger Robot
478923bded Merge "Update location icons (qs + status)" into pi-dev 2018-05-24 20:50:41 +00:00
Evan Laird
ecf63a4fdf Merge "Wicked good battery saver + rotation icons!" into pi-dev am: f354ba185a
am: 50b1e2c1eb

Change-Id: Ic8ecba6bb05059ea1eec7ed55ef9b96eb83b465d
2018-05-23 18:36:26 -07:00
Evan Laird
50b1e2c1eb Merge "Wicked good battery saver + rotation icons!" into pi-dev
am: f354ba185a

Change-Id: I7936cfc374390bfde381759c6265b786d86e4248
2018-05-23 16:58:34 -07:00
Evan Laird
c10ddd448d Update location icons (qs + status)
Last call!

Test: visual
Change-Id: I946691fc06152c56c4c3a2772aaacf5ac1f96ff7
Fixes: 80152065
2018-05-23 16:00:06 -04:00
TreeHugger Robot
f354ba185a Merge "Wicked good battery saver + rotation icons!" into pi-dev 2018-05-23 18:46:47 +00:00