Commit Graph

132 Commits

Author SHA1 Message Date
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
Wink Saville
1285f74fcb Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 10:34:28 -08:00
Wink Saville
ca7566125e Update SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 07:06:03 -08:00
Stuart Scott
b153181c9c Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
2014-11-04 14:52:23 -08:00
Stuart Scott
3ada2ecbe0 Clean up public API of SubInfoRecord.
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
2014-11-03 16:00:10 -08:00
PauloftheWest
de33844d81 Added cellular data popup in DataUsage
+ If the user attempts to enable data usage on a SIM that is not the
default, the system will confirm that the user wants data to go through
the new SIM.

Change-Id: Ia1652a30a3641bb29eadad20b2dc61321227a961
2014-10-30 13:56:23 -07:00
PauloftheWest
98523c8b8b Added Cellular Data for Multi-Sim Data Usage
+ Bug Fix: SimSettings would crash if a SIM was not in the first slot.

Change-Id: Iee75ea78dde72dc7d2d588caff1ddd451347a8f5
2014-10-29 12:48:39 -07:00
Wink Saville
b003a85941 Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
2014-10-24 15:08:44 -07:00
PauloftheWest
50e6ecacf9 [DS] DSDS support for Settings
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
2014-10-03 15:22:59 -07:00
PauloftheWest
a4b8fb36b4 Fixed Settings Cellular Networks crash.
+ Removed the Cellular Networks option from Data Usage when the user is not
  the phone owner.

Bug: 17529931
Change-Id: Ice89b8fb1e6d41fe71235af0beaa1ee3653f8cf8
2014-09-19 08:08:26 -07:00
Zoltan Szatmary-Ban
1e0ea45263 Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 2014-09-04 11:55:49 +00:00
Jeff Sharkey
d0a5531576 Avoid NPE when template rapidly switched.
Monkeys can race and end up swapping template before the dialog
is shown.

Bug: 16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
2014-08-08 10:26:24 -07:00
Zoltan Szatmary-Ban
f20d39e87d Start activity for the correct user in Settings > Data Usage
The 'app settings' button on the app details view now starts the app settings activity
for the correct user, i.e. the managed profile's app settings if the list item corresponds
to the managed profile's app. Formerly it always incorrectly started up the settings screen
for the primary user's app.

Bug:16727726
Change-Id: Ib31d45f4201fb26b5231e4e57c49858e7e41efc9
2014-08-07 15:27:08 +01:00
Zoltan Szatmary-Ban
ebb36ec920 Badge texts correctly for accessibility in Settings
If an app is a managed profile's app then its label should read correctly by TalkBack.
Affected screens: Data Usage, Location, Battery.

Bug:16053981
Change-Id: I393c0ebf56917032d619b1e39b4bf141ee236981
2014-08-07 14:15:14 +01:00
Alexandra Gherghina
5ceddfaaf5 Move global sync settings dialogs to the right screen
Bug: 16076571
Change-Id: I4ba01ece6e5054d699342ff2c1270fc2fc51c5a9
2014-07-29 16:19:26 +01:00
Zoltan Szatmary-Ban
0924f199e5 Update Data Usage Settings for Enterprise
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834
Change-Id: I80cdcc062e45e1d2a8077f033562d71217e262bb
2014-07-29 11:10:45 +01:00
Jeff Sharkey
b654846300 Data Usage, materialized!
Asset drop so Data Usage matches new Material spec.  Removes time
dimension sweeps, so we now summarize the entire visible axis.  Fix
time axis labels to not draw outside clip bounds.  Remove pie chart.

No more checkboxes in menus.  Telephony items like roaming are moved
back to cellular settings.  Start wiring up multi-SIM support.

Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
2014-07-22 16:24:37 -07:00
Alexandra Gherghina
6d839875b7 Revert "Revert "Move global sync settings to AccountSettings.""
This reverts commit 4869faf465.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
2014-07-22 20:25:24 +00:00
Alexandra Gherghina
4869faf465 Revert "Move global sync settings to AccountSettings."
This reverts commit 64fde6f4e9.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9 Move global sync settings to AccountSettings.
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.

Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Fabrice Di Meglio
c70b7f6f35 Improve Search results highlighting
- remove unnecessary code
- use keyed Tag with a well known App key for preventing collisions
- fix missing Brightness Level preference key (used for highlight)

