Commit Graph

572 Commits

Author SHA1 Message Date
TreeHugger Robot
120f971679 Merge "Disable settings nav drawer entirely." 2017-02-22 20:08:37 +00:00
Lei Yu
b0833461e4 Merge "Make precentage calculation round up by 0.5%" 2017-02-22 18:44:38 +00:00
Antony Sargent
8b0813c3e4 Merge "Add "Instant apps" filter to app listing" 2017-02-22 18:40:43 +00:00
Fan Zhang
5ba2d3fef9 Disable settings nav drawer entirely.
Change-Id: I3e9bdd3759a47fc09a654b6dad00b611138d5de6
Fix: 34806148
Test: make RunSettingsLibRoboTests
2017-02-22 10:36:30 -08:00
jackqdyulei
5dc1f36599 Make precentage calculation round up by 0.5%
So we will show 1% when actually number is 0.5%

Bug: 35305983
Test: RunSettingsLibRoboTests
Change-Id: I26f11f25a7d78cc6b09cb358abd82017fa7cea00
2017-02-21 16:40:01 -08:00
Lei Yu
1335669b0e Merge "Add statusLabel in BatteryInfo" 2017-02-21 18:40:52 +00:00
TreeHugger Robot
f8a420097e Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" 2017-02-21 17:20:13 +00:00
TreeHugger Robot
6e82080513 Merge "Move Badging from ScoredNetwork to NetworkingBadging." 2017-02-18 01:14:04 +00:00
TreeHugger Robot
7470861b97 Merge "Move InputMethodAndSubtypeEnabler to SettingsLib and port to TV" 2017-02-18 00:21:23 +00:00
Yuxin Chang
3a22f91638 Merge "Show connection error reason for Passpoint AP" am: 855889b086 am: 4896a04013
am: 012a9c1f6e

Change-Id: Icde372b38103016deec0670e66ba8bb821a21a4f
2017-02-17 22:40:17 +00:00
Yuxin Chang
4896a04013 Merge "Show connection error reason for Passpoint AP"
am: 855889b086

Change-Id: I164f575dfc5dd69912f433e46b1d70b1fd11b1e6
2017-02-17 22:22:05 +00:00
Tony Mantler
b8592357c3 Move InputMethodAndSubtypeEnabler to SettingsLib and port to TV
Bug: 35315463
Test: adb shell am start -a android.settings.INPUT_METHOD_SUBTYPE_SETTINGS
Change-Id: Ibd62633259fe06b3971130eab158f077ef066a95
2017-02-17 14:04:00 -08:00
jackqdyulei
111418e7ad Add statusLabel in BatteryInfo
The statusLabel shows the current status of the battery(i.e. not
charging, charging).

Bug: 35328749
Test: RunSettingsLibRoboTests
Change-Id: I5be13635be9b2749c0c62edeb1e0ac17ff423d83
2017-02-17 13:58:49 -08:00
Treehugger Robot
855889b086 Merge "Show connection error reason for Passpoint AP" 2017-02-17 21:34:35 +00:00
TreeHugger Robot
8c9a6b0089 Merge "Revert "Revert "Per user setting for instant app""" 2017-02-17 20:46:12 +00:00
Amin Shaikh
98773d4837 Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.

Bug: 34745259
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
2017-02-17 08:49:16 -08:00
Doris Ling
2ddd29df61 Remove nested preference from its parent.
PreferenceScreen.remvoePreference() only removes top level preference in
the preference screen. When we try to remove preference inside a
preference category, it will fail. Add handling to recursively find
the preference and remove it directly from its parent instead.

Change-Id: Ib33efe0b716db2366d712ce1d1eb8b5e33a4683a
Fix: 35365702
Test: make RunSettingsLibRoboTests
2017-02-16 15:29:26 -08:00
Todd Kennedy
be0b8896d1 Revert "Revert "Per user setting for instant app""
This reverts commit be9ffa15af.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ib21321cf157a79890de487060a093840f7182047
2017-02-16 12:43:37 -08:00
TreeHugger Robot
0b6b10d1ee Merge "Fail safely on invalid ScanResults when creating NetworkKey" 2017-02-16 00:27:14 +00:00
Antony Sargent
67952e94a9 Add "Instant apps" filter to app listing
Bug: 35098444
Test: new test added in ApplicationsStateTest.java ; run it by doing the
following commands:
 make SettingsLibTests -j40
 adb install -r $OUT/data/app/SettingsLibTests/SettingsLibTests.apk
 adb shell am instrument -w com.android.settingslib

In Settings->Apps&Notifications->Apps, the list of filters before this CL is:

 All | Enabled | Disabled

With this CL, the filter list becomes:

 All apps | Installed apps | Disabled apps | Instant apps

