Commit Graph

4498 Commits

Author SHA1 Message Date
Gilles Debunne
3dba8d527f Merge "Fix for QUICK_LAUNCH_SETTINGS intent" 2011-07-15 11:04:08 -07:00
Svetoslav Ganov
6c390fc6ae Merge "Polishing accessibility tutorial UI." 2011-07-15 11:00:54 -07:00
Alan Viverette
0a08e1fcbd Polishing accessibility tutorial UI.
Change-Id: I059f00e94cdc906935b2d42a505f31512dd99668
2011-07-15 10:45:16 -07:00
Gilles Debunne
42a7a7112f Merge "No split action bar in screens with one action" 2011-07-15 09:41:30 -07:00
Chia-chi Yeh
dcfb7f3f60 Merge "VpnSettings: enable MPPE by default." 2011-07-14 23:09:58 -07:00
Chia-chi Yeh
0fe97ebcd8 VpnSettings: enable MPPE by default.
Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
2011-07-14 23:08:33 -07:00
Jeff Sharkey
9549e9f377 More data usage radio combinations, testing.
Offer Ethernet data when present, and better handling of devices
with various radio combinations.  Include "setprop" to help testing
in future.

Adopt new NetworkTemplate building in framework, and avoid crash
when AsyncTask finishes after Fragment is removed.

Bug: 5026016, 5029874
Change-Id: Ib7ab501d0111b9860a91c248193919663d47f2a2
2011-07-14 20:43:30 -07:00
Dianne Hackborn
45c04be1f6 Merge "Follow change in load average service." 2011-07-14 18:29:12 -07:00
Gilles Debunne
201071cd37 Fix for QUICK_LAUNCH_SETTINGS intent
Added android.settings.QUICK_LAUNCH_SETTINGS as a new action name.
This is how it is referenced in public framework's Settings.
Kept the com.android version for backward compatibility.

Change-Id: I8ce2ff9de86ec20dbc1e9a89f971d2b2219a70f9
2011-07-14 18:03:07 -07:00
Dianne Hackborn
c5ec5be6e4 Follow change in load average service.
Change-Id: I7d415a140598ef582842f1babdbc88b0e7be3ea9
2011-07-14 17:23:58 -07:00
Chia-chi Yeh
403d7fe526 Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs." 2011-07-14 15:24:25 -07:00
Chia-chi Yeh
f35130dd79 VpnSettings: generate arguments for IPSec XAUTH VPNs.
Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
2011-07-14 15:16:51 -07:00
Dianne Hackborn
6c21377ff7 am f70f60c4: am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit 'f70f60c4dcfa576ea4ca9eda88eb1f258d1b38f1':
  Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-14 10:56:31 -07:00
Dianne Hackborn
5231e3d70d Merge "Various small fixes to the debugging settings." 2011-07-14 10:54:19 -07:00
John Wang
53c8c1b8e7 am 25bd33e1: am d7b2dccb: Display IMEI and ICCID for LTE device.
* commit '25bd33e1cfb753ff0a118e6c84f6e23163713b69':
  Display IMEI and ICCID for LTE device.
2011-07-14 10:53:03 -07:00
Dianne Hackborn
f70f60c4dc am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '7d19d795c8d7a5692879523d8179a8a46226bbbc':
  Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-14 09:18:01 -07:00
Dianne Hackborn
83b09a57e1 Various small fixes to the debugging settings.
Also tweak to follow changes in activity manager.

Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
2011-07-14 00:54:39 -07:00
Dianne Hackborn
7d19d795c8 am b41b85dc: am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit 'b41b85dc9b9fe1ee9adb84186c672dcc5a92e9a8':
  Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-13 16:52:15 -07:00
Dianne Hackborn
b41b85dc9b am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526':
  Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-13 16:50:07 -07:00
Dianne Hackborn
c74500f44e Merge "Fix NPE due to missing ProcessItem.mPackageInfo" 2011-07-13 16:36:23 -07:00
John Wang
25bd33e1cf am d7b2dccb: Display IMEI and ICCID for LTE device.
* commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8':
  Display IMEI and ICCID for LTE device.
2011-07-13 10:54:17 -07:00
John Wang
d7b2dccbe6 Display IMEI and ICCID for LTE device.
Display IMEI nad ICCID in About tablet / Status for LTE devices.

bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b
2011-07-13 10:25:29 -07:00
Jeff Sharkey
1aa671cba7 Merge "Data usage app labels and system clustering." 2011-07-12 20:23:08 -07:00
Jeff Sharkey
518bc9df8b Data usage app labels and system clustering.
Cluster all non-applications under single "Android OS" label, and
correctly label uninstalled applications.  Match API changes that now
return correct historical usage around current time.

Bug: 4975314, 4691901
Change-Id: Icec1c54ff3404e1525878516b0a438f757dcb758
2011-07-12 20:20:46 -07:00
Svetoslav Ganov
1816f06a59 Merge "Added touch exploration tutorial to Accessibility settings." 2011-07-12 17:45:45 -07:00
Alan Viverette
d21bfa1524 Added touch exploration tutorial to Accessibility settings.
Change-Id: Ic11f7c41e40de2b32f5815dbc3396a308c451c5b
2011-07-12 17:34:22 -07:00
Svetoslav Ganov
4b3877598c Merge "Accessibility settings - divider should be hidden" 2011-07-12 15:21:06 -07:00
Svetoslav Ganov
6953a6cd8f Accessibility settings - divider should be hidden
bug:5009004

