Jeff Sharkey
677e2ff670
am d7db6baa
: Merge "Don\'t direct to market if no markets installed"
...
* commit 'd7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
Don't direct to market if no markets installed
2012-08-13 14:11:00 -07:00
Baligh Uddin
e5bdab3775
Import translations. DO NOT MERGE
...
Change-Id: I57cc82b205973c1de47c4d488742d799606dad02
Auto-generated-cl: translation import
2012-08-13 13:30:49 -07:00
Baligh Uddin
70372dcfc3
Import translations. DO NOT MERGE
...
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
2012-08-13 13:27:25 -07:00
Baligh Uddin
059b123cb9
Import translations. DO NOT MERGE
...
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
2012-08-13 13:24:26 -07:00
Jeff Sharkey
42eb3fb258
Merge "Fix the issue the setting crashes after unmount SD card in landscape"
2012-08-13 13:17:12 -07:00
Jeff Sharkey
d7db6baac7
Merge "Don't direct to market if no markets installed"
2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
6fb425e280
am eefa61ed
: Merge "Settings: Use ICS alert drawable"
...
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e
Merge "Settings: Use ICS alert drawable"
2012-08-13 11:53:46 -07:00
The Android Automerger
abcf9657c5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:10:11 -07:00
Jack Wang
481582f4ec
Fix memory leak in ApnSettings-activity
...
When destroying the activity, the HandlerThread isnt stopped. This
results in that the thread remains, and if you enter/exit the
activity multiple times, you will end up with multiple threads and
a small memory leak
Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
2012-08-13 15:25:04 +02:00
Amith Yamasani
bdc19f33cb
am 032aa5a5
: am 32630395
: Use UserManager instead of PackageManager for user management
...
* commit '032aa5a5ba22a5c46adc0fda210689c25e0e2bb5':
Use UserManager instead of PackageManager for user management
2012-08-11 21:59:11 -07:00
Amith Yamasani
032aa5a5ba
am 32630395
: Use UserManager instead of PackageManager for user management
...
* commit '32630395eb7dd8401f344599640c8bcf1e289bb0':
Use UserManager instead of PackageManager for user management
2012-08-11 21:57:51 -07:00
Amith Yamasani
32630395eb
Use UserManager instead of PackageManager for user management
...
Show Accounts in secondary settings
Move Users & restrictions to Device section
Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
2012-08-10 19:53:29 -07:00
Baligh Uddin
45f7d1523b
am 424111dd
: (-s ours) am 5ef3293e
: Import translations. DO NOT MERGE
...
* commit '424111dd2a01337605b65c5ae7c67f19d18bc5e7':
Import translations. DO NOT MERGE
2012-08-10 15:38:44 -07:00
Baligh Uddin
424111dd2a
am 5ef3293e
: Import translations. DO NOT MERGE
...
* commit '5ef3293ed2bfd43e6a179121e6b562e56ced3feb':
Import translations. DO NOT MERGE
2012-08-10 15:36:48 -07:00
Baligh Uddin
81ae2a0d90
Merge "Import translations. DO NOT MERGE"
2012-08-10 15:34:31 -07:00
Baligh Uddin
2dfd140920
Import translations. DO NOT MERGE
...
Change-Id: I1bbf91bf64b56688b5772ae6d86d6aa0168f4d51
Auto-generated-cl: translation import
2012-08-10 11:24:00 -07:00
Baligh Uddin
5ef3293ed2
Import translations. DO NOT MERGE
...
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
2012-08-10 11:21:05 -07:00
The Android Open Source Project
6f80a77adb
am 9698d362
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9698d3624c5e66cbff3c89e56a1388b6b2be9c1d':
2012-08-10 08:55:54 -07:00
The Android Open Source Project
9698d3624c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
2012-08-10 08:53:55 -07:00
Przemyslaw Szczepaniak
7edae431ee
am 06649d02
: am 923187a1
: Keep speech rate dialog after rotate
...
* commit '06649d02b2d6e3f147a1082c7538682f97e64a0b':
Keep speech rate dialog after rotate
2012-08-10 07:18:23 -07:00
Przemyslaw Szczepaniak
06649d02b2
am 923187a1
: Keep speech rate dialog after rotate
...
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
Keep speech rate dialog after rotate
2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159
Keep speech rate dialog after rotate
...
It also adds some missing @Override
Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
2012-08-10 07:13:52 -07:00
Baligh Uddin
b1e833987b
am 2dc3d551
: (-s ours) am 658f909d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2dc3d551963426df9411fbc48db9f4112014d21b':
Import translations. DO NOT MERGE
2012-08-09 19:53:46 -07:00
Baligh Uddin
2dc3d55196
am 658f909d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
Import translations. DO NOT MERGE
2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-09 19:50:14 -07:00
Chuanxiao Dong
66e7f0a393
Fix the issue the setting crashes after unmount SD card in landscape
...
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.
Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 26569
2012-08-10 10:49:45 +08:00
Baligh Uddin
35293e5500
Merge "Import translations. DO NOT MERGE"
2012-08-09 19:49:10 -07:00
Li Gang
8218d3ba18
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
...
Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled,
disable the erasing and umount operation.
Judge SD card Mounting status and keep summary string.
Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7
Author: Li Gang <gang.g.li@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 47043
2012-08-10 10:20:48 +08:00
Irfan Sheriff
79a0554444
am 6a88ef4b
: am aae0659e
: Setting to turn off power optimizations
...
* commit '6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
Setting to turn off power optimizations
2012-08-09 16:06:33 -07:00
Irfan Sheriff
6a88ef4bd2
am aae0659e
: Setting to turn off power optimizations
...
* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
Setting to turn off power optimizations
2012-08-09 15:58:13 -07:00
Irfan Sheriff
aae0659e18
Setting to turn off power optimizations
...
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -07:00
Baligh Uddin
f2ccce3633
Import translations. DO NOT MERGE
...
Change-Id: I5e16b50a8efca5da984acc9ad76d3bed76ee8d83
Auto-generated-cl: translation import
2012-08-09 12:42:04 -07:00
Baligh Uddin
0ad6982813
Import translations. DO NOT MERGE
...
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
2012-08-09 12:39:18 -07:00
The Android Automerger
9daa72c4e8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:59 -07:00
John Spurlock
fc470e4db7
am aeb7b571
: am eaffad37
: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
...
* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
Fix NPE in Dreams settings.
2012-08-09 06:22:56 -07:00
John Spurlock
aeb7b57105
am eaffad37
: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
...
* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
Fix NPE in Dreams settings.
2012-08-09 06:20:50 -07:00
John Spurlock
eaffad37c1
Merge "Fix NPE in Dreams settings." into jb-mr1-dev
2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b
Fix NPE in Dreams settings.
...
Handle the null case to avoid crashing Settings.
Change-Id: I257b766370bd604e0af5b332241619258fb732c9
2012-08-09 09:03:48 -04:00
Baligh Uddin
1178969da3
am 8aa63452
: (-s ours) am 702cdf4c
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8aa634529cfeda5d375a2a541038b8b7976f8a85':
Import translations. DO NOT MERGE
2012-08-08 20:05:51 -07:00
Baligh Uddin
8aa634529c
am 702cdf4c
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
Import translations. DO NOT MERGE
2012-08-08 20:04:24 -07:00
Baligh Uddin
702cdf4c9a
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-08 20:02:24 -07:00
Baligh Uddin
d2983fd132
Merge "Import translations. DO NOT MERGE"
2012-08-08 20:01:24 -07:00
Jean-Baptiste Queru
9b46e9a231
am 17d915b7
: am 66321184
: am 75266364
: am 5d72b272
: Merge "Add support for SE Android to the Settings app."
...
* commit '17d915b7fdc4527710022ed3dd6c48bc03b8157b':
Add support for SE Android to the Settings app.
2012-08-08 15:11:26 -07:00
Tore Anderson
68b9a26543
Enable "APN roaming protocol" for all platforms
...
Allows users to change the protocol (the PDP context type) used when
roaming in the same way they already can for when they are in their home
network. This is required in order to make IPv6 and IPv4v6 data roaming
work correctly in 3GPP networks.
See also: http://code.google.com/p/android/issues/detail?id=32631
Change-Id: I052842122e5fe96a8779077f0ae9ff4bc83066c5
Signed-off-by: Tore Anderson <tore@fud.no >
2012-08-08 23:10:35 +02:00
Jean-Baptiste Queru
17d915b7fd
am 66321184
: am 75266364
: am 5d72b272
: Merge "Add support for SE Android to the Settings app."
...
* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
Add support for SE Android to the Settings app.
2012-08-08 14:09:11 -07:00
Jean-Baptiste Queru
6632118457
am 75266364
: am 5d72b272
: Merge "Add support for SE Android to the Settings app."
...
* commit '7526636406087666d005d389ddc0cdacd79499fd':
Add support for SE Android to the Settings app.
2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406
am 5d72b272
: Merge "Add support for SE Android to the Settings app."
...
* commit '5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Baligh Uddin
b20162733a
Import translations. DO NOT MERGE
...
Change-Id: I036bc0a27767d78ad6cb86b255db7af28e9040d6
Auto-generated-cl: translation import
2012-08-08 13:44:29 -07:00
Baligh Uddin
24fb893381
Import translations. DO NOT MERGE
...
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
2012-08-08 13:40:29 -07:00