Commit Graph

163 Commits

Author SHA1 Message Date
Jason Monk
e764165369 Context isn't good enough, actually check for null
Bug: 25606212
Change-Id: Ic765d5a37fa19ecd22bb47694514e6ee0bdb84a5
2015-11-10 15:09:34 -05:00
Jason Monk
886978f411 Use context instead of activity
Bug: 25606212
Change-Id: I5d7eca547562ab968c5f7a4b91119ee7b1c3bce5
2015-11-10 14:54:18 -05:00
Jeff Sharkey
5368e7519d Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073 am: 0b07ce50a7
am: 6a4bd6f6f9

* commit '6a4bd6f6f9882307bce087f8abe9bfafeda1680d':
  Hide empty data usage cycles.
2015-10-20 23:14:32 +00:00
Jeff Sharkey
82839c8073 Merge "Hide empty data usage cycles." into mnc-dr-dev
am: 2fcbdb7bb6

* commit '2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
  Hide empty data usage cycles.
2015-10-20 17:33:50 +00:00
Jeff Sharkey
02551ecd2e Hide empty data usage cycles.
When building list of historical data usage cycles, omit cycles
that don't contain any data usage.  A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between.  Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
2015-10-19 17:28:04 -07:00
Jason Monk
39b467482d Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Wei Liu
9dde0669f2 am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:34 +00:00
Wei Liu
f280a5ec5a am dd65a1d9: am ad50b81f: am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit 'dd65a1d98d46716069b6c2a58c2c268afbeb8ba6':
  Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:18:38 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
2015-08-25 11:02:59 -07:00
Wei Liu
8dffd150c4 Move SummaryForAllUidLoader to SettingsLib.
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.

Change-Id: I1833492d4a3b513405bfc1069b8656d04dd37c48
2015-08-24 11:47:27 -07:00
Julia Reynolds
e492ee06ad Make the app header bar more consistent.
- Don't include info link if just came from app info page
- include back button on app info page when launched from header
Bug: 22203029

Change-Id: I737332a487c41e0a93d161b55659700a1f936844
2015-08-19 15:18:55 -04:00
Roozbeh Pournader
4bbf75d184 Inline TextUtils.join(Iterable<CharSequence>).
DataUsageSummary seems to be the only place the deprecated hidden
method is used. This inlines the definition so the deprecated method
could be removed.

Change-Id: I63dc1de74e1df1119ba99f46bed5d016e07c87b5
2015-08-10 11:32:19 -07:00
Julia Reynolds
639ff84f94 am 3275d302: am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '3275d30212196f8d42afb6d455508e345bf544e5':
  Hide usage graph on app usage details pages.
2015-07-28 22:05:03 +00:00
Julia Reynolds
2ade0a5e7b am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
  Hide usage graph on app usage details pages.
2015-07-28 21:16:03 +00:00
Julia Reynolds
1740ce4f0c Hide usage graph on app usage details pages.
Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
2015-07-28 10:03:13 -04:00
Xiaohui Chen
44879a387a sys user split: first pass updating Settings
Update various places in Settings to use "admin" ueser flag
instead of checking user id "0".  This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.

Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6
2015-07-27 15:39:28 -07:00
Wei Liu
de557d48ba Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
2015-07-13 12:01:42 -07:00
Wei Liu
e0021c426c Move NetworkPolicyEditor from Settings packge to settingslib.
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
2015-07-07 17:12:30 -07:00
Sanket Padawe
716b1f841c Add data limit paused string to Data Usage Settings screen.
Bug: 17073752
Change-Id: I14ade2c13db9203d33c11b2b06307e06d87b3800
2015-06-24 14:26:21 -07:00
Jason Monk
6e61347242 Start all help intents as startActivityForResult
So that the receiver may verify identity if they so desire...

Bug: 21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
2015-06-16 10:31:38 -04:00
Jason Monk
2cdafc6be3 Layout refinement for app lists
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding.  This way they
should look the same.

Bug: 21727125
Bug: 21726922
Bug: 21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
2015-06-16 09:15:39 -04:00
Jason Monk
15dcebe1e7 Help fallbacks and intent work
- Handle a backup URI, so that if the specified URI is not available,
   another can be used.
 - Add some data to help intents when they are intent URIs
 - Fill in the context with a classname when it isn't present

Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
2015-05-28 09:50:45 -04:00
Chris Wren
1b6ffba9e6 log more settings actions
airplane mode
  bluetooth
  cell data
  do not disturb

