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

53613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
06e87407f7 Merge "Fix the issue where TextureView stuck if the producer side is too fast." 2011-06-22 13:42:34 -07:00
Brian Carlstrom
86b569020b Merge "JniUtil depends on webcore native library and should not depend on others to load it" 2011-06-22 13:42:07 -07:00
Robert Greenwalt
5ff886e531 resolved conflicts for merge of 7a652bc8 to master 
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
 2011-06-22 13:20:14 -07:00
Robert Ly
b6f9e5dd96 am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit '60506b4f68a081ec7169fccee5926bc092fe2a67':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-22 13:02:48 -07:00
Adam Powell
bacbe7fd72 Merge "Fix bug 4807086 - Options menu panel too narrow in landscape" 2011-06-22 12:58:03 -07:00
Robert Ly
60506b4f68 am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit 'd60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-22 12:52:25 -07:00
Robert Ly
d60e1b5b91 cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
 2011-06-22 12:44:02 -07:00
Mike Lockwood
181735a8d5 Merge changes I9851299e,I4160e73a 
* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
 2011-06-22 12:24:26 -07:00
Mike Lockwood
f59717ddb5 Combine UsbManager.setPrimaryFunction and setDefaultFunction 
Due to the property trigger on persist.sys.usb.config,
setting the default function also sets the current function.
Now we combine both of these methods into setCurrentFunction, which has
a "makeDefault" option to make the new function the default.

This change should eliminate some problems with setting properties due to
multiple property triggers happening at the same time.

Change-Id: I9851299e9c2ee20475eada1a8104c0d50bf5a9e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-22 15:19:33 -04:00
Dave Burke
0b62c2a6e0 Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE) 
Change-Id: If63fdda72a4399e264eed85e2e190c00f383a52d
 2011-06-22 20:18:18 +01:00
Shailendra
d7ed599263 Fix for kenBurn Effect for PNG image is crashing (4861071 ) 
Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
 2011-06-22 12:15:56 -07:00
Dianne Hackborn
b961cd2c80 Don't report a resize unless the window's surface actually changed. 
Change-Id: I133cf8e417753dba60d23a3bfc1c84ace983b335
 2011-06-22 12:10:25 -07:00
Svetoslav Ganov
5df21a1843 Merge "Minor tweak I forgot in the presious change." 2011-06-22 11:41:25 -07:00
Svetoslav Ganov
1ecc1e098a Minor tweak I forgot in the presious change. 
Change-Id: I17854e3c824bea5b6c0ffeea45f986f0b5297054
 2011-06-22 11:40:13 -07:00
Svetoslav Ganov
b5d578fbdb Merge "AccessibilityNodeInfo bounds inconsistent with compatibility mode." 2011-06-22 11:35:47 -07:00
Brian Carlstrom
98e1e18c1c Fix build. 
git cherry-pick --no-commit  22a614142aacce13fc46a0e524dbfb6ca56bf237

Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83
 2011-06-22 11:35:11 -07:00
Gloria Wang
eaa5d8f9c0 Timed text display format support: 
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata

Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
 2011-06-22 11:32:19 -07:00
Brian Carlstrom
452ffe7d1e JniUtil depends on webcore native library and should not depend on others to load it 
Bug: 4584468

Change-Id: Ib553cda843669d40cc52ff0bc84bea2c626c5045
 2011-06-22 11:29:56 -07:00
Adam Powell
a3e3c533ee Fix bug 4807086 - Options menu panel too narrow in landscape 
Now that landscape on phones uses the config_prefDialogWidth setting
to restrict the default size of dialog windows, the options menu panel
was affected.

Restrict the ratcheting preferred width feature based on the width
LayoutParam only, and respect the LayoutParams width provided by panel
windows.

Change-Id: Idc62f41910f6f22dc50cab978c5642bb0a8dbdaf
 2011-06-22 11:21:54 -07:00
Irfan Sheriff
1cc0fa416f am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'db45e0bdd02c2b9416b89999422561929feb5cc0':
  Release wakelock after use
 2011-06-22 11:21:12 -07:00
Bruno Oliveira
ecf161437e am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit '0310f4dad3b6ab8b050f6072050dc80374abafc2':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-22 11:21:09 -07:00
Irfan Sheriff
a08c552083 am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '38053dad9f8b988a162fba89545f4f7b8a09d34c':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:21:05 -07:00
Irfan Sheriff
5389c80d1f am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-22 11:19:09 -07:00
Irfan Sheriff
db45e0bdd0 am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use
 2011-06-22 11:10:26 -07:00
Bruno Oliveira
0310f4dad3 am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-22 11:10:24 -07:00
Irfan Sheriff
38053dad9f am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:10:16 -07:00
James Dong
032897470a Merge "Add some error log messages to indicate the failure of a recording session" 2011-06-22 11:07:52 -07:00
Irfan Sheriff
cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE 
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
 2011-06-22 11:01:16 -07:00
