Amith Yamasani
f14f96efa8
am b3f6116e
: am fd73824d
: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
...
* commit 'b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-12 13:16:17 -07:00
Amith Yamasani
b3f6116e2b
am fd73824d
: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
...
* commit 'fd73824d60ca92e297f354986cad525b947d05dd':
Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-11 12:31:47 -07:00
Amith Yamasani
fd73824d60
Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
2011-08-11 12:17: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
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
Johannes Carlsson
8258dc23d3
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
2011-07-01 07:56:27 +02:00
John Wang
ab824c8161
am f44308a7
: Display FCC id for LTE in Settings.
...
* commit 'f44308a78d35db9cc211f26cd811c067460b18f1':
Display FCC id for LTE in Settings.
2011-06-30 16:41:15 -07:00
John Wang
f44308a78d
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
2011-06-30 16:33:54 -07:00
Eric Fischer
d21574604a
am 6a078ed3
: (-s ours) am a18484fb
: Import new translations.
...
* commit '6a078ed3d5808e0951a1e0cb8a47fdf210cf884b':
Import new translations.
2011-06-27 16:40:59 -07:00
Eric Fischer
6a078ed3d5
am a18484fb
: Import new translations.
...
* commit 'a18484fb3819feac248255d6ce509049330aca1b':
Import new translations.
2011-06-27 16:37:03 -07:00
Eric Fischer
a18484fb38
Import new translations.
...
Change-Id: I7b45aed12328a25b81878f29364bcc837c956509
2011-06-27 14:50:05 -07:00
Dianne Hackborn
c9a477aeac
am e3cfa9bc
: am 13bac39d
: Remove obsolete compat mode UI.
...
* commit 'e3cfa9bc557e92d7a1b01270a405a9bd99700310':
Remove obsolete compat mode UI.
2011-06-24 12:41:05 -07:00
Dianne Hackborn
e3cfa9bc55
am 13bac39d
: Remove obsolete compat mode UI.
...
* commit '13bac39d2120a82b8a22b52f0db0727aa04b1f38':
Remove obsolete compat mode UI.
2011-06-24 12:24:21 -07:00
Dianne Hackborn
13bac39d21
Remove obsolete compat mode UI.
...
Change-Id: Ie16f70af4b8d6f33db21363a478049659669e0b3
2011-06-23 17:04:06 -07:00
Jaikumar Ganesh
45679d942f
am 38ae9125
: (-s ours) am 7ab66973
: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
...
* commit '38ae9125b4535d44b608359f3345fd75d99cc7a5':
DO NOT MERGE Show user dialog for BT.
2011-06-21 14:08:20 -07:00
Jaikumar Ganesh
38ae9125b4
am 7ab66973
: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
...
* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
DO NOT MERGE Show user dialog for BT.
2011-06-21 13:24:22 -07:00
Jaikumar Ganesh
7ab66973a9
Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
2011-06-21 11:23:47 -07:00
Jaikumar Ganesh
7bfa6dca07
DO NOT MERGE Show user dialog for BT.
...
Show user dialog for incoming BT connection
requests from unknown devices.
Contribution by: Wei (Matthew) Xie
Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
2011-06-20 19:30:21 -07:00
Jaikumar Ganesh
47504c7b93
am a7bb204a
: am c6f14410
: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
...
* commit 'a7bb204a1a4a46c853c3590027ad5bffb294f738':
Remove CHAR LIMIT from string to fix build.
2011-06-20 16:35:45 -07:00
Jaikumar Ganesh
a7bb204a1a
am c6f14410
: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
...
* commit 'c6f144106c627b28d90d33c54564c70890bc2f42':
Remove CHAR LIMIT from string to fix build.
2011-06-20 16:28:09 -07:00
Jaikumar Ganesh
c6f144106c
Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
2011-06-20 16:19:35 -07:00
Jaikumar Ganesh
a5ff907328
Remove CHAR LIMIT from string to fix build.
...
Change-Id: I590126db92329efcc6aea95bb97bb9d053905276
2011-06-20 16:14:11 -07:00
Jaikumar Ganesh
87c04ba668
am f3670df2
: am 2c85966d
: Merge "New strings for Bluetooth" into gingerbread
...
* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
New strings for Bluetooth
2011-06-20 15:58:25 -07:00
Jaikumar Ganesh
f3670df2ca
am 2c85966d
: Merge "New strings for Bluetooth" into gingerbread
...
* commit '2c85966dd881917b426eefd9643adedf6b0d4ffc':
New strings for Bluetooth
2011-06-20 15:54:16 -07:00
Jaikumar Ganesh
2c85966dd8
Merge "New strings for Bluetooth" into gingerbread
2011-06-20 15:29:43 -07:00
Jaikumar Ganesh
0f44329c74
New strings for Bluetooth
...
This is for the user dialog for incoming BT requests.
Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
2011-06-20 15:10:53 -07:00
Eric Fischer
50c32a16f3
am 3c75fbc5
: (-s ours) am 5bdc3e91
: Import revised Croatian translations.
...
* commit '3c75fbc55667d4b3f368afbd29ef78eab55303a2':
Import revised Croatian translations.
2011-06-16 15:55:10 -07:00
Eric Fischer
3c75fbc556
am 5bdc3e91
: Import revised Croatian translations.
...
* commit '5bdc3e9139a7b37b97a56554cc9a89abc196b437':
Import revised Croatian translations.
2011-06-16 15:48:43 -07:00
Eric Fischer
957bed6e52
am 3bf263c9
: am b5c4437f
: Import revised translations. DO NOT MERGE
...
* commit '3bf263c97e23eeec199bd56ef520fba17a1e3917':
Import revised translations. DO NOT MERGE
2011-06-16 14:41:45 -07:00
Eric Fischer
3bf263c97e
am b5c4437f
: Import revised translations. DO NOT MERGE
...
* commit 'b5c4437f336c3e79d34428de0b1b7ce22785fb29':
Import revised translations. DO NOT MERGE
2011-06-16 14:29:39 -07:00
Eric Fischer
b5c4437f33
Import revised translations. DO NOT MERGE
...
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
2011-06-15 15:13:19 -07:00
Eric Fischer
5bdc3e9139
Import revised Croatian translations.
...
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
2011-06-15 12:09:02 -07:00
Amith Yamasani
80cc0ffa2b
am e7f7643c
: am 6ef6f183
: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
* commit 'e7f7643c485ed6926bc354ca28628d5179019b50':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:44:23 -07:00
Amith Yamasani
e7f7643c48
am 6ef6f183
: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
* commit '6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:41:00 -07:00
Amith Yamasani
6ef6f183e4
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
2011-06-14 15:19:14 -07:00
Mike Lockwood
c938a02bc6
am c1db1192
: am d2a6f28f
: Disable option to format SD card for secondary external storage
...
* commit 'c1db119250fd481341c095f47a62adb14ad09484':
Disable option to format SD card for secondary external storage
2011-06-13 04:36:26 -07:00
Mike Lockwood
c1db119250
am d2a6f28f
: Disable option to format SD card for secondary external storage
...
* commit 'd2a6f28fa7ba8189d2a1987129db27fd840fac0f':
Disable option to format SD card for secondary external storage
2011-06-13 04:25:51 -07:00
Mike Lockwood
d2a6f28fa7
Disable option to format SD card for secondary external storage
...
This is a temporary workaround for an interoperability problem with MTP
Change-Id: Iaf63ea0ac76e12ffd635765785da027cab0fcb9a
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-06-11 18:11:03 -04:00
Freeman Ng
945aac2e29
am fb096074
: am 148222fd
: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
...
* commit 'fb09607469a5cb42c833725d121e517af5daca72':
remove disabling of Back/Dismiss button for 10" mode
2011-06-10 07:46:40 -07:00
Freeman Ng
a35506c7fb
am f2a9bd33
: am 0a67cdb7
: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
...
* commit 'f2a9bd337b495b65f9e6708117835b2ff986d5af':
add "behind" screen orientation to prevent spurious flipping
2011-06-10 07:46:37 -07:00
Freeman Ng
fb09607469
am 148222fd
: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
...
* commit '148222fd43499a578c16c0bdf6ae9336255facd7':
remove disabling of Back/Dismiss button for 10" mode
2011-06-09 18:22:02 -07:00
Freeman Ng
f2a9bd337b
am 0a67cdb7
: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
...
* commit '0a67cdb7e1d853ae0431c36e95930bbf355eca52':
add "behind" screen orientation to prevent spurious flipping
2011-06-09 18:22:00 -07:00
Freeman Ng
148222fd43
Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
2011-06-09 18:20:13 -07:00
Freeman Ng
0a67cdb7e1
Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
2011-06-09 18:20:04 -07:00
Dianne Hackborn
8d7ecabc68
am 60d8b3f8
: am 55c86911
: Mark access to private resources now that aapt enforces this.
...
* commit '60d8b3f875ae5630330feacc450169223e605166':
Mark access to private resources now that aapt enforces this.
2011-06-09 16:09:00 -07:00
Dianne Hackborn
60d8b3f875
am 55c86911
: Mark access to private resources now that aapt enforces this.
...
* commit '55c869119aabc27d3b6c6b4aab0e69faf57f1250':
Mark access to private resources now that aapt enforces this.
2011-06-09 16:04:44 -07:00