Commit Graph

393 Commits

Author SHA1 Message Date
Rajeev Kumar
e19cd4828e Data plan usage summary fragment.
Change-Id: I2d928d1b5313b723450c8f5a45ff944b99dc3d5d
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-18 14:52:58 -07:00
Pengfei Zhao
7c52e51a9b Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e327741 am: dfe237f2cf am: d1dbc81145
am: 76b1817685

Change-Id: If62e23d750b55a292852b2bda8ab46299a7e8aea
2017-07-18 20:42:02 +00:00
Pengfei Zhao
76b1817685 Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e327741 am: dfe237f2cf
am: d1dbc81145

Change-Id: Ia9ac501c7d67bec0465f6019a1ba52ad863b6da0
2017-07-18 20:36:56 +00:00
Pengfei Zhao
dfe237f2cf Merge "Fix Settings crash when setting only decimal point to data usage warning"
am: 3a2e327741

Change-Id: Ic25c64da40b1accb9dce63a63462acd01664e054
2017-07-18 20:31:57 +00:00
Pengfei Zhao
c05a3a0227 Fix Settings crash when setting only decimal point to data usage warning
Settings app crashes when only decimal point (".") is set to
data usage warning because it is not a valid number.
To fix this issue, the decimal point should be converted to 0.

Fixes: 63787824
Test: manual - go to Settings > Data usage > Mobile data usage and then
               set only decimal point to data usage warning.

Change-Id: Iefb6a035ba6f17b8e0c89f79dbd397e2356fb19c
2017-07-18 06:50:18 +00:00
TreeHugger Robot
8a5a1b7419 Merge "Iterate NetworkPolicy towards SubscriptionPlan." 2017-07-15 19:57:01 +00:00
Jeff Sharkey
47f51fac35 Iterate NetworkPolicy towards SubscriptionPlan.
As part of getting Settings ready to roll towards SubscriptionPlan,
reduce references to NetworkPolicy internal fields.  All usage cycle
details are now obtained from an Iterator which converts to
SubscriptionPlan under the hood.

Bug: 63391323
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I0e1357eef092a328c05f6a709aba0f106554631e
2017-07-14 15:17:42 -06:00
Rajeev Kumar
9664c1a55e Refactor few public static methods.
Move public static methods from DataUsageSummary to DataUsageBase.

Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I632f75f4c4f370fb225a9787267043fec20994e5
2017-07-14 14:01:02 -07:00
Jeff Sharkey
fc5a1740be Merge "Move "metered" persistence to WifiConfiguration." 2017-07-14 17:47:54 +00:00
Jeff Sharkey
dc09269c81 Move "metered" persistence to WifiConfiguration.
For a long time we've had a nasty tangled dependency between Wi-Fi
and NPMS, since they both persisted different details for configured
networks.  As part of preparing for new carrier data plan APIs, move
the tracking of meteredness over to WifiConfiguration.

We've never really supported "unmetered" mobile networks inside the
framework, so remove the option to configure those flags.

Replace MeteredPreference.notifyChanged() with explicit listener
to avoid confusing an invalidation pass as expression of user intent
to change metered values.

Bug: 63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: No owner was found for changed files.
Change-Id: If8a6e12650d1d060a729ed1a80f07ebb65e0ffd7
2017-07-14 09:47:03 -06:00
TreeHugger Robot
7eee73a0c8 Merge "Don't use framework strings for formatting file sizes" 2017-07-13 23:11:42 +00:00
Roozbeh Pournader
ded99003c4 Don't use framework strings for formatting file sizes
Modify various formatters to avoid using framework strings for
formatting file sizes.

Also update README instructions for running unit tests.

Bug: 36994779
Test: adb shell am instrument -w -e class com.android.settings.utils.FileSizeFormatterTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Change-Id: I4035f26d29408b64389892a4a2379b4823f8ac96
2017-07-12 15:58:21 -07:00
Rajeev Kumar
c6f0b9d6f3 Data plans setting peference.
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-12 11:48:23 -07:00
Rajeev Kumar
bc393be977 Some import cleanups.
1. Get rid of unused import.
2. Fix import order.

Change-Id: I278949d95242682fd277adc2c71bc892e58a8533
2017-07-06 17:19:50 -07:00
Fan Zhang
75bee9bf98 App header cleanup
- Refactor the entity header layout to use LinearLayout and add id to
  content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
  Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference

Fix: 62705377
Test: make RunSettingsRoboTests

Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
Rajeev Kumar
e72113a5a8 Merge "Some cleanups in DataUsageSummary class: 1. Get rid of unused constants. 2. Fix typo in instance variable name. 3. Convert an instance variable to a local variable. 4. Use Java8 lambda for SummaryProviderFactory instance." 2017-07-06 01:20:45 +00:00
Rajeev Kumar
8f425680ae Some cleanups in DataUsageSummary class:
1. Get rid of unused constants.
2. Fix typo in instance variable name.
3. Convert an instance variable to a local variable.
4. Use Java8 lambda for SummaryProviderFactory instance.

Test: make RunSettingsRoboTests -j40
Change-Id: I6cae055d6efd5e724bdd46e04b7077df610a72e9
2017-07-05 16:18:19 -07:00
Rajeev Kumar
ad157aca52 Create a feature provider for data plan feature. This change will
allow us to enable/disable this feature from adb shell.

Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I2d0bed738d5d4cd0fe1de056ee37092d46be72b6
2017-07-05 12:25:53 -07:00
Fan Zhang
896f1b363c Reduce jank around loading view when opening data usage UI
Change-Id: I3d23d8160b046de8fe125ba0697b7b3d7786453c
Fix: 28181319
Test: robotests
2017-06-26 15:15:30 -07:00
Juan Lang
c04c3f7bd7 Use SettingsLib's versions of Custom* classes.
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
Juan Lang
d5d43ddc77 Merge "Use SettingsLib's versions of Custom* classes." 2017-06-21 21:25:19 +00:00
Yoshinori Hirano
c55ca0bf56 Tell SIMs apart in Data usage settings in multi-SIM case
In multi-SIM case, multiple "Mobile" categories are shown in Data usage
settings. To fix this issue, SubscriptionInfo#getDisplayName() should be
used instead of "Mobile".

Fixes: 62779261
Test: manual - go to Settings > Network & Internet > Data usage

Author: Wu Qiang <qiang.x.wu@sonymobile.com>
Change-Id: I4d95eceb24efd78ea3f3782d3a613edd2cf37d65
2017-06-21 12:10:11 -07:00
Juan Lang
4482812cb1 Use SettingsLib's versions of Custom* classes.
Test: make RunSettingsRoboTests
Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
2017-06-21 12:07:50 -07:00
Alex Kulesza
c57ceaaa8c Implement general projection curve support for UsageGraph.
Previously, projections were hard-coded in UsageGraph as lines from the
last known point to the corner of the graph. This change replaces that
with support for arbitrary projection curves. Logic for hiding/showing
the projection is now gone; if the client does not want a projection,
it simply does not supply one.

There are two active clients of this code: the data usage graph and the
battery usage graph. The data graph does not use projections and is
essentially unchanged. The battery graph now implements its linear
extrapolation directly in BatteryInfo.

Bug: 38400320
Test: make SettingsUnitTests SettingsGoogleUnitTests
Test: manual (screenshots in comments)
Change-Id: I754e66f6b18ecb8b936143399f8e9e3368fc1ce4
2017-06-08 16:59:14 +00:00
Alex Kulesza
c661098ab8 Move UsageGraph from SettingsLib to Settings.
In preparation for modifying the graph code to show detailed projections
(see bug), this change moves it into Settings along with related tests
and resources.

Bug: 38400320
Test: manual, make SettingsUnitTests, make SettingsGoogleUnitTests
Change-Id: I88e5336c15827727b3427e29b10954bba9cfba7d
2017-06-05 15:43:18 -04:00
TreeHugger Robot
0965a9ded4 Merge "Set correct uid when loading app icon in data usage UI." 2017-05-25 02:13:13 +00:00
Fan Zhang
17d63964c7 Set correct uid when loading app icon in data usage UI.
work profile apps belongs to a different user. Set the correct uid when
loading the icon so the work profile badge is displayed.

Change-Id: I2ed27d6b83c1b42961500dc8d63475bf1f7eabcd
Fix: 38372681
Test: make RunSettingsRoboTests
2017-05-24 16:04:23 -07:00
Fan Zhang
82be5f0c3f Misc fixes to search and UI.
- Use prefContext to create preference.
- rename "Gestures" to "Gesture shortcuts"
- Add search keyword to individual gesture settings so when search
  "gesture" they also show up.
- call super() for all getNonIndexableKeys() in search provider

Fix: 38327387
Fix: 36621897
Fix: 36685646
Test: make RunSettingsRoboTests

Change-Id: Ia5ddfeae08cb27c278dfb8d2376594e21d8f283c
2017-05-23 14:55:23 -07:00
Fan Zhang
841d1d5aab Show shadow when entity header starts scrolling.
- Add a controller to manage add/remove onScrollChangedListener to
  recyclerviews.
- When recyclerview on each screen is scrolled to top, set actionbar
  elevation to 0, otherwise set it to non-zero.
- When screen is moved to background, detach the listener.
- Use the controller in entity header.