James Dong
0f5d8441ef Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem" 2011-06-22 10:33:25 -07:00
Philip Milne
0edc52970f Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." 2011-06-22 10:18:32 -07:00
James Dong
839ba2c183 Add some error log messages to indicate the failure of a recording session 
Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
 2011-06-22 10:09:03 -07:00
Mike Lockwood
7730ad569d Fix window leak in UsbPreferenceActivity 
Change-Id: I4160e73a4e840662c6ac724e27460853fb259eae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-22 12:02:10 -04:00
Irfan Sheriff
20b6ded6e3 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-22 07:47:16 -07:00
Irfan Sheriff
5d5b73be51 Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 2011-06-22 07:27:39 -07:00
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE 
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
 2011-06-22 07:11:42 -07:00
Grace Kloba
0bc6eb30bc Fix the issue where TextureView stuck if the producer side is too fast. 
When SurfaceTexture is in sync mode, the consumer needs to pull the pending
frames. Otherwise the onFrameAvailable won't be called and no more update.

This simple fix is to skip frame to keep up with the producer side.

Change-Id: Ica833695dc0b0221d2543f46f0dd41aa55d1aa16
 2011-06-22 01:29:13 -07:00
Grace Kloba
925bcaabde Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode. 
If there is more frame after updateTexImage, trigger the listener again.

Change-Id: I1415ae9a914cc8bb139cb369464b1f6a2aa24058
 2011-06-22 00:56:54 -07:00
satok
8969d9924c Revert "Create TextServiceManager and SpellCheckerService" 
This reverts commit eaddb894865a804279659b4aad6364a34ab50beb.
 2011-06-22 16:41:58 +09:00
satok
f86ee14f6a Merge "Create TextServiceManager and SpellCheckerService" 2011-06-22 00:02:55 -07:00
satok
c6080b3cc5 Merge "Add an ongoing notification to switch IME" 2011-06-21 23:09:00 -07:00
satok
7cfc0ed21a Add an ongoing notification to switch IME 
Bug: 4671417
Change-Id: I2b9e955003c1f6703978824c947d5f322a039714
 2011-06-22 15:08:08 +09:00
Jeff Brown
87b7f805b9 Send hover to all children under pointer. 
Previously we only sent hover to the topmost child, but this doesn't
handle cases where multiple children are overlapped to achieve
certain special effects.  Now we send hover to all children until
one of them handles it.

Also moved the call to send the accessibility event into the
main dispatch function so that we can send the accessibility event
for all innermost hovered views even when setHovered() might
not be called.

Change-Id: I6fb8b974db44b594c441deafc012b8415afdfac7
 2011-06-21 21:15:07 -07:00
Jeff Brown
194f4a7afd Merge "Only handle onHoverEvent in actionable views." 2011-06-21 21:12:24 -07:00
Jeff Brown
32b6328b0c Merge "Fix taint and nesting bugs." 2011-06-21 21:12:19 -07:00
Adam Powell
9c4e23c2b7 Merge "Fix bug 4818050 - Need a way to get notified when a PopupMenu gets dismissed/canceled" 2011-06-21 20:58:28 -07:00
Adam Powell
42b91bbcda Fix bug 4818050 - Need a way to get notified when a PopupMenu gets 
dismissed/canceled

Add an OnDismissListener to PopupMenu.

Change-Id: I7abe1b9c9bea5e758a9c32631185e50cd7eb1ed0
 2011-06-21 20:56:55 -07:00
Fabrice Di Meglio
aa4d46bb12 Merge "Fix bug #4796027 left/right padding regression after recent View change (part 2)" 2011-06-21 19:49:41 -07:00
Fabrice Di Meglio
f9e36506f1 Fix bug #4796027 left/right padding regression after recent View change (part 2) 
- revert previous fix (transforming >=0 to >0)
- initialize mUserPaddingStart and mUserPaddingEnd to -1 in the specific View(Context context) constructor
- cache mUserPaddingStart and mUserPaddingEnd a bit earlier in View(Context context, AttributeSet attrs, int defStyle) constructor
- cache also mUserPaddingStart and mUserPaddingEnd in setPaddingRelative()

Change-Id: Ibe398da7af35f77655d7006444fa49c9c5387f62
 2011-06-21 19:43:03 -07:00
Wink Saville
446a436cf3 am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 
* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
  Use dataConnectionNotInUse to decide if a DC is free.
 2011-06-21 19:37:46 -07:00
Wink Saville
66c37f5df2 am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 
* commit '64a09341d8a16212855b7cdd16fe079e25d45838':
  Fix handling of unsol_data_state_change with PDP sharing scenario
 2011-06-21 19:35:22 -07:00