59189 Commits

Author SHA1 Message Date
The Android Open Source Project
0d3451261d Reconcile with ics-factoryrom-release
Change-Id: Ia9dffe4458e064a55878e989ba73763158e008fe
2011-09-30 07:09:59 -07:00
satok
3e21c99f10 Merge "Fix a logic to recconect IME in InputMethodManagerService" 2011-09-30 03:31:35 -07:00
satok
59b424c3b6 Fix a logic to recconect IME in InputMethodManagerService
Bug: 5380216

Change-Id: I7af67265eebbd28f002210d7ac90dd18f1858f66
2011-09-30 19:26:01 +09:00
satok
594cb47654 Merge "Use user's settings for the spell check language instead of the system locale" 2011-09-30 01:52:40 -07:00
satok
70deff4c10 Use user's settings for the spell check language instead of the system locale
Bug: 5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
2011-09-30 17:49:40 +09:00
Luca Zanolin
af43add388 Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling." 2011-09-30 01:01:35 -07:00
Owen Lin
e29288629d Convert content type "image/jpg" to "image/jpeg".
"image/jpg" is not a valid mimetype while "image/jpeg" is.
So change it to "image/jpeg" to increase the compatibillity with other
Apps in android. (e.g., Gallery)

bug: 5342561
Change-Id: Ia37433e35482492b7226c87a670bef3399ac4bb6
2011-09-30 15:26:34 +08:00
Ying Wang
46b20e7f41 Correction the use of SMALLER_FONT_FOOTPRINT
SMALLER_FONT_FOOTPRINT is a BoardConfig variable that's only available
in Android.mks but not product config makefiles.

Change-Id: I1784b6e8c744ffcca1538e76d338f5800f150e72
2011-09-29 20:02:05 -07:00
The Android Automerger
d435a0d076 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 18:46:30 -07:00
Mathias Agopian
5c06f0f0d0 am 5d9a4f33: Merge "improve hwc log output" into ics-factoryrom
* commit '5d9a4f33d3f1fcce55b686597d370d749b5c5c0d':
  improve hwc log output
2011-09-29 18:37:44 -07:00
Mathias Agopian
5d9a4f33d3 Merge "improve hwc log output" into ics-factoryrom 2011-09-29 18:34:22 -07:00
Xavier Ducrohet
387d078e64 LayoutLib: Fix native delegate for Display.
Change-Id: If097cae2309d340162b3bac1d0f6a2289635adca
2011-09-29 18:33:50 -07:00
Mathias Agopian
1f84f44bfa improve hwc log output
we now print the handle of each buffer

Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
2011-09-29 18:12:20 -07:00
Mathias Agopian
7db6da4049 Merge "improve hwc log output" 2011-09-29 18:09:35 -07:00
Mathias Agopian
1f29cbe8f4 improve hwc log output
we now print the handle of each buffer

Change-Id: I70884ae458a9dcf10cfc403258d48eaa4618b7f4
2011-09-29 18:07:08 -07:00
Svetoslav Ganov
2783b4fa43 Merge "ActivityChooserView shows "see all" improperly." 2011-09-29 17:54:22 -07:00
Fabrice Di Meglio
46c78b4de1 Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-09-29 17:53:09 -07:00
Christopher Tate
86b734972d Merge "Enforce DUMP permission on BackupManagerService's dump() method" 2011-09-29 17:28:29 -07:00
Romain Guy
638f17c1b7 Merge "TextureView works best when it draws stuff. Bug #5391188" 2011-09-29 17:23:52 -07:00
Romain Guy
59c7f80dd2 TextureView works best when it draws stuff.
Bug #5391188

Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
2011-09-29 17:21:45 -07:00
repo sync
7960d9f888 Fix IPv6 on wifi
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
2011-09-29 16:59:01 -07:00
Svetoslav Ganov
1c07e22c36 ActivityChooserView shows "see all" improperly.
1. The cooser was presenting the "Show all" option if the number
   of available activities was more than the initial max count of activities
   to be shown. Since the show all option is added to the drop down
   the latter becomes effectively one longer than the initial max activity
   count which may make the drop down taller than client expectats. Also
   this leads to the case where if the activities are one more than the
   initial activity count pressing the show all button will just replace
   the show all item with the activity that did not fit - this is somehow
   annoying to the user.

bug:5379282

Change-Id: I2693214cb0b66edb2a3bdffc01ed29139341111c
2011-09-29 16:51:04 -07:00
Amith Yamasani
966222ef24 Merge "Handle the case of Preference lists that have header views inserted at the top." 2011-09-29 16:48:55 -07:00
Romain Guy
1e70aa94c1 Merge "Add system property to force hw acceleration." 2011-09-29 16:39:16 -07:00
Romain Guy
9622e20486 Add system property to force hw acceleration.
Change-Id: I538e641435f282b1af20866a8acd1f8d292734c4
2011-09-29 16:38:24 -07:00
Marco Nelissen
b741c60486 Remove Ringtone.setWakeMode, it's not needed.
This partially reverts commit e47e8520fa48bd014287eda94ea39927de73d6bc.
(the other part of that change was already removed as part of a different
change)

Change-Id: Ica7c196ab1f74f96237e64d07580832f0d50022f
2011-09-29 15:58:41 -07:00
Mangesh Ghiware
293fe94920 Merge "Force a WebView pictureset reset on screen rotation." 2011-09-29 15:57:51 -07:00
The Android Automerger
1b7c745bbe merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 15:21:22 -07:00
Amith Yamasani
2d43d283fc Handle the case of Preference lists that have header views inserted at the top.
Without this change, wrong Preference is returned when you select one.
Subtract the number of headers from the index before querying the adapter.
Needed for:
Bug: 5203189