Change-Id: Iecf194d885098c98c392810f62893ae9189f3936
Fix: 37670670
Test: make RunSettingsRoboTests
2017-05-22 17:16:24 -07:00
Fan Zhang
d7414259d0 Move entity header controller out of application package.
Bug: 37669238
Test: rerun robotests
Change-Id: I54eb30f28fa0a88a6f0b97b53f9f1408320b5ce0
2017-05-18 16:36:32 -07:00
Fan Zhang
f5bd885a1d Clean up settings_entity_header layout.
update layout view IDs, and controller variable names to be more
generic.

Fix: 36734470
Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Ib80827ae3eae6d01a600068b4a8a44b239c32511
2017-05-18 16:35:27 -07:00
Matthew Fritze
256e9e208e Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f
am: d53409356d

Change-Id: Ia40375afa74f82a46c01aef99b95d6074fbc5324
2017-05-17 17:53:08 +00:00
Matthew Fritze
d53409356d Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
am: 09dbc8043f

Change-Id: Ia172fc4c93b2259ed9a51248159784a89fbdf638
2017-05-17 17:37:51 +00:00
Matthew Fritze
8b0ed39c11 Remove Network Restrictions duplicate from setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
2017-05-16 14:35:19 -07:00
Fan Zhang
667d427967 Revert "Update strings in special app access and dev options"
This reverts commit 9834bd82da.
Fix: 38347840
Test: make RunSettingsRoboTests
Change-Id: Ia366db7d9779c14a1b8cbe86e509bc54c9eee658
2017-05-16 13:54:28 -07:00
Fan Zhang
9834bd82da Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to
  Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
  user enable dev options before use.
- Add search in SpecialAccessSettings

Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix: 38290299
Fix: 37469224
Test: make RunSettingsRoboTests
2017-05-15 13:22:51 -07:00
Doris Ling
01639b7504 Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
2017-05-12 15:51:11 -07:00
Doris Ling
071aa6b88b Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
am: d821a32b8e

Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
2017-05-12 22:06:32 +00:00
Doris Ling
2f02218493 Change AppPrefLoader from AsyncTask to AsyncLoader.
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.

Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix: 33820327
Test: make RunSettingsRoboTests
2017-05-12 10:34:20 -07:00
Fan Zhang
470caeaa80 Hide app info link for "All work apps" data usage detail
We should hide the link because "All work apps" is a meta app, it
doesn't point to any specific app, so app info link does not make sense.

Change-Id: I768786f2df5d05bbde0723e5585abcdbe875c652
Fix: 36542896
Test: make RunSettingsRoboTests
2017-05-12 10:21:33 -07:00
Fan Zhang
b2b6f7d20e Misc string updates
- Use BidiFormat wrap dp number
- Update billing cycle starting day string

Change-Id: Ifb57e3bb18ced72f91f30599a2ff7bcfa329630f
Fix: 37353209
Fix: 37657115
Fix: 38005987
Test: visual
2017-05-05 09:31:22 -07:00
Fan Zhang
87603385b7 Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
am: 30e9474dbb

Change-Id: Ib72ca3ea03b3fb32d018e1fbad9b697ce5dd1391
2017-04-28 23:24:40 +00:00
TreeHugger Robot
30e9474dbb Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev 2017-04-28 23:08:20 +00:00
Fan Zhang
293556d6b8 Revert "Display and parse numbers properly in all locales"
Bug: 37311645

This reverts commit 8648c5ed3d.

Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
2017-04-28 21:06:28 +00:00
Matthew Fritze
6e4d02fa86 Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
am: b48e6e46b3

Change-Id: I8aedf3695394a296cb1b1ea7111232c6d25aa07a
2017-04-27 19:55:29 +00:00
Matthew Fritze
2caaa7420d Remove search duplicates for Wifi and Bluetooth
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
2017-04-27 12:36:16 -07:00
Fan Zhang
feea41f6cc Merge "Display and parse numbers properly in all locales" into oc-dev
am: 28e5271c61

Change-Id: I209c67664d3713609cdc10bde9598f796b167139
2017-04-19 23:56:32 +00:00
TreeHugger Robot
28e5271c61 Merge "Display and parse numbers properly in all locales" into oc-dev 2017-04-19 23:30:08 +00:00
Fan Zhang
8648c5ed3d Display and parse numbers properly in all locales
Change-Id: Iddf74fd6ed3139eede27733b69a31ce2fa7d1a92
Fix: 37311645
Test: make RunSettingsRoboTests
2017-04-19 14:30:19 -07:00
Sunny Goyal
77fca989a0 Merge "Using a common class for loading drawables and handling various badging" into oc-dev
am: d2561263a8

Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
2017-04-19 02:53:17 +00:00