Change-Id: Ia2ec099f758901839a2aa84fe155ae032990092f
2017-02-15 15:52:33 -08:00
Guang Zhu
626ffb4556 Merge "Revert "Per user setting for instant app"" 2017-02-15 21:47:34 +00:00
Guang Zhu
be9ffa15af Revert "Per user setting for instant app"
Bug: 35390781

This reverts commit 2f5811dcfd.

Change-Id: Ibb1c8dacbdc6908fc7fa2bc5dca664f2455162bf
2017-02-15 21:43:48 +00:00
Jason Monk
6650e89dbc Merge "Tuner updates" 2017-02-15 20:24:44 +00:00
Jason Monk
790442e4cd Tuner updates
Some UX updates to the tuner to feel better and align with settings
UX patterns.

Test: visual
Change-Id: I9c57194b9649c61e0d6d3f9e21a51d9c4a5c1286
2017-02-15 13:35:00 -05:00
Stephen Chen
fde900dbbd Fail safely on invalid ScanResults when creating NetworkKey
Added tests for NetworkKey#createFromScanResult

Bug: 34671341
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkKeyTest.java
runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

Change-Id: Ideac1615917649cd3934421228a82aeed37e7ad1
2017-02-14 18:39:57 -08:00
Sundeep Ghuman
699deaf610 Move Badging from ScoredNetwork to NetworkingBadging.
This is a non-functional refactor. The old enums will be removed once
ag/35323372 is addressed.

Bug: 35114358
Test: Ran existing tests (see files touched).
Change-Id: I08fd8c7964463b5908ce361e61f8fe811d0ff6f3
2017-02-14 14:04:18 -08:00
Todd Kennedy
2f5811dcfd Per user setting for instant app
The same application can run as either an instant app or an installed
app. Store this setting per-user instead of based upon the install
location.

Bug: 25119046
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Iff565bb1ac10d631499f0bd0f69b401cb073c10e
2017-02-14 13:42:01 -08:00
Daniel Nishi
646b56c844 Merge "Don't show game and music apps in Other Apps." 2017-02-14 18:45:33 +00:00
Fan Zhang
f8eb664492 Deprecate openTile method.
We no longer have tile drawer. Deprecatign this will make logging easier.

Bug: 30137094
Test: RunSettingsLibTests
Change-Id: I19777ede597e9db57b7c27b1850c39f9e2a61aa7
2017-02-13 14:40:59 -08:00
Fan Zhang
fdfc88faef Don't hide summary text in RestrictedPreference.
Bug: 34974598
Test: RunSettingsLibRoboTests
Change-Id: I8ea74fb52c38430c120fd4158867a9184d8f16cf
2017-02-10 17:22:51 -08:00
Yuxin Chang
6b750865ed Show connection error reason for Passpoint AP
Currently "Available via <provider friendly name>" is always shown
in the summary with Passpoint AP, even connection error happens,
so user might not notice the error happens.

Better to show error reason when connection error happens,
so that user can notice the error and take actions to solve it.

Bug: 35190091

Change-Id: If0d06e800df8de3119590372feda946457aab5e6
2017-02-09 22:28:30 +09:00
Sundeep Ghuman
ac7b43616e Serially (un/)register score cache in WifiTracker.
Before the cache unregistration logic was posted to the worker thread.
However, when WifiSettings is quit, the onDestroy method immediately
kills the WorkHandler. This caused unregistration to never occur, which
left the cache registered and the listener to try to post work on the
dead worker thread. The cache is now registered and unregistered
serially in start and stop tracking, respectively. Furthermore, the
cachelistener is running on the mainHandler as it is a lightweight task
(posting to work handler).

Bug: 34891717
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I7739fdbe036be5b2870be45f33f670fd69d69af1
2017-02-08 20:56:07 -08:00
TreeHugger Robot
4a7b9f2b90 Merge "Fix a crash when opening app data usage for work profile" 2017-02-08 22:33:47 +00:00
Daniel Nishi
bd8c6652cd Don't show game and music apps in Other Apps.
Bug: 35143240
Test: SettingsLib Robotest
Change-Id: Ifaa086373d27dc81203137d20fa1617df21f6093
2017-02-08 12:20:12 -08:00
Fan Zhang
73b161ddc1 Fix a crash when opening app data usage for work profile
The icon on app header is a clone of original app icon, which relies on
getConstantState() of the orginal drawable non-null.

