drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,961 Commits 1 Branch 0 Tags
Commit Graph

77961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
46a284921e merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-18 10:47:44 -07:00
Elliott Hughes
4b51e293d8 Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev 2012-05-18 10:36:34 -07:00
Jean-Baptiste Queru
c0f1738357 Merge "Move kxml2 to prebuilts/misc" 2012-05-18 09:51:04 -07:00
Daniel Sandler
7e22a223af Merge "Updated disconnected rssi icons." into jb-dev 2012-05-18 08:11:12 -07:00
Daniel Sandler
ce77ce1d2b Updated disconnected rssi icons. 
Bug: 6449811
Change-Id: Ic7a1c4f9f75971783f8f9e49f65fdc25f5c83649
 2012-05-18 10:26:20 -04:00
satok
0a1bcf4e0d Consolidate the initialization of InputMethodManagerService not to use resource values until system ready 
Bug: 6477193
InputMethodManagerService have used the resource value of "isDefault" in the constructor. We should wait to use that value until system ready.
Change-Id: I682fc109c303d8c7fd33d494c59e8e28d6dc6fa5
 2012-05-18 16:00:40 +09:00
Matthew Xie
fbeb823031 am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev 
* commit 'dabb19fcd1b0d7b2c21be37aa0b75df5e35f1d6f':
  Increase the setup-sdp delay to cover for all the devices.
 2012-05-17 21:52:04 -07:00
Matthew Xie
dabb19fcd1 Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev 2012-05-17 21:49:55 -07:00
Jim Miller
aa6e60c9d5 am af0a15c8: Merge "Fix 6516240: Remove unused bottom margins from owner info textview" into jb-dev 
* commit 'af0a15c820c0cdffcaf198e599cb55098510ad0a':
  Fix 6516240: Remove unused bottom margins from owner info textview
 2012-05-17 21:04:38 -07:00
Jim Miller
45e8f3b763 am 9da2452f: Merge "Fix 6441282: confine search gesture region on tablet navbar" into jb-dev 
* commit '9da2452f6193d39ebc5c6c81cc5ceb41763d8036':
  Fix 6441282: confine search gesture region on tablet navbar
 2012-05-17 21:04:36 -07:00
Nick Pelly
9481259fcb am 1ca43997: Merge "Enforce the minTime parameter in LocationManager#requestLocationUpdates" into jb-dev 
* commit '1ca4399706103fd9df50661866caaeed95221621':
  Enforce the minTime parameter in LocationManager#requestLocationUpdates
 2012-05-17 21:00:54 -07:00
Jim Miller
af0a15c820 Merge "Fix 6516240: Remove unused bottom margins from owner info textview" into jb-dev 2012-05-17 21:00:48 -07:00
Jim Miller
9da2452f61 Merge "Fix 6441282: confine search gesture region on tablet navbar" into jb-dev 2012-05-17 21:00:32 -07:00
Nick Pelly
1ca4399706 Merge "Enforce the minTime parameter in LocationManager#requestLocationUpdates" into jb-dev 2012-05-17 20:57:56 -07:00
John Reck
1f00a987ac am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev 
* commit '88b756cd249d1dd4aefb92a73a65fa76cd8ef0d5':
  Don't show the touch highlight for double taps
 2012-05-17 20:05:49 -07:00
John Reck
88b756cd24 Merge "Don't show the touch highlight for double taps" into jb-dev 2012-05-17 20:03:17 -07:00
John Reck
aa5af8d004 Don't show the touch highlight for double taps 
Bug: 6490959

Change-Id: I5a6cfa3d36f1df28d9c3b03e120f59581ee22c01
 2012-05-17 19:57:08 -07:00
Jim Miller
161538985e Fix 6441282: confine search gesture region on tablet navbar 
Depending on the device, this will be one of the id's in the navbar
view hierarchy used in the source.  It will default to the navbar
view if one isn't found.

Change-Id: I388412d4f247f7d2d102768708237711d722de3d
 2012-05-17 19:48:43 -07:00
Adam Powell
2a6a4df96d am 93563d21: Merge "Log a warning when action bar view states cannot be restored." into jb-dev 
* commit '93563d21a97aee9bb60f6cbd975bb901fad29962':
  Log a warning when action bar view states cannot be restored.
 2012-05-17 19:36:46 -07:00
