OSDN Git Service
The Android Automerger [Fri, 15 Jul 2011 13:45:38 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
Chia-chi Yeh [Fri, 15 Jul 2011 06:09:58 +0000 (23:09 -0700)]
Merge "VpnSettings: enable MPPE by default."
Chia-chi Yeh [Fri, 15 Jul 2011 06:08:33 +0000 (23:08 -0700)]
VpnSettings: enable MPPE by default.
Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
Jeff Sharkey [Fri, 15 Jul 2011 03:01:13 +0000 (20:01 -0700)]
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
Dianne Hackborn [Fri, 15 Jul 2011 01:29:12 +0000 (18:29 -0700)]
Merge "Follow change in load average service."
Dianne Hackborn [Fri, 15 Jul 2011 00:23:58 +0000 (17:23 -0700)]
Follow change in load average service.
Change-Id: I7d415a140598ef582842f1babdbc88b0e7be3ea9
Chia-chi Yeh [Thu, 14 Jul 2011 22:24:25 +0000 (15:24 -0700)]
Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs."
Chia-chi Yeh [Thu, 14 Jul 2011 22:16:51 +0000 (15:16 -0700)]
VpnSettings: generate arguments for IPSec XAUTH VPNs.
Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
Dianne Hackborn [Thu, 14 Jul 2011 17:56:31 +0000 (10:56 -0700)]
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
Dianne Hackborn [Thu, 14 Jul 2011 17:54:19 +0000 (10:54 -0700)]
Merge "Various small fixes to the debugging settings."
John Wang [Thu, 14 Jul 2011 17:53:03 +0000 (10:53 -0700)]
am
25bd33e1: am
d7b2dccb: Display IMEI and ICCID for LTE device.
* commit '
25bd33e1cfb753ff0a118e6c84f6e23163713b69':
Display IMEI and ICCID for LTE device.
Dianne Hackborn [Thu, 14 Jul 2011 16:18:01 +0000 (09:18 -0700)]
am
7d19d795: am
b41b85dc: am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
7d19d795c8d7a5692879523d8179a8a46226bbbc':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Thu, 14 Jul 2011 02:36:06 +0000 (19:36 -0700)]
Various small fixes to the debugging settings.
Also tweak to follow changes in activity manager.
Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
Dianne Hackborn [Wed, 13 Jul 2011 23:52:15 +0000 (16:52 -0700)]
am
b41b85dc: am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
b41b85dc9b9fe1ee9adb84186c672dcc5a92e9a8':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Wed, 13 Jul 2011 23:50:07 +0000 (16:50 -0700)]
am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
c74500f44e3673b7728c2f619ee3d61a73ad5526':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Wed, 13 Jul 2011 23:36:23 +0000 (16:36 -0700)]
Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
John Wang [Wed, 13 Jul 2011 17:54:17 +0000 (10:54 -0700)]
am
d7b2dccb: Display IMEI and ICCID for LTE device.
* commit '
d7b2dccbe60a02965186d28f0b671ef1c419a2a8':
Display IMEI and ICCID for LTE device.
John Wang [Tue, 12 Jul 2011 00:05:04 +0000 (17:05 -0700)]
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
The Android Automerger [Wed, 13 Jul 2011 14:47:23 +0000 (07:47 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Wed, 13 Jul 2011 03:23:08 +0000 (20:23 -0700)]
Merge "Data usage app labels and system clustering."
Jeff Sharkey [Wed, 13 Jul 2011 03:20:46 +0000 (20:20 -0700)]
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
Svetoslav Ganov [Wed, 13 Jul 2011 00:45:45 +0000 (17:45 -0700)]
Merge "Added touch exploration tutorial to Accessibility settings."
Alan Viverette [Wed, 13 Jul 2011 00:34:22 +0000 (17:34 -0700)]
Added touch exploration tutorial to Accessibility settings.
Change-Id: Ic11f7c41e40de2b32f5815dbc3396a308c451c5b
Svetoslav Ganov [Tue, 12 Jul 2011 22:21:06 +0000 (15:21 -0700)]
Merge "Accessibility settings - divider should be hidden"
Svetoslav Ganov [Tue, 12 Jul 2011 22:01:15 +0000 (15:01 -0700)]
Accessibility settings - divider should be hidden
bug:
5009004
Change-Id: If69d7a94857308ab07ea78d3c68978449bf333c9
Jeff Sharkey [Tue, 12 Jul 2011 20:53:11 +0000 (13:53 -0700)]
Migrate to refactored NetworkStats API.
Change-Id: I76452a67b74df873c88cb9092188e5e4ba83b991
The Android Automerger [Tue, 12 Jul 2011 13:41:16 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
satok [Mon, 11 Jul 2011 22:23:36 +0000 (07:23 +0900)]
Change IME picker dialog from Activity to Broadcast
Change-Id: I7bc3c3aa5544f3cb170703d6e71bad1bd54545b8
Gilles Debunne [Mon, 11 Jul 2011 17:10:30 +0000 (10:10 -0700)]
Merge "Storage correctly updates internal storage graph."
The Android Automerger [Mon, 11 Jul 2011 13:45:10 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Mon, 11 Jul 2011 01:56:30 +0000 (18:56 -0700)]
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
Jeff Sharkey [Sun, 10 Jul 2011 19:23:55 +0000 (12:23 -0700)]
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
The Android Automerger [Sun, 10 Jul 2011 13:46:54 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Sun, 10 Jul 2011 00:52:31 +0000 (17:52 -0700)]
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
Jeff Sharkey [Sat, 9 Jul 2011 21:24:00 +0000 (14:24 -0700)]
Merge "Draw vertical data usage sweep labels."
Jeff Sharkey [Sat, 9 Jul 2011 08:02:56 +0000 (01:02 -0700)]
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
Gilles Debunne [Fri, 8 Jul 2011 23:05:09 +0000 (16:05 -0700)]
Storage correctly updates internal storage graph.
The estimated used size used to be displayed next to the actual applications' size.
Change-Id: I9a9bf1faf638f8495507930e531ca4c851558f26
Gilles Debunne [Fri, 8 Jul 2011 23:01:57 +0000 (16:01 -0700)]
Merge "Changed Settings application theme"
The Android Automerger [Fri, 8 Jul 2011 21:11:09 +0000 (14:11 -0700)]
merge in ics-release history after reset to master
Gilles Debunne [Fri, 8 Jul 2011 18:57:40 +0000 (11:57 -0700)]
Changed Settings application theme
Change-Id: I3c3612fb352b1ef10b3342b9ad8f0306bc787da8
Gilles Debunne [Fri, 8 Jul 2011 16:40:00 +0000 (09:40 -0700)]
Bug
5003461 - Removed animation option
Associated change in DatabaseHelper to reset this value in the database.
Change-Id: I530da617c44773fad31e62f595d0c335daf64148
Gilles Debunne [Thu, 7 Jul 2011 21:24:26 +0000 (14:24 -0700)]
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
Gilles Debunne [Thu, 7 Jul 2011 23:04:53 +0000 (16:04 -0700)]
Merge "Changed text and appearance when Wifi/Bluetooth is off"
Gilles Debunne [Thu, 30 Jun 2011 19:00:28 +0000 (12:00 -0700)]
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
Gilles Debunne [Thu, 7 Jul 2011 22:59:18 +0000 (15:59 -0700)]
Merge "Fixed intents to start Settings activities"
Eric Fischer [Thu, 7 Jul 2011 21:51:58 +0000 (14:51 -0700)]
Merge "Import revised translations."
Chia-chi Yeh [Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)]
Merge "VpnSettings: pass certificates to racoon directly."
Chia-chi Yeh [Thu, 7 Jul 2011 19:49:18 +0000 (12:49 -0700)]
VpnSettings: pass certificates to racoon directly.
Also fix some style issues.
Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
Matthew Xie [Thu, 7 Jul 2011 19:27:41 +0000 (12:27 -0700)]
Merge "Show user dialog for BT connection and phonebook access"
Eric Fischer [Thu, 7 Jul 2011 18:49:07 +0000 (11:49 -0700)]
Import revised translations.
Change-Id: I9f305f5f3c37e90022e21deb5cf262484a5360de
Gilles Debunne [Wed, 6 Jul 2011 20:10:16 +0000 (13:10 -0700)]
Fixed intents to start Settings activities
All tested, on tablet and on phone.
Change-Id: I8ab206b9db61c7c3800fe9bff175e87baf97ed7c
The Android Automerger [Thu, 7 Jul 2011 13:46:06 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
Brian Carlstrom [Wed, 6 Jul 2011 22:13:03 +0000 (15:13 -0700)]
Set progress bar to 0 when done so that will not come back as full
Change-Id: I766e852d029168433a0d47c93dc3110a053f712c
Brian Carlstrom [Wed, 6 Jul 2011 20:45:07 +0000 (13:45 -0700)]
Merge "Convert CA loading from spinning wheel to progress bar"
Brian Carlstrom [Wed, 6 Jul 2011 20:15:03 +0000 (13:15 -0700)]
Convert CA loading from spinning wheel to progress bar
Change-Id: I3d9d596cbdf3ac4751b7b2e297faa0f667d2de02
Brian Carlstrom [Wed, 6 Jul 2011 19:06:20 +0000 (12:06 -0700)]
Merge "Improved presentation of CA list"
Brian Carlstrom [Wed, 6 Jul 2011 06:51:39 +0000 (23:51 -0700)]
Improved presentation of CA list
Change-Id: Ibc6dd9d553c3f7f53453fb43e9842afe789d8b50
Mike Lockwood [Thu, 30 Jun 2011 18:47:46 +0000 (14:47 -0400)]
Super rough implementation of new USB settings
There does not seem to be a way to implement radio buttons in a settings screen,
so I am using check boxes as a temporary hack.
Change-Id: I2d2c7931f689ff04608662b64aafc4862cfef48e
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Automerger [Mon, 4 Jul 2011 13:47:58 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
Chia-chi Yeh [Mon, 4 Jul 2011 10:38:18 +0000 (03:38 -0700)]
Merge "VpnSettings: add status report."
Chia-chi Yeh [Mon, 4 Jul 2011 10:17:33 +0000 (03:17 -0700)]
VpnSettings: add status report.
Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77
satok [Mon, 4 Jul 2011 07:27:53 +0000 (16:27 +0900)]
Update settings for aux imes
Change-Id: I7528241eb0882fa5fae2a80e380375683cce2075
Chia-chi Yeh [Sun, 3 Jul 2011 10:12:46 +0000 (03:12 -0700)]
VpnSettings: rename some variables.
Change-Id: I0550bebc55a42ad11768729d098ff5258442747e
Chia-chi Yeh [Sun, 3 Jul 2011 00:45:23 +0000 (17:45 -0700)]
VpnSettings: switch to the new user interface.
Change-Id: I7158cd8f146677b2823cfa936792fd232a37ae28
Chia-chi Yeh [Sun, 3 Jul 2011 00:29:09 +0000 (17:29 -0700)]
Merge changes I266f8403,Ia4dc4b23
* changes:
VpnSettings: hook up the legacy VPN with IConnectivityManager.
VpnSettings: IPSec Hybrid RSA does not need user certificate.
Chia-chi Yeh [Sun, 3 Jul 2011 00:26:26 +0000 (17:26 -0700)]
VpnSettings: hook up the legacy VPN with IConnectivityManager.
The status report is not implemented yet.
Change-Id: I266f840371e3698f779124d5e67bafe4d272cd94
Chia-chi Yeh [Sun, 3 Jul 2011 00:18:37 +0000 (17:18 -0700)]
VpnSettings: IPSec Hybrid RSA does not need user certificate.
Apparently I was confused...
Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d
Dianne Hackborn [Sat, 2 Jul 2011 02:09:56 +0000 (19:09 -0700)]
Merge "Move the main interesting DevTools settings into the main settings app."
Dianne Hackborn [Sat, 2 Jul 2011 01:56:09 +0000 (18:56 -0700)]
Move the main interesting DevTools settings into the main settings app.
These are in the "development" section of the settings app, expanding
on ADB and other stuff that is already there.
Change-Id: I61a4955df0c548dcf1f39be46d21e8b8d02e454a
Gilles Debunne [Fri, 1 Jul 2011 22:04:20 +0000 (15:04 -0700)]
Merge "AdvancedSettings replaced by AdvancedWifiSettings"
Gilles Debunne [Fri, 1 Jul 2011 21:25:46 +0000 (14:25 -0700)]
Merge "Fixed titles that differ from their link titles"
John Wang [Fri, 1 Jul 2011 16:21:16 +0000 (09:21 -0700)]
am
ab824c81: (-s ours) am
f44308a7: Display FCC id for LTE in Settings.
* commit '
ab824c8161207c6e957440b66a899cd9656b1ddf':
Display FCC id for LTE in Settings.
Chia-chi Yeh [Fri, 1 Jul 2011 06:36:52 +0000 (23:36 -0700)]
Merge "VpnSettings: rename some fields."
Chia-chi Yeh [Fri, 1 Jul 2011 06:34:53 +0000 (23:34 -0700)]
VpnSettings: rename some fields.
Change-Id: I999b773192d167f21c4a684c1864c37b9a433390
Johannes Carlsson [Mon, 20 Dec 2010 12:42:54 +0000 (13:42 +0100)]
Fix NPE due to missing ProcessItem.mPackageInfo
The reason was that a item was removed from the SparseArray while
iterating it causing one ProcessItem to be skipped in the loop which
makes sure that mPackageInfo is not null. This happens when all
processes for one uid is stopped and a new process is created.
This problem was found by running monkey.
Change-Id: I5e9a76e8007819d5e6d9ba15af0c2362da193526
Jim Miller [Fri, 1 Jul 2011 02:25:16 +0000 (19:25 -0700)]
Merge "Fix
4686480: Update ChooseLockPatternTutorial"
Gilles Debunne [Fri, 1 Jul 2011 02:09:28 +0000 (19:09 -0700)]
Fixed titles that differ from their link titles
Change-Id: Ifa7138a907a6adca05b8906b77f185c78583bff5
Jim Miller [Fri, 1 Jul 2011 01:09:06 +0000 (18:09 -0700)]
Fix
4686480: Update ChooseLockPatternTutorial
- Shorten description string to fit on one page
- Use new scalable LockPatternView to show example pattern.
Change-Id: I1204b6de9da05d9d3f4e503bec2fc4fb3034a4b3
Brian Carlstrom [Fri, 1 Jul 2011 01:06:31 +0000 (18:06 -0700)]
Merge "Fix TrustedCredentialsSettings for small screens"
Brian Carlstrom [Thu, 30 Jun 2011 17:41:02 +0000 (10:41 -0700)]
Fix TrustedCredentialsSettings for small screens
Change-Id: I01149a88b044d0f95db01039aabba62666e8f397
Gilles Debunne [Fri, 1 Jul 2011 00:20:33 +0000 (17:20 -0700)]
AdvancedSettings replaced by AdvancedWifiSettings
Change-Id: Ie51d14c9961e8780c8774bbe56e113cf85357817
John Wang [Thu, 30 Jun 2011 23:41:15 +0000 (16:41 -0700)]
am
f44308a7: Display FCC id for LTE in Settings.
* commit '
f44308a78d35db9cc211f26cd811c067460b18f1':
Display FCC id for LTE in Settings.
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Gilles Debunne [Thu, 30 Jun 2011 22:44:05 +0000 (15:44 -0700)]
Bluetooth messages improved.
Tap to pair in place of searching. Message when no device is found.
Change-Id: I0a4b1fa140e8a30b154ae2686e9c75d3768fc44e
Amith Yamasani [Thu, 30 Jun 2011 19:09:34 +0000 (12:09 -0700)]
Merge "Re-enable hardware acceleration. Driver bug seems fixed."
Amith Yamasani [Thu, 30 Jun 2011 19:07:41 +0000 (12:07 -0700)]
Re-enable hardware acceleration. Driver bug seems fixed.
Bug:
4883047
Change-Id: If6aae8fdff8a0d144e595f6e7cf4241800d18554
Amith Yamasani [Thu, 30 Jun 2011 18:06:52 +0000 (11:06 -0700)]
Fix a crash on certain devices in Storage settings.
Bug:
4980974
Change-Id: If4b89f9cb1813c30ced6d7093381a01a5aa00346
The Android Automerger [Thu, 30 Jun 2011 13:44:29 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
satok [Mon, 27 Jun 2011 14:44:01 +0000 (23:44 +0900)]
Implement new UI for IME settings
Bug:
4645160
Change-Id: If9046e7e96732f6ee4c0594cc66622b6462bdec9
Matthew Xie [Tue, 28 Jun 2011 01:21:25 +0000 (18:21 -0700)]
Show user dialog for BT connection and phonebook access
Show user dialog for incoming BT connection requests from unknown
devices. Move phone book access permission dialog from bluetooth to settings.
The permision dialog pops up to the screen properly instead of
always as notification. AT+CPBR will also use the permission dialog
to ask for user permission.
bug
4489572
Change-Id: Ic1e74b2a9416a462cac4f519240a313691da90c4
Dianne Hackborn [Thu, 30 Jun 2011 00:37:47 +0000 (17:37 -0700)]
Merge "Fix up storage UI for old USB storage."
Amith Yamasani [Thu, 30 Jun 2011 00:31:49 +0000 (17:31 -0700)]
Merge "Add PowerUsageSummary to proguard list."
Amith Yamasani [Thu, 30 Jun 2011 00:24:14 +0000 (17:24 -0700)]
Add PowerUsageSummary to proguard list.
Bug:
4975279
Change-Id: I8e36dd6ce6f0e6a7859af00e7980e636933140fb
Gilles Debunne [Wed, 29 Jun 2011 22:59:21 +0000 (15:59 -0700)]
Merge "Double list in Bluetooth Settings"
Dianne Hackborn [Tue, 28 Jun 2011 21:51:12 +0000 (14:51 -0700)]
Fix up storage UI for old USB storage.
- In the storage overview, if storage is not emulated then we have a
new first section showing internal storage.
- In manage applications, we know show storage use on the SD card
separately from internal storage use.
Change-Id: I7eb993f59fdb5de5f5dcfe4a3bc2b95ae30d754a
Chia-chi Yeh [Wed, 29 Jun 2011 22:33:58 +0000 (15:33 -0700)]
Merge "VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs."
Chia-chi Yeh [Wed, 29 Jun 2011 22:29:28 +0000 (15:29 -0700)]
VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.
Change-Id: Ia58afa2f6f6d4b1b208bf6b893b8b7712154bdbf
The Android Automerger [Wed, 29 Jun 2011 13:46:29 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
Brian Carlstrom [Wed, 29 Jun 2011 03:05:46 +0000 (20:05 -0700)]
Merge "Follow naming conventions of proguard.flags"
Brian Carlstrom [Wed, 29 Jun 2011 02:57:14 +0000 (19:57 -0700)]
Follow naming conventions of proguard.flags
Change-Id: Idbd136fb25447aa1f6629d8caa17b87924ed3936