Change-Id: Ice5360f5d00d99b3cfe538b167ce67fc06d5e402
Fix: 34190136
Test: make RunSettingsLibRoboTests
2017-02-08 12:02:52 -08:00
Dan Sandler
6aa6e6e640 Clean up BatteryMeterDrawable internal api.
Bug: 32539932
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/BatteryMeterDrawableTest.java
Change-Id: Ifdc3368b930abcf248b60ee99f6f9139ad804f91
2017-02-08 10:10:46 -08:00
Salvador Martinez
5457217e2c Merge "moved shared classes from settings to settingslib" 2017-02-08 17:57:13 +00:00
TreeHugger Robot
ba89ed754f Merge "Move the logic of batteryMeterDrawable to settingslib" 2017-02-08 10:14:28 +00:00
jackqdyulei
597b10f6db Move the logic of batteryMeterDrawable to settingslib
In Settings, we also need a BatteryMeterDrawable to show battery meter,
that's why I move it to settingslib.

In this cl, what I have changed is listed below:
1. Create BatteryMeterDrawableLib that contains logic of battery
drawing.
2. Still Keep the battery control logic in systemui.
3. Remove hardcoded battery color by using the color state lists.
4. Move some tests to settingslib

Bug: 34771849
Test: make SettingsLibTests

Change-Id: I39c0f0e31ca5e1b958467298db1d0590d16c9f6d
2017-02-07 17:27:00 -08:00
Salvador Martinez
3965e0207c moved shared classes from settings to settingslib
These classes are needed in StorageManager but are
used by settings so I moved them into settingsLib.

Test: ?? Investigating
Bug: 34768442
Change-Id: I59c2f6c714d8e282d4781899127c22f8537e81af
2017-02-07 11:23:22 -08:00
Soroosh Mariooryad
e622690efa Merge "Modifying SuggestionParser to support dismiss logic of smart suggestions." 2017-02-07 02:12:58 +00:00
TreeHugger Robot
ad8cab3892 Merge "Show saved networks before scored networks." 2017-02-07 02:06:33 +00:00
Soroosh Mariooryad
56ce766e92 Modifying SuggestionParser to support dismiss logic of smart
suggestions.

Test: RunSettingsLibRoboTests
Fixes: 35059823
Change-Id: I8c257f4f89f7dbc179aee85e013bdaecc8c3c09c
2017-02-06 17:37:49 -08:00
Doris Ling
864b7f41bb Remove category key SYSTEM_INPUT
Since we are combining Language & regions and Input and gestures in
System settings, we don't need 2 separate category keys.

Bug: 34976047
Test: make RunSettingsLibRoboTests
Change-Id: Ic11bfb5e4e373a3499772b1d4654187749197899
2017-02-03 16:15:03 -08:00
Peter Qiu
2c3b5ee2be SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks
Previously, we were using provider name as the "SSID" for
Passpoint networks, and use it to compare against real SSIDs,
which obvious doesn't match.  So fix it.

Also removed the Passpoint specific logics in WifiTracker for
tracking Passpoint networks, since there shouldn't any
difference in tracking Passpoint APs and normal APs.

Additional work is still needed for managing installed
Passpoint configurations in the "Saved networks" page,
and it is being tracked by b/34207710. The Passpoint configuration
is not an "Access Point" per se, it is a network profile.

Bug: 34455883
Test: Install a Globla Reach Passpoint profile on a bullhead,
      verify device auto connects to a Global Reach AP and UI
      (QS, QS+, and Settings) correctly reflects it.

Change-Id: I63e66f683f8cb96e664516b130f5e7bc02358a10
2017-02-01 14:40:34 -08:00
Sundeep Ghuman
05c41e2ce4 Show saved networks before scored networks.
Changing ranking order to prioritize saved networks over scored
networks.

Bug: 34716123
Test: Turn on scoring and scoring UI features, ensure unscored saved
network appears before unsaved scored network. Working on adding tests
for AccessPoint.java separately.

Change-Id: Ib53ade6c0e3756e2595ba6a73bf1a0fdc05e3074
2017-02-01 13:27:56 -08:00
Daniel Nishi
646f500315 Merge "Add a filter for audio apps." 2017-02-01 21:01:55 +00:00
Stephen Chen
9507388685 Merge "Remove Wi-Fi lock icons from AccessPointPreference." 2017-01-31 23:37:26 +00:00
Stephen Chen
ed8f5297a3 Remove Wi-Fi lock icons from AccessPointPreference.
We now have friction icons to show secured state.

Bug: 34775402
Test: manual inspection.
Change-Id: I644aadf8175e5b7b4daab6a3d6feacbe95fcdfda
2017-01-31 15:31:13 -08:00
Ido Ofir
a560cd947b Adding missing filters to suggested actions in Settings that that they
match the Optional Steps fliters in setup wizard.
Also added some more logging.

Bug: 34460278
Test: cd tests/; mma

Change-Id: Id576a1a19daa473e203cef41d67f6ef0cfc06dbe
2017-01-31 11:03:44 -08:00