Ying Wang
4b25c5ad82
Import translations. DO NOT MERGE
...
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
2012-07-13 13:09:18 -07:00
Dianne Hackborn
bbc3680e86
Merge "If external storage is emulated, don't show it as separate entries."
2012-07-12 16:37:32 -07:00
Dianne Hackborn
1f6ddac9f4
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
2012-07-12 16:26:44 -07:00
Ying Wang
3597263729
am a0a480ad
: (-s ours) am 62acae4f
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'a0a480ad0426940328fdaaa593624e37ab40bff0':
Import translations. DO NOT MERGE
2012-07-12 15:07:45 -07:00
John Wang
022fa6c51a
am e8b25302
: am b0b45c02
: Display FCC id for LTE in Settings.
...
* commit 'e8b2530260abc74e570ae266b49bade240f14913':
Display FCC id for LTE in Settings.
2012-07-12 15:07:45 -07:00
Ying Wang
a0a480ad04
am 62acae4f
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '62acae4f85c937e2f0a883a47b2819f122b84675':
Import translations. DO NOT MERGE
2012-07-12 14:29:15 -07:00
John Wang
e8b2530260
am b0b45c02
: Display FCC id for LTE in Settings.
...
* commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103':
Display FCC id for LTE in Settings.
2012-07-12 14:29:13 -07:00
Ying Wang
62acae4f85
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-07-12 14:25:51 -07:00
Ying Wang
f10b383702
Import translations. DO NOT MERGE
...
Change-Id: I7e9254f65e3c315c5f60414d1ac209622634ec36
Auto-generated-cl: translation import
2012-07-12 13:18:58 -07:00
Ying Wang
51f13809a9
Import translations. DO NOT MERGE
...
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
2012-07-12 13:15:15 -07:00
The Android Automerger
af136318ec
merge in jb-mr0-release history after reset to jb-dev
2012-07-11 23:13:32 -07:00
Wink Saville
f39f56d669
Merge commit '5543404a' into mit
...
* commit '5543404a':
Use telephony-common
2012-07-11 18:11:15 -07:00
John Wang
b0b45c02ec
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
2012-07-11 16:50:32 -07:00
Wink Saville
5543404ae0
Use telephony-common
...
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-11 15:08:15 -07:00
Ying Wang
2723ea66a9
Import translations. DO NOT MERGE
...
Change-Id: Iba8d713f8a137400874a02e1741499fb7248937c
Auto-generated-cl: translation import
2012-07-11 14:49:56 -07:00
Ying Wang
99120051bc
am e9a717fb
: (-s ours) am efc229b3
: Import translations. DO NOT MERGE
...
* commit 'e9a717fb77c1be7ee5f27f57c01dad50753a055a':
Import translations. DO NOT MERGE
2012-07-10 14:24:41 -07:00
Ying Wang
e9a717fb77
am efc229b3
: Import translations. DO NOT MERGE
...
* commit 'efc229b3c3c969eef1d32d62435741228b96aeb9':
Import translations. DO NOT MERGE
2012-07-10 14:23:12 -07:00
Ying Wang
dfc97385fe
Import translations. DO NOT MERGE
...
Change-Id: If2979386d0d62cd5077ab1b4225b600d49a88fb2
Auto-generated-cl: translation import
2012-07-10 13:45:13 -07:00
Ying Wang
efc229b3c3
Import translations. DO NOT MERGE
...
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
2012-07-10 13:42:00 -07:00
Ying Wang
8120ca85f6
am 5d950a82
: (-s ours) am 051619c0
: Import translations. DO NOT MERGE
...
* commit '5d950a8277261018047dda84966d9c2ec092520e':
Import translations. DO NOT MERGE
2012-07-09 14:04:01 -07:00
Ying Wang
5d950a8277
am 051619c0
: Import translations. DO NOT MERGE
...
* commit '051619c06338f776fd361c313b515c676fb74331':
Import translations. DO NOT MERGE
2012-07-09 14:01:43 -07:00
Ying Wang
af0aaa1239
Import translations. DO NOT MERGE
...
Change-Id: Idf87c5d0c99bf4c9214b1d6a41ee19a9224b6f05
Auto-generated-cl: translation import
2012-07-09 13:23:39 -07:00
Ying Wang
051619c063
Import translations. DO NOT MERGE
...
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
2012-07-09 13:20:45 -07:00
Ying Wang
bff90a9755
am 51b2fef2
: (-s ours) am 39aade5b
: Import translations. DO NOT MERGE
...
* commit '51b2fef23587671007e38716db2a59ce60bf9e7f':
Import translations. DO NOT MERGE
2012-07-03 14:58:36 -07:00
Ying Wang
51b2fef235
am 39aade5b
: Import translations. DO NOT MERGE
...
* commit '39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
Import translations. DO NOT MERGE
2012-07-03 14:56:07 -07:00
Ying Wang
1c9ce0dacd
Merge "Import translations. DO NOT MERGE"
2012-07-03 14:51:45 -07:00
Ying Wang
574ebec978
Import translations. DO NOT MERGE
...
Change-Id: I47f714a1547115d65d08bda8a681f052ebc16d77
Auto-generated-cl: translation import
2012-07-03 13:44:53 -07:00
Ying Wang
39aade5b4e
Import translations. DO NOT MERGE
...
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
2012-07-03 13:41:30 -07:00
Irfan Sheriff
13cfaecc12
am 51cc655c
: am 2fad853b
: Merge "Limit length of SSID input string to 32"
...
* commit '51cc655ccdb8c78759095c709967a2185f2f61d8':
Limit length of SSID input string to 32
2012-07-03 12:23:23 -07:00
Irfan Sheriff
5cf05f1081
am 7c8363eb
: am d80ff0a4
: Merge "wifi: update text displayed during hotspot on/off"
...
* commit '7c8363eb11b61f712e982b161a2267c2731df6fa':
wifi: update text displayed during hotspot on/off
2012-07-03 12:23:21 -07:00
Irfan Sheriff
51cc655ccd
am 2fad853b
: Merge "Limit length of SSID input string to 32"
...
* commit '2fad853bf7282676ee3f2ec87630de5fdbcb236b':
Limit length of SSID input string to 32
2012-07-03 12:18:35 -07:00
Irfan Sheriff
7c8363eb11
am d80ff0a4
: Merge "wifi: update text displayed during hotspot on/off"
...
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
2012-07-03 12:18:33 -07:00
The Android Open Source Project
07b1f1637b
am df833bea
: Reconcile with jb-release
...
* commit 'df833bea374429922d6d7629a5ab498e3e10f8dd':
2012-07-03 12:17:14 -07:00
The Android Open Source Project
df833bea37
Reconcile with jb-release
...
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
2012-07-03 12:12:16 -07:00
Irfan Sheriff
2fad853bf7
Merge "Limit length of SSID input string to 32"
2012-07-03 11:35:44 -07:00
Irfan Sheriff
d80ff0a4d6
Merge "wifi: update text displayed during hotspot on/off"
2012-07-03 11:30:05 -07:00
The Android Automerger
e413019654
merge in jb-release history after reset to jb-dev
2012-07-02 16:21:14 -07:00
Eric Fischer
f91428832d
Merge "Import translations. DO NOT MERGE"
2012-07-02 14:57:34 -07:00
Eric Fischer
952bdfad63
am 23513ea5
: (-s ours) am a1146f83
: Import translations. DO NOT MERGE
...
* commit '23513ea53e7d0813987471b56b434186e561b30a':
Import translations. DO NOT MERGE
2012-07-02 14:40:15 -07:00
Eric Fischer
23513ea53e
am a1146f83
: Import translations. DO NOT MERGE
...
* commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7':
Import translations. DO NOT MERGE
2012-07-02 14:37:15 -07:00
Eric Fischer
76ecc313bb
Import translations. DO NOT MERGE
...
Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16
Auto-generated-cl: translation import
2012-07-02 13:58:53 -07:00
Eric Fischer
a1146f83a9
Import translations. DO NOT MERGE
...
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
2012-07-02 13:55:16 -07:00
The Android Automerger
2150577ad4
merge in jb-release history after reset to jb-dev
2012-07-02 12:57:04 -07:00
Ying Wang
4820298bf3
am d15183a9
: (-s ours) am 9ca616e4
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'd15183a971590ca0e32bc78c8ed2a3470009fbae':
Import translations. DO NOT MERGE
2012-06-29 18:02:44 -07:00
Ying Wang
d15183a971
am 9ca616e4
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
Import translations. DO NOT MERGE
2012-06-29 17:59:04 -07:00
Ying Wang
2e943441c2
Merge "Import translations. DO NOT MERGE"
2012-06-29 17:55:02 -07:00
Ying Wang
9ca616e425
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-29 17:54:50 -07:00
Dianne Hackborn
3d3d4c891b
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
2012-06-29 15:47:09 -07:00
Dianne Hackborn
d601be8f94
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
2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270
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
2012-06-29 15:01:23 -07:00