Change-Id: If69d7a94857308ab07ea78d3c68978449bf333c9
2011-07-12 15:01:20 -07:00
Jeff Sharkey
ebae659fc7 Migrate to refactored NetworkStats API.
Change-Id: I76452a67b74df873c88cb9092188e5e4ba83b991
2011-07-12 13:53:11 -07:00
satok
078b435743 Change IME picker dialog from Activity to Broadcast
Change-Id: I7bc3c3aa5544f3cb170703d6e71bad1bd54545b8
2011-07-12 10:39:37 +09:00
Gilles Debunne
162e541011 No split action bar in screens with one action
Bug 5012012

Change-Id: I87d38e0cc97762aa9043b0c5834a42848cc2a0fe
2011-07-11 14:14:45 -07:00
Gilles Debunne
76dc6abf09 Merge "Storage correctly updates internal storage graph." 2011-07-11 10:10:30 -07:00
Jeff Sharkey
398b18fca7 Force poll on data usage launch.
When lauching data usage, force NetworkStatsService poll to update
with recent data.  Also move UID summary data to Loader pattern.

Bug: 4515856
Change-Id: Ia8c70d8d0c863da3b8e956e4066d4f69fba30473
2011-07-10 18:56:48 -07:00
Jeff Sharkey
4ec71e79ef Prevent data usage chart sweeps from crossing.
Add rules to clamp sweeps, since it doesn't make sense to have a
limit below warning.

Bug: 4598462
Change-Id: I3323c7bca7fabe3e3f1e9c89906c3a921103579c
2011-07-10 12:23:55 -07:00
Jeff Sharkey
9fab0da184 Roaming and background controls under data usage.
Add action items to control mobile data roaming and background data
controls, along with dialogs to confirm.  Still need to fix telephony
to watch for Settings.Secure changes.

Hide "Change cycle" item when viewing app details.  Handle special
case where data usage doesn't want split action bar.

Bug: 4818009, 4979025, 4948767, 5010948
Change-Id: I363ff76a9daf2528d81573cf8d0687719d664bb0
2011-07-09 17:52:42 -07:00
Jeff Sharkey
9f81ee87ef Merge "Draw vertical data usage sweep labels." 2011-07-09 14:24:00 -07:00
Jeff Sharkey
ec3be8a4a5 Draw vertical data usage sweep labels.
Using template string, ask axis to build label for sweeps.  Also
clean up margins exposed to parent view, since we offset when label
is larger than sweep drawable.

Bug: 4598460
Change-Id: If71bc8ec8c952023325c80b9bc00b63c23609c7a
2011-07-09 01:02:56 -07:00
Gilles Debunne
b7609ff999 Storage correctly updates internal storage graph.
The estimated used size used to be displayed next to the actual applications' size.

Change-Id: I9a9bf1faf638f8495507930e531ca4c851558f26
2011-07-08 16:07:33 -07:00
Gilles Debunne
624b55cc20 Merge "Changed Settings application theme" 2011-07-08 16:01:57 -07:00
Gilles Debunne
88b6f48c03 Changed Settings application theme
Change-Id: I3c3612fb352b1ef10b3342b9ad8f0306bc787da8
2011-07-08 11:57:40 -07:00
Gilles Debunne
737c81c775 Bug 5003461 - Removed animation option
Associated change in DatabaseHelper to reset this value in the database.

Change-Id: I530da617c44773fad31e62f595d0c335daf64148
2011-07-08 11:56:48 -07:00
Gilles Debunne
dfc2637eba Removed summary text and categories in Wireless settings
Bug 5002377 and 5002476.

Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
2011-07-08 10:05:14 -07:00
Gilles Debunne
6dc0f9639e Refactor Bluetooth settings
Two lists: paired devices and available devices.
New item at top for the device itself (not connected to discoverable, this is a larger
refactoring).

New settings icon.

Change-Id: I788a6c0afdb07309d449a4d41a02cf8480c95a37
2011-07-08 09:40:47 -07:00
Gilles Debunne
606d878852 Merge "Changed text and appearance when Wifi/Bluetooth is off" 2011-07-07 16:04:53 -07:00
Gilles Debunne
18e9992a5e Changed text and appearance when Wifi/Bluetooth is off
A TextView is used as an empty view, centered on screen with the message.

Change-Id: I33825775d6b2ed212e5839cfac84d055b9336667
2011-07-07 16:04:00 -07:00
Gilles Debunne
8b3c13bf48 Merge "Fixed intents to start Settings activities" 2011-07-07 15:59:18 -07:00
Eric Fischer
890e352d5f Merge "Import revised translations." 2011-07-07 14:51:58 -07:00
Chia-chi Yeh
78c603747e Merge "VpnSettings: pass certificates to racoon directly." 2011-07-07 14:29:12 -07:00
Chia-chi Yeh
413b171159 VpnSettings: pass certificates to racoon directly.
Also fix some style issues.

Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
2011-07-07 14:23:51 -07:00
Matthew Xie
722934dbbc Merge "Show user dialog for BT connection and phonebook access" 2011-07-07 12:27:41 -07:00