Change-Id: Iba7277789ebbd7e3e9954931b1ea06c7e34f3c15
2011-09-29 15:16:16 -07:00
Christopher Tate
b8491bb75f Enforce DUMP permission on BackupManagerService's dump() method
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.

Bug 5389201

Change-Id: If84886357a36b7015878e4d72017abba83b4c511
2011-09-29 15:13:11 -07:00
Philip Milne
a15cb2cda7 Merge "Fix for 5393156" 2011-09-29 15:01:27 -07:00
Kenny Root
b1955c96cc Merge "Add package-verifier to aapt dump badging" 2011-09-29 15:00:42 -07:00
Philip Milne
4a145d7262 Fix for 5393156
. Fix for the above.
. Make instances of Space invisible by default.
. Correctly accomodate parental constraints when row/col order is undefined.

This fix allows GridLayout to accomodate simple dependencies between
its axes. In the example given in bug 5393156, the presence of a
multi-line TextView means that GridLayout can only compute its height
after it has computed its width. This fix adds a second measurement pass
to GridLayout that passes infomation betwen the axes, using the GridLayout's
orientation property to indicate which axis should be examined first.

Change-Id: I90761c6fcfe8edc7ef6d9a89076fd5cda3adc0a4
2011-09-29 14:48:44 -07:00
The Android Open Source Project
a44ad813aa Reconcile with ics-factoryrom-release
Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12
2011-09-29 14:24:50 -07:00
Roman Nurik
99ba69defb Merge "Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide" 2011-09-29 14:10:07 -07:00
Dima Zavin
9d1287019a am e8b7f4a2: eventhub: print debugginf info when removing device
* commit 'e8b7f4a20c43d8f55d0cf85a94363b764ba598b8':
  eventhub: print debugginf info when removing device
2011-09-29 14:06:38 -07:00
Mark Wagner
77e6a55f2f bugfix 5381702 MMS app puts temporary files on sdcard in wrong location
move this code into the app

Change-Id: Ieca6c603ee1163524ddb855800ade5e5a8fff0e5
2011-09-29 13:58:59 -07:00
Kenny Root
56088a55ca Add package-verifier to aapt dump badging
Print out the package-verifier information when printing out badging.

Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540
2011-09-29 13:49:48 -07:00
Mangesh Ghiware
e8b05e858a Force a WebView pictureset reset on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Bug: 5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
2011-09-29 13:41:34 -07:00
Marco Nelissen
ee1d541ec8 Merge "Use SoundPool instead of Ringtone." 2011-09-29 13:13:17 -07:00
Steven Ross
329979c9e6 calling back SetupFaceLock to clean up temporary gallery
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
If canceled, the temporary gallery is deleted

Also deletes the main gallery if the lock type is changed from facial recognition

Change-Id: Id1ce804dec6b71b6410af53c050ad265c4cad5b0
2011-09-29 16:00:59 -04:00
Marco Nelissen
d5545bd0a9 Use SoundPool instead of Ringtone.
The lock screen was using Ringtone for the lock/unlock sounds, which
meant two new MediaPlayers were created every time a sound needed to
be played. In addition, the Ringtone was assigned to a local variable,
which means it could go be garbage collected and finalized while it
was still playing.
For short sounds that need to be played repeatedly, SoundPool is a
better option anyway, so use that instead.
b/5382634

Change-Id: I8794cbb24604fa7c03032bd5e32ceab37a858054
2011-09-29 12:52:04 -07:00
Daniel Sandler
9ee9dcd256 Bring back nyandroid ADB icon.
Change-Id: Ic1124ef985aa8b7912499b7ff1c150fe982b882d
2011-09-29 15:50:12 -04:00
Daniel Sandler
4222c2ef91 Add carrier info back to notification drawer.
Bug: 5250214
Change-Id: I9ef1faf052ea6e4d3bd0b5a1a6e67a18fb923c47
2011-09-29 15:44:34 -04:00
Fabrice Di Meglio
a130e5f59d Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
- make DynamicLayout honor max lines
- make StaticLayout.generate() take maxLines as a parameter instead of using the field mMaximumVisibleLineCount

Change-Id: I9eafb1be4b8bb2aa881514955a6903f559cb6a1e
2011-09-29 12:44:16 -07:00
Mike Cleron
2d56123b11 Merge "Fix lockscreen Bug: 5391404" 2011-09-29 12:36:55 -07:00
Justin Ho
b9a4b3c18a Fix lockscreen
Bug: 5391404

Change-Id: I021a37705b72ab1990f7651fecbe743a8af4e372
2011-09-29 12:33:28 -07:00
Daniel Sandler
3d0d7b4172 Merge "Increase padding in notifications." 2011-09-29 11:57:23 -07:00
Dianne Hackborn
03476d7a57 am 9547d03e: Fix build.
* commit '9547d03ef1228406ad4eb6db31dbcf58be1e4655':
  Fix build.
2011-09-29 11:53:32 -07:00
Dianne Hackborn
e3206c1603 am 1fd6c336: (-s ours) Fix issue #5312624: Lock screen very flickery
* commit '1fd6c33620171893b2e92c38b731fd89e5a8dd66':
  Fix issue #5312624: Lock screen very flickery
2011-09-29 11:53:31 -07:00