Change-Id: I070e3b8c3cb43da7addd34be192aade21951f57c
2014-06-19 13:58:22 -07:00
Fabrice Di Meglio
6ebcc36514 Update more colors in Data Usage Summary
- use colors from the Settings Theme
- code cleaning for use the Theme accent color constant
instead of raw color value

Change-Id: I04ec913f0b8048b6e50069213e9d92992168fe18
2014-06-18 12:56:04 -07:00
Robert Greenwalt
0d4c500e98 Move mobile data dis/enable to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
2014-05-21 23:18:02 -07:00
Fabrice Di Meglio
2169c88a14 Code cleaning
- use constants where needed for the tag/key
- remove wrong tag

Change-Id: I32578ce6a3a604dc0ea7168206a5d84391e2cce7
2014-04-18 15:18:40 -07:00
Fabrice Di Meglio
f2a5226c1e Improve Preference highlighting
- use PreferenceFragment.onBindPreferences() to launch  highlighting
- improve SettingsPreferenceFragment code for highlighting: now we can
find the View to highlight thru its Tag if there is no ListAdapter available
- add HighlightingFragment for highlighting a View from its tag/key. This
is dealing with cases when the content is custom and not relying on
SettingsPreferenceFragment (like DataUsageSummary)

Also:

- improve DataUsageSummary so that onResume() is not recreating the
Tabs all the time
- add missing "android:keys" on some Security Settings preference files

Change-Id: Ib1dd8238fe2fb57c151d584c0810a0e0a5ad97c4
2014-04-18 13:42:46 -07:00
Fabrice Di Meglio
45f754e506 Add Indexable.SearchIndexProvider.getNonIndexableKeys(Context)
- getNonIndexableKeys(Context) allow a SearchIndexProvider to tell which data
he does not want to index by providing a list of the data keys
- use this new API for SoundSettings and removing KEY_EMERGENCY_TONE related
settings if the device is not CDMA
- add a BaseSearchIndexProvider for code simplification

Change-Id: I23633ace1d7e390ee05fac0a5458a33e04e72d8d
2014-04-11 11:16:33 -07:00
Fabrice Di Meglio
758c3ff8e9 Fix bug #13962001 Search - need to finish indexing "Data usage" Settings
- index missing strings

Change-Id: I015452b58bf7dc576bce8fee03b55b38c0094097
2014-04-10 14:45:18 -07:00
Fabrice Di Meglio
063e7cfd78 Code cleaning for DataUsageSummary
- remove unused import
- remove dead code

Change-Id: I4e8f24e57fc4ca6d731e68da93ac7f748e709c26
2014-04-09 19:02:54 -07:00
Fabrice Di Meglio
90f7a6e06e Fix bug #13167668 stability-sys: Java crash in com.android.settings:
...java.lang.RuntimeException: Unable to destroy activity {com.android.settings/
com.android.settings.Settings}: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState

- revert the change that was done by

https://googleplex-android-review.git.corp.google.com/#/c/148273/2

Also the OnItemClickListener has been changed since that time to cope
with the initial issue.

Change-Id: I0e3a44e6340f5576bb0f46d5a6c6a5824a44b406
2014-02-24 18:37:06 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Amith Yamasani
32aa0bfdd5 am ad541608: am ad0f0edb: Merge "Call to equals() comparing different types"
* commit 'ad54160844177515dfe9024521669e4b47311d0f':
  Call to equals() comparing different types
2013-09-12 09:49:54 -07:00
Amith Yamasani
ad0f0edb54 Merge "Call to equals() comparing different types" 2013-09-12 16:08:20 +00:00