Adam Powell
93563d21a9 Merge "Log a warning when action bar view states cannot be restored." into jb-dev 2012-05-17 19:35:00 -07:00
Adam Powell
fb5f1bc085 Log a warning when action bar view states cannot be restored. 
Some apps can get into a case where the saved view hierarchy states
for action bar views are missing. Log a warning instead of crashing.

Bug 6510800

Change-Id: I95ede64ec584892e6e76ca9ab9d53e9d3689984f
 2012-05-17 19:30:35 -07:00
Pannag Sanketi
b5af71f2b1 Fixing the weird preview size w/ effects on camera 
The aspect ratio sent from the camera app to the SurfaceTextureTarget
filter  does not really matter now since the camera app handles
the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render
in "stretch" mode all the time even though the aspect ratio sent to the
filter might indicate otherwise. The filter still needs the correct
frame size for things other than determining aspect ratio.

Fix b/6430124

Change-Id: Ie7fa5cd2adf2a8d41e6e005418f6c6fd738ed85d
 2012-05-17 19:29:33 -07:00
Jim Miller
77a5c61f9a Fix 6516240: Remove unused bottom margins from owner info textview 
Change-Id: Ia5194b87cf7eddd0a55ad5c94c9e61ee4eb1180a
 2012-05-17 19:29:29 -07:00
Romain Guy
09528f96f4 am c8c4ced8: Merge "Call invalidate() immediately when a frame is available" into jb-dev 
* commit 'c8c4ced83872f3eeabd93da34d8376903c42a00b':
  Call invalidate() immediately when a frame is available
 2012-05-17 19:06:31 -07:00
Romain Guy
c8c4ced838 Merge "Call invalidate() immediately when a frame is available" into jb-dev 2012-05-17 19:04:51 -07:00
Jim Miller
3d9bf29fcf am f7a44e81: Merge "Fix 6398209: Increase outer ring size for search gesture on 600dp device" into jb-dev 
* commit 'f7a44e8168d96ad75738226570d41e48f8fd14e3':
  Fix 6398209: Increase outer ring size for search gesture on 600dp device
 2012-05-17 18:36:27 -07:00
Jim Miller
f7a44e8168 Merge "Fix 6398209: Increase outer ring size for search gesture on 600dp device" into jb-dev 2012-05-17 18:34:01 -07:00
Adam Powell
86bad54839 am e2711998: Merge "New focus/activated states for the activity chooser dialog" into jb-dev 
* commit 'e2711998525b5492b31917ce95cf10dbd02884ea':
  New focus/activated states for the activity chooser dialog
 2012-05-17 18:25:39 -07:00
Adam Powell
e271199852 Merge "New focus/activated states for the activity chooser dialog" into jb-dev 2012-05-17 18:23:02 -07:00
Dianne Hackborn
ccf4e2f71b am abe39277: Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 
* commit 'abe3927701c0aff839498272565aeee714aa6e9d':
  Fix issue #6515427: Add android.hardware.television and fix...
 2012-05-17 18:20:50 -07:00
Dianne Hackborn
abe3927701 Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 2012-05-17 18:18:27 -07:00
Dianne Hackborn
0cf2c8a533 Fix issue #6515427: Add android.hardware.television and fix... 
...logic for notouch in Configuration

Added new TELEVISION feature.

We now force the configuration to "television" if the TELEVISION
feature is set, and "notouch" if the TOUCHSCREEN feature is not set.

Also cleaned up documentation, deprecated some configurations that
are not used.

Change-Id: If1c7a284b580a8a66bda2a75f0c7fa841b3dc9b7
 2012-05-17 18:11:14 -07:00
Romain Guy
52c145ff5c Call invalidate() immediately when a frame is available 
This change ensures that applications producing surface texture updates
at a steady rate will display the updates on screen at the same rate,
v-synced.

Change-Id: I663685b34d12809fbf8945c44851e30a2052ce74
 2012-05-17 18:06:23 -07:00
Jake Hamby
cd9f8ea3be am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev 
* commit '665935c10ad281721c495621fab7561f2a28842e':
  Enable SMS short code patterns to be updated from secure settings.
 2012-05-17 17:59:43 -07:00
