OSDN Git Service
Jeff Sharkey [Fri, 20 Jul 2012 00:09:52 +0000 (17:09 -0700)]
Migrate VpnProfile definition to framework.
Bug:
5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
Ying Wang [Thu, 19 Jul 2012 21:49:25 +0000 (14:49 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Thu, 19 Jul 2012 21:25:23 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e18288959114e14da70f4a5a9f212c61e5180e2
Auto-generated-cl: translation import
Adam Powell [Thu, 19 Jul 2012 02:02:39 +0000 (19:02 -0700)]
Configure task affinity for main Settings activities
Change-Id: Iae98093a186a125f21bf807dfb1acc1a1bf4184a
The Android Open Source Project [Thu, 19 Jul 2012 15:52:27 +0000 (08:52 -0700)]
am
5924943c: Reconcile with jb-mr0-release jb-release
* commit '
5924943c91bd98781c358d904b10eb2638b442ea':
Display FCC id for LTE in Settings.
The Android Open Source Project [Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
The Android Automerger [Thu, 19 Jul 2012 04:44:53 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 19 Jul 2012 03:21:24 +0000 (20:21 -0700)]
am
4b7c4f1c: (-s ours) am
2bc05a27: Import translations. DO NOT MERGE
* commit '
4b7c4f1c12eb77d57670acc7f573747acd4f80d5':
Import translations. DO NOT MERGE
Ying Wang [Thu, 19 Jul 2012 03:14:18 +0000 (20:14 -0700)]
am
2bc05a27: Import translations. DO NOT MERGE
* commit '
2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
Import translations. DO NOT MERGE
Ying Wang [Wed, 18 Jul 2012 23:21:50 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b0f3d1b63c405fe1bcc3152bb49763ae0dbb7fe
Auto-generated-cl: translation import
Ying Wang [Wed, 18 Jul 2012 23:18:09 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 21:11:54 +0000 (14:11 -0700)]
am
12a652b2: (-s ours) am
fa0f3fe1: Import translations. DO NOT MERGE
* commit '
12a652b2ec5213bbfb2b24d00828727113ac688d':
Import translations. DO NOT MERGE
Wink Saville [Tue, 17 Jul 2012 21:08:50 +0000 (14:08 -0700)]
am
322cd6e1: (-s ours) am
9ad4a898: (-s ours) Use telephony-common - DO NOT MERGE
* commit '
322cd6e1eea928fb890bc4b87e7349e887f49595':
Use telephony-common - DO NOT MERGE
Ying Wang [Tue, 17 Jul 2012 20:41:39 +0000 (13:41 -0700)]
am
fa0f3fe1: Import translations. DO NOT MERGE
* commit '
fa0f3fe16225c57c91c9fe51981dc03f29938746':
Import translations. DO NOT MERGE
Ying Wang [Tue, 17 Jul 2012 19:59:04 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31055b1f7d52718773adef01fa16365be3931d15
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 19:54:32 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
Wink Saville [Tue, 17 Jul 2012 19:36:41 +0000 (12:36 -0700)]
am
9ad4a898: (-s ours) Use telephony-common - DO NOT MERGE
* commit '
9ad4a89877363a6f1128b258f6535b29d2f778e2':
Use telephony-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:31:40 +0000 (12:31 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common - DO NOT MERGE
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Matthew Xie [Fri, 29 Jun 2012 01:41:54 +0000 (18:41 -0700)]
Clean up codes, fix long lines, improve readability, etc
Update copyright date, remove unused variable, import
Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
Kausik Sinnaswamy [Tue, 5 Jun 2012 16:16:21 +0000 (21:46 +0530)]
On an incoming pairing of a newly paired device, setPreferred of the
profiles needs to be called to enable incoming/outgoing connections
Change-Id: Ic90e4857fb119e31639e4a50db48b084201aadb2
Kausik Sinnaswamy [Fri, 1 Jun 2012 10:38:04 +0000 (16:08 +0530)]
Fixed a race condition during pairing with carkits wherein connect was
issued even before ACTION.uuid changed was received.
Change-Id: Iafc2c61b92537a219e46e08366fab1ad5f4e97bd
Ravi Nagarajan [Tue, 29 May 2012 11:43:23 +0000 (17:13 +0530)]
On bluetooth disable, delete all devices that are not bonded
Change-Id: If66d54eb4d953c4cc78a22a8b3e89e42bc16f5f4
Syed Ibrahim M [Fri, 25 May 2012 09:58:57 +0000 (15:28 +0530)]
Fix to update the checkbox attribute values after connect() is called; This is to make sure for profiles like HID where re-connection can happen only from the device side, the UI is updated to be in sync with the right priority of the corresponding profiles
Change-Id: I4a17d8bbf584e6e64519fe3508bccd5d167a020d
Kausik Sinnaswamy [Tue, 22 May 2012 10:45:55 +0000 (03:45 -0700)]
Revert "Changes done to update UI with appropriate checkbox state, when AVRC Connect is initiated from the headset. Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset"
This reverts commit
2f9d962940cb92c7f70576a29f263258f6abc478
Ravi Nagarajan [Tue, 22 May 2012 12:38:48 +0000 (18:08 +0530)]
Headset connection status is displayed incorrectly, as the boolean mIsProfileReady is not initalized properly. Make sure mIsProfileReady is initialized always when onServiceConnected is received
Change-Id: I968ce6900121a6140256b3181c792d421bdb7cf6
fredc [Sat, 19 May 2012 17:17:14 +0000 (10:17 -0700)]
Fixed null pointer exception when BT is enabled from settings screen with previously bonded devices
Change-Id: Ia0cf763920fd99897994ea15445aec1dcd48853e
Sreenidhi T [Wed, 16 May 2012 11:25:31 +0000 (04:25 -0700)]
Changes done to update UI with appropriate checkbox state, when AVRC Connect is initiated from the headset.
Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset
Change-Id: Ic46a8a87b74cbe76f0e8b62428516af5594526ec
Kausik Sinnaswamy [Wed, 16 May 2012 09:01:45 +0000 (14:31 +0530)]
Clear the Available (unbonded devices) from the CachedDevices List
during BT disable.
Change-Id: I576237a4165759fe952690f19fde59ce78cd1d29
Swaminatha Balaji [Wed, 9 May 2012 08:44:38 +0000 (01:44 -0700)]
Auto connect hf/a2dp when any one of them gets connected and timeout happens
Change-Id: I6249c2fceab87f91c6629d19f72268d000ecf61c
fredc [Wed, 9 May 2012 00:56:24 +0000 (17:56 -0700)]
Fixed settings crash fix when profile is connected, Bluetooth turned off/of and phone is rebooted
Change-Id: I8738569c24a3c6cc9166b38719c1e918d990242c
Swaminatha Balaji [Fri, 27 Apr 2012 16:18:38 +0000 (09:18 -0700)]
Auto connect hf/a2dp
Change-Id: I4cb260a1f794c2e094a0b19bdc1df919c4287232
fredc [Tue, 24 Apr 2012 10:47:53 +0000 (03:47 -0700)]
Fixed issue with Settings app crashing after turning on/off and clicking unpair
Change-Id: Icc7667cea62251074ae38aa2d650c88a51d8eab6
zzy [Sun, 15 Apr 2012 00:25:17 +0000 (17:25 -0700)]
Added null pointer check
Srikanth Uppala [Fri, 13 Apr 2012 11:10:09 +0000 (04:10 -0700)]
add discoverability timoeut when set by 3rd party app
Change-Id: Ibfd358121f8f9fbbf3b9bc06c5be7b9300e0ba53
Kausik Sinnaswamy [Mon, 9 Apr 2012 14:40:53 +0000 (20:10 +0530)]
Enable exported:true flag to ensure that intents from other applications
can be received
Change-Id: Ic5f84b37d53b0fe122f011c6e4080d3a5744354f
Srikanth Uppala [Wed, 4 Apr 2012 10:32:22 +0000 (03:32 -0700)]
Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup
Change-Id: Ia7a8611d7212b9201994034d17da1d18e106107b
Harish Paryani [Thu, 8 Mar 2012 02:19:44 +0000 (18:19 -0800)]
Disconnect before Unpair
Ying Wang [Mon, 16 Jul 2012 21:30:45 +0000 (14:30 -0700)]
am
65b1230e: (-s ours) am
66daca6b: Import translations. DO NOT MERGE
* commit '
65b1230ea9829246d2bc8073974440a3a49af55c':
Import translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 21:25:53 +0000 (14:25 -0700)]
am
66daca6b: Import translations. DO NOT MERGE
* commit '
66daca6b24c166423438a1729b6a1e67d8def5b8':
Import translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 20:01:22 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I91f57e5dbf11a05e21b5c9f90cc8b3fb000ceaab
Auto-generated-cl: translation import
Ying Wang [Mon, 16 Jul 2012 19:57:58 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief2131970749fdea0ec210f4d9ab309e671eb166
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 14 Jul 2012 00:54:45 +0000 (17:54 -0700)]
am
b2a16b92: am
ea819b07: Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
* commit '
b2a16b9202f6daa609d152ffc2fd273088fbb1ac':
Implement issue #
6819955: Add button to take bug report.
Dianne Hackborn [Sat, 14 Jul 2012 00:06:00 +0000 (17:06 -0700)]
am
ea819b07: Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
* commit '
ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6':
Implement issue #
6819955: Add button to take bug report.
Dianne Hackborn [Sat, 14 Jul 2012 00:03:43 +0000 (17:03 -0700)]
Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
Dianne Hackborn [Fri, 13 Jul 2012 21:26:23 +0000 (14:26 -0700)]
Implement issue #
6819955: Add button to take bug report.
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
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
Ying Wang [Fri, 13 Jul 2012 21:04:49 +0000 (14:04 -0700)]
am
fc567c26: (-s ours) am
4b25c5ad: Import translations. DO NOT MERGE
* commit '
fc567c2665da9d093bf3dd6868b7618f96c83183':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 20:51:57 +0000 (13:51 -0700)]
am
4b25c5ad: Import translations. DO NOT MERGE
* commit '
4b25c5ad8236feab94956d4626fe5c1409e5b989':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 20:12:21 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25f8e8923c50377df9a517538e6b76bafac4af9a
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 20:09:18 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
Dianne Hackborn [Thu, 12 Jul 2012 23:37:32 +0000 (16:37 -0700)]
Merge "If external storage is emulated, don't show it as separate entries."
Dianne Hackborn [Thu, 12 Jul 2012 22:20:13 +0000 (15:20 -0700)]
If external storage is emulated, don't show it as separate entries.
The installed app details UI is really complicted for the two-partition
internal and external storage case... however, in our lovely new world
of emulated external storage, there is no reason for this, since the
external storage is using the same partition as internal storage. So
in this case, don't show external storage as a separate item, just
combine it into the base app size and data size values.
Change-Id: Iea0e78f2d532ad50e20fef98740c93b2e897890a
Ying Wang [Thu, 12 Jul 2012 22:07:45 +0000 (15:07 -0700)]
am
a0a480ad: (-s ours) am
62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
a0a480ad0426940328fdaaa593624e37ab40bff0':
Import translations. DO NOT MERGE
John Wang [Thu, 12 Jul 2012 22:07:45 +0000 (15:07 -0700)]
am
e8b25302: am
b0b45c02: Display FCC id for LTE in Settings.
* commit '
e8b2530260abc74e570ae266b49bade240f14913':
Display FCC id for LTE in Settings.
Ying Wang [Thu, 12 Jul 2012 21:29:15 +0000 (14:29 -0700)]
am
62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
62acae4f85c937e2f0a883a47b2819f122b84675':
Import translations. DO NOT MERGE
John Wang [Thu, 12 Jul 2012 21:29:13 +0000 (14:29 -0700)]
am
b0b45c02: Display FCC id for LTE in Settings.
* commit '
b0b45c02ec73c87f78a8358a7e98747bd96ec103':
Display FCC id for LTE in Settings.
Ying Wang [Thu, 12 Jul 2012 21:25:51 +0000 (14:25 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Thu, 12 Jul 2012 20:18:58 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e9254f65e3c315c5f60414d1ac209622634ec36
Auto-generated-cl: translation import
Ying Wang [Thu, 12 Jul 2012 20:15:15 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
The Android Automerger [Thu, 12 Jul 2012 06:13:32 +0000 (23:13 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Thu, 12 Jul 2012 01:11:15 +0000 (18:11 -0700)]
Merge commit '
5543404a' into mit
* commit '
5543404a':
Use telephony-common
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
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Ying Wang [Wed, 11 Jul 2012 21:49:56 +0000 (14:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba8d713f8a137400874a02e1741499fb7248937c
Auto-generated-cl: translation import
Ying Wang [Tue, 10 Jul 2012 21:24:41 +0000 (14:24 -0700)]
am
e9a717fb: (-s ours) am
efc229b3: Import translations. DO NOT MERGE
* commit '
e9a717fb77c1be7ee5f27f57c01dad50753a055a':
Import translations. DO NOT MERGE
Ying Wang [Tue, 10 Jul 2012 21:23:12 +0000 (14:23 -0700)]
am
efc229b3: Import translations. DO NOT MERGE
* commit '
efc229b3c3c969eef1d32d62435741228b96aeb9':
Import translations. DO NOT MERGE
Ying Wang [Tue, 10 Jul 2012 20:45:13 +0000 (13:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2979386d0d62cd5077ab1b4225b600d49a88fb2
Auto-generated-cl: translation import
Ying Wang [Tue, 10 Jul 2012 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
Ying Wang [Mon, 9 Jul 2012 21:04:01 +0000 (14:04 -0700)]
am
5d950a82: (-s ours) am
051619c0: Import translations. DO NOT MERGE
* commit '
5d950a8277261018047dda84966d9c2ec092520e':
Import translations. DO NOT MERGE
Ying Wang [Mon, 9 Jul 2012 21:01:43 +0000 (14:01 -0700)]
am
051619c0: Import translations. DO NOT MERGE
* commit '
051619c06338f776fd361c313b515c676fb74331':
Import translations. DO NOT MERGE
Ying Wang [Mon, 9 Jul 2012 20:23:39 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf87c5d0c99bf4c9214b1d6a41ee19a9224b6f05
Auto-generated-cl: translation import
Ying Wang [Mon, 9 Jul 2012 20:20:45 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
Ying Wang [Tue, 3 Jul 2012 21:58:36 +0000 (14:58 -0700)]
am
51b2fef2: (-s ours) am
39aade5b: Import translations. DO NOT MERGE
* commit '
51b2fef23587671007e38716db2a59ce60bf9e7f':
Import translations. DO NOT MERGE
Ying Wang [Tue, 3 Jul 2012 21:56:07 +0000 (14:56 -0700)]
am
39aade5b: Import translations. DO NOT MERGE
* commit '
39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
Import translations. DO NOT MERGE
Ying Wang [Tue, 3 Jul 2012 21:51:45 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Tue, 3 Jul 2012 20:44:53 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I47f714a1547115d65d08bda8a681f052ebc16d77
Auto-generated-cl: translation import
Ying Wang [Tue, 3 Jul 2012 20:41:30 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
Irfan Sheriff [Tue, 3 Jul 2012 19:23:23 +0000 (12:23 -0700)]
am
51cc655c: am
2fad853b: Merge "Limit length of SSID input string to 32"
* commit '
51cc655ccdb8c78759095c709967a2185f2f61d8':
Limit length of SSID input string to 32
Irfan Sheriff [Tue, 3 Jul 2012 19:23:21 +0000 (12:23 -0700)]
am
7c8363eb: am
d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '
7c8363eb11b61f712e982b161a2267c2731df6fa':
wifi: update text displayed during hotspot on/off
Irfan Sheriff [Tue, 3 Jul 2012 19:18:35 +0000 (12:18 -0700)]
am
2fad853b: Merge "Limit length of SSID input string to 32"
* commit '
2fad853bf7282676ee3f2ec87630de5fdbcb236b':
Limit length of SSID input string to 32
Irfan Sheriff [Tue, 3 Jul 2012 19:18:33 +0000 (12:18 -0700)]
am
d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '
d80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
The Android Open Source Project [Tue, 3 Jul 2012 19:17:14 +0000 (12:17 -0700)]
The Android Open Source Project [Tue, 3 Jul 2012 19:12:16 +0000 (12:12 -0700)]
Reconcile with jb-release
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
Irfan Sheriff [Tue, 3 Jul 2012 18:35:43 +0000 (11:35 -0700)]
Merge "Limit length of SSID input string to 32"
Irfan Sheriff [Tue, 3 Jul 2012 18:30:05 +0000 (11:30 -0700)]
Merge "wifi: update text displayed during hotspot on/off"
The Android Automerger [Mon, 2 Jul 2012 23:21:14 +0000 (16:21 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 2 Jul 2012 21:57:34 +0000 (14:57 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 2 Jul 2012 21:40:15 +0000 (14:40 -0700)]
am
23513ea5: (-s ours) am
a1146f83: Import translations. DO NOT MERGE
* commit '
23513ea53e7d0813987471b56b434186e561b30a':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 21:37:15 +0000 (14:37 -0700)]
am
a1146f83: Import translations. DO NOT MERGE
* commit '
a1146f83a985ce613145ae1e89b9e7311906a3b7':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 20:58:53 +0000 (13:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16
Auto-generated-cl: translation import
Eric Fischer [Mon, 2 Jul 2012 20:55:16 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
The Android Automerger [Mon, 2 Jul 2012 19:57:04 +0000 (12:57 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 01:02:44 +0000 (18:02 -0700)]
am
d15183a9: (-s ours) am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
d15183a971590ca0e32bc78c8ed2a3470009fbae':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:59:04 +0000 (17:59 -0700)]
am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:55:02 +0000 (17:55 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Sat, 30 Jun 2012 00:54:50 +0000 (17:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dianne Hackborn [Fri, 29 Jun 2012 22:47:09 +0000 (15:47 -0700)]
am
d601be8f: am
313ab172: Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '
d601be8f945833ea95e6aaae769efb8ed26d964a':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:43:34 +0000 (15:43 -0700)]
am
313ab172: Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '
313ab1727014d535790bc89afdcf725ff936e5b4':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:01:23 +0000 (15:01 -0700)]
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
The installed app details was not correctly distinguishing between cache and
normal data on external storage. The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.
Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47