Commit Graph

577 Commits

Author SHA1 Message Date
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
Sunny Goyal
3b172d7b89 Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug: 36591157

Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Fan Zhang
00a0978293 Update action bar style in app header UI.
am: be6fab0135

Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
2017-04-17 18:38:01 +00:00
Fan Zhang
be6fab0135 Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
  app header.
- Add a shadow below app header view. We can't set elevation on app
  header unfortunately because that will add shadow all round the view,
  but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.

Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix: 37207527
Fix: 37079248
Test: visual && make RunSettingsRoboTests
2017-04-17 09:30:40 -07:00
Robin Lee
3c77ef7f29 Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9 am: 543a98806f
am: 1f9c67e982

Change-Id: I1d4c00df6867b9034b21d6d490323364f77c37db
2017-04-05 13:45:49 +00:00
Robin Lee
7a8121fdd9 Merge "RejectedExecutionException in DataUsageLIst" 2017-04-05 13:35:52 +00:00
tiansiming
8453fb3065 RejectedExecutionException in DataUsageLIst
RejectedPolicy throw Exception which will interrupt users

Bug: https://code.google.com/p/android/issues/detail?id=237575
Test: open as many online apps as possible and then open the DataUsageList
Change-Id: I2dabc6ee53cd0f27f59098328fe2a16172f71d0b
2017-03-30 23:22:02 +08:00
Robin Lee
27ae2bb1fe resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
2017-03-29 13:54:02 +01:00
Robin Lee
9fff988f4a Merge "Optimize code on get UidDetail in AppDataUsage"
am: ec6da66728

Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
2017-03-29 12:34:39 +00:00
Robin Lee
ec6da66728 Merge "Optimize code on get UidDetail in AppDataUsage" 2017-03-29 12:29:36 +00:00
tiansiming
40234f6fe2 Optimize code on get UidDetail in AppDataUsage
The class UidDetailProvider providers details about a specific UID,
we can directly  apply it here.

Optimize: https://code.google.com/p/android/issues/detail?id=237810
Test: for case TrafficStats.UID_REMOVED
1.add an new User
2.generate some data traffic under the new user
3.switch to the phone owner
4.delete the User added just now
5.go to Data usage and open the item "Removed apps and users"

    for case TrafficStats.UID_TETHERING
1.open tethering and generate some data traffic
2.go to Data usage and open the item "Tethering & portable hotspot"

Change-Id: I05aa522728b296d6c06580adf809f274491cdcea
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-03-28 22:13:53 +08:00
Sanket Padawe
f54df6ccfb Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: bd9ce2e4b1

Change-Id: I361f7c1747ab1f16cce149d78cc219f83a16948c
2017-03-23 00:45:56 +00:00
Doris Ling
47ec3857a5 Update preference text for Network & internet screen.
- Add footer info to Hotspot & tethering
- Add summary text for Data usage -> Network restrictions
- Update summary for Hotspot & tethering -> Portable Wi-Fi hotspot
- Remove quotes from Wi-Fi summary

Bug: 36296257
Test: make RunSettingsRoboTests

Change-Id: Ibab61b089521a3339e660e9df0db0cd1b316712b
2017-03-21 18:00:59 -07:00
Sanket Padawe
a71788362c Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
2017-03-21 22:31:58 +00:00
Sanket Padawe
e96db834fb Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
2017-03-21 11:24:53 -07:00
Fan Zhang
917721c8d6 Listen to mobile data enabled flag change.
The listener is necessary to show/hide the gear icon on top of billing
cycle settings screen as user turn on/off mobile data from QS.

code cleanup: remove dividedCategory

Fix: 28066849
Test: make RunSettinsgRoboTests

Change-Id: I3b7075512042127fd711a8a70a572adfed069502
2017-03-16 15:08:49 -07:00
Jeff Sharkey
0f0e3adac8 Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf
Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad
2017-03-12 17:22:21 -06:00