Bug: 20264417
Change-Id: I726033a126fba9f9dffc916806d636feea04033b
2015-05-08 18:48:24 -04:00
Jason Monk
20f464edde Fix app headers in settings
Use SettingsPreferenceFragment's method for pinned headers where
possible, and add a frame within the fragment for them to live in
otherwise so that this view doesn't end up on the activity.

Bug: 20886475
Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
2015-05-06 16:00:25 -04:00
Stuart Scott
f51d006350 Correct the way settings deals with subscriptions.
Change-Id: I19e9dfaf248fce7376b124ee91de7e73fdc99fb3
2015-04-08 11:11:34 -07:00
Chris Wren
8a963babe2 log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
2015-03-27 13:39:07 -04:00
Alan Viverette
55eaa96fe4 Clean up usage of theme colors, deprecated Resources.getColor* methods
Change-Id: I34e11e0773c9f8e00e3eab422781094e19a16d3d
2015-03-18 18:10:52 -07:00
John Spurlock
9a23adf69d Settings: Remove all unused imports.
Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
2015-03-18 15:51:15 -04:00
Jason Monk
4bb075bc4f Add data item to app info screen
Add link from app info to directly viewing data usage for that app.

Also do some minor tweaks to get ordering and summaries right on
the app info screen.

Bug: 19511439
Change-Id: Ic50dc24bf9a5c1fe6a7aa076772915ba61168fac
2015-03-18 10:41:21 -04:00
Sanket Padawe
62197c9a97 am 4a7ca7d5: am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '4a7ca7d5a7c83dc77921c9c32abc7b366c18b46c':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-13 00:07:22 +00:00
Sanket Padawe
7e21fa5ab4 Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Zoltan Szatmary-Ban
2c228d8d7a Merge "Eliminate duplicated code in Settings for category headers" 2015-02-09 12:53:32 +00:00
Jeff Sharkey
9c167e92df Fix secondary data usage color regression.
Show overall usage with a 50% transparency when looking at a
specific app details page.  (Otherwise you can't tell them apart.)

Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
2015-01-26 14:18:19 -08:00
Zoltan Szatmary-Ban
387597a256 Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev 2015-01-23 10:57:14 +00:00
Sanket Padawe
766ab606e3 Fixed data connection toggle crash in Settings.
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
2015-01-20 10:36:15 -08:00
Zoltan Szatmary-Ban
77c1d36de5 Show removed user's data usage under its correct item
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
(cherry picked from commit cd9b1507fb)
2015-01-19 10:53:45 +00:00
Zoltan Szatmary-Ban
3af2e4c35c Eliminate duplicated code in Settings for category headers
Change-Id: I5bdba2ad4f9e1987f9e818af9d5aa96a9d558f6b
2015-01-16 15:48:13 +00:00
Sanket Padawe
d819270f0f Fixed data connection toggle UI issue due to local cache maintained.
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.

Bug: 18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
2015-01-14 11:03:33 -08:00
Sanket Padawe
4e4860bbcb am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
automerge: c7e5b42

* commit 'c7e5b42ac493f7f06fd8d90f87a4e7eb23acc54c':
  Fixed Cellular data toggling issue in settings for multisim
2015-01-08 23:25:19 +00:00
Sanket Padawe
24f834d745 Fixed Cellular data toggling issue in settings for multisim
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
2015-01-08 11:23:11 -08:00
Zoltan Szatmary-Ban
cd9b1507fb Show removed user's data usage under its correct item
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
2014-12-12 18:48:03 +00:00
Wink Saville
d72c062fa8 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 10:10:05 -08:00
PauloftheWest
f0d84e2e53 Fixed a Data Usage crash
Bug: 18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
2014-12-10 09:38:02 -08:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Jeff Sharkey
4e2d16cdc0 Offer to "merge" subscribers for data usage.
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.

Also remove some code related to long-dormant split policies.

Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
2014-12-08 08:42:12 -08:00
Wink Saville
a4f4d185cf Add debug dataEnable.
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
2014-12-05 15:34:46 -08:00
Wink Saville
fcec91f475 Change initMobileTabTag to use subInfoList
Also add additional debug.

Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
2014-12-02 17:12:08 -08:00
PauloftheWest
c80b7616ca Added color to Data Usage graph
+ Fixed some issues with displaying multiple SIMs in Data Usage.

Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
2014-11-25 04:58:22 -08:00
Wink Saville
0183fb5394 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:11:39 -08:00
Wink Saville
9aa0dd69c5 Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
2014-11-20 20:27:34 +00:00