Jake Hamby
665935c10a Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev 2012-05-17 17:57:45 -07:00
Matthew Xie
8b4ca7a1a9 Increase the setup-sdp delay to cover for all the devices. 
20 ms worked well for GN hspa for stress test, but failed sometimes
for other platform. Increased it to 50ms. Tested on all the device types
bug 6438556

Change-Id: Ic5fcde3de7ea6d3d983edab7ae3df5684637bd20
 2012-05-17 17:43:00 -07:00
Svetoslav Ganov
65e8ecf37b am a1daf827: Merge "Fix paragraph iterator." into jb-dev 
* commit 'a1daf82732c8529bcf9258f42e2cc22be9fa684b':
  Fix paragraph iterator.
 2012-05-17 17:25:44 -07:00
Svetoslav Ganov
a1daf82732 Merge "Fix paragraph iterator." into jb-dev 2012-05-17 17:23:16 -07:00
Jim Miller
7c36dc2d1e am 58a69d24: Merge "Fix 6398209: Re-enable vibrate for search gesture." into jb-dev 
* commit '58a69d24c42f8aec3825e580f592617e11f12d9e':
  Fix 6398209: Re-enable vibrate for search gesture.
 2012-05-17 17:17:30 -07:00
Charles Chen
a48374db17 am c6015df1: Merge "Add actions to non-JavaScript accessibility handler." into jb-dev 
* commit 'c6015df128811a52faf918bd34d0d7296c8a6834':
  Add actions to non-JavaScript accessibility handler.
 2012-05-17 17:17:27 -07:00
Charles Chen
4d39ba269c am 9a9a041c: Merge "Add movement actions to JS accessibility." into jb-dev 
* commit '9a9a041cb75a803856b22191db7e6bde7f1412e8':
  Add movement actions to JS accessibility.
 2012-05-17 17:17:25 -07:00
John Reck
ce619a9675 am 3d6f7ead: Merge "Tweak show/hide of touch highlight" into jb-dev 
* commit '3d6f7eadb27d37f3c1e2a9505526c5f4a6cf990e':
  Tweak show/hide of touch highlight
 2012-05-17 17:17:22 -07:00
Kenny Root
8101eb7a74 am ae9d040f: Merge "Wait for ASECs to be scanned before proceeding" into jb-dev 
* commit 'ae9d040f715130389de3dbc3bf52e24e5f29425a':
  Wait for ASECs to be scanned before proceeding
 2012-05-17 17:17:19 -07:00
Christopher Tate
1f4dda280b am 27cb3f8c: Merge "Eliminate "backup enabled but not provisioned" failure modes" into jb-dev 
* commit '27cb3f8c44be79f78a0c47b5631472705acb3e96':
  Eliminate "backup enabled but not provisioned" failure modes
 2012-05-17 17:17:17 -07:00
Jeff Brown
90ab4341cf am dc9445ba: Merge "Add support for grouping keyboard layouts by collection." into jb-dev 
* commit 'dc9445ba4cb2e261719d3c38956d9cbe1fddcd64':
  Add support for grouping keyboard layouts by collection.
 2012-05-17 17:17:15 -07:00
Bryan Mawhinney
c6bbc4e70f am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev 
* commit '9de61ae0ed40fcb147e09797bfb22dcea0b89df6':
  Fix video scaling mode validity check.
 2012-05-17 17:17:11 -07:00
Jean-Michel Trivi
e215af22bf am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev 
* commit 'c79a9eaced675d176dda570da6a08c6e54743bec':
  New action and extra in RecognizerIntent for "hands free" voice search
 2012-05-17 17:17:07 -07:00
Michael Jurka
e673396387 resolved conflicts for merge of ede4d56e to jb-dev-plus-aosp 
Change-Id: I8893e819f0f814a1fe1e0fb7f70dba860e889135
 2012-05-17 17:13:14 -07:00
Jim Miller
58a69d24c4 Merge "Fix 6398209: Re-enable vibrate for search gesture." into jb-dev 2012-05-17 17:11:48 -07:00
Jim Miller
80ad54cdcd Fix 6398209: Increase outer ring size for search gesture on 600dp device 
Change-Id: I75d136535148af21bc4e7f3f39803d22496d6fc5
 2012-05-17 17:05:40 -07:00