45850 Commits

Author SHA1 Message Date
Mike Lockwood
acb535a7a5 am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:33:12 -08:00
Mike Lockwood
82752ef4f8 am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:33:02 -08:00
Mike Lockwood
1b8956398b am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:21:20 -08:00
Mike Lockwood
bbd460d76d am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:21:05 -08:00
Mike Lockwood
69e19ae15b DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
BUG: 3402847

Change-Id: Ic731e49b43fa40df6f8b658d8620a99a85c346e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:22 -05:00
Mike Lockwood
6aea1154ba DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
BUG: 3402847

Change-Id: I7cb199763e8d5386914b4c2173c9e1579b08674c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:00 -05:00
Mike Lockwood
5053124827 KeyguardManager: Fix copy & paste error in isKeyguardLocked()
Change-Id: If5145e8483d3736d73698b3deb189f2253015543
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 11:23:49 -05:00
Jamie Gennis
fd8876140d Merge "Expand on the SurfaceTexture API docs." 2011-02-25 18:15:22 -08:00
Jesse Wilson
15b07f4c6b Merge "Handle rename of LruCache.entryEvicted to entryRemoved" 2011-02-25 17:55:00 -08:00
Jeff Brown
42c5eec0ce Merge "Add support for mouse hover and scroll wheel." 2011-02-25 17:28:50 -08:00
Jesse Wilson
32c80a27da Handle rename of LruCache.entryEvicted to entryRemoved
Change-Id: I50e5a8d8c35c4431f42c7483172447ba0e4e125b
http://b/3461302
2011-02-25 17:28:41 -08:00
Jesse Wilson
affe40af3c Merge "Callback on any removal, not just evictions." 2011-02-25 17:15:44 -08:00
Glenn Kasten
506b70c17b Merge "Revert the 11.xml part of bug 3438513" 2011-02-25 17:10:00 -08:00
Jesse Wilson
7db1b40a03 Callback on any removal, not just evictions.
Don't hold locks while running create or remove callbacks. That gets a bit
ugly because it means a create could be unwanted by the time it returns.

Change-Id: I14b2b3ed41a446750f8ee5a7e35cb8d801c4ce6d
http://b/3461302
2011-02-25 17:06:34 -08:00
Jeff Brown
33bbfd2232 Add support for mouse hover and scroll wheel.
Dispatch ACTION_HOVER_MOVE and ACTION_SCROLL through the View
hierarchy as onGenericTouchEvent.  Pointer events dispatched
this way are delivered to the view under the pointer.  Non-pointer
events continue to be delivered to the focused view.

Added scroll wheel support to AbsListView, ScrollView,
HorizontalScrollView and WebView.  Shift+VSCROLL is translated
to HSCROLL as appropriate.

Added logging of new pointer events in PointerLocationView.

Fixed a problem in EventHub when a USB device is removed that
resulted in a long stream of ENODEV errors being logged until INotify
noticed the device was gone.

Note that the new events are not supported by wallpapers at this time
because the wallpaper engine only delivers touch events.

Make all mouse buttons behave identically.  (Effectively we only
support one button.)

Change-Id: I9ab445ffb63c813fcb07db6693987b02475f3756
2011-02-25 17:06:07 -08:00
Dianne Hackborn
d752c3b3e6 Merge "Implement issue #3426299: Introduce application "stopped" state" 2011-02-25 16:15:27 -08:00
Chet Haase
53c7b1d544 Merge "ViewPropertyAnimator cancels prior animations" 2011-02-25 16:02:34 -08:00
Andreas Huber
b93dfa61a4 am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:43:07 -08:00
Andreas Huber
cd6828e842 am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:38:06 -08:00
Andreas Huber
2332cd8c67 Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb 2011-02-25 15:33:28 -08:00
Adam Cohen
54a351ed62 Merge "Adding framework support for resizable widgets" 2011-02-25 15:28:29 -08:00
Robert Greenwalt
7532d9972c Merge "Fixing the write of BackgroundData setting." 2011-02-25 15:20:30 -08:00
Christopher Tate
e2ed9562fc Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"
This reverts commit c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b.
2011-02-25 15:18:53 -08:00
Winson Chung
04ee429e89 Merge "Fixing build" 2011-02-25 15:17:17 -08:00
Winson Chung
22bc69de50 Fixing build
Change-Id: I3d60c115190a6e478777229d4851dedc78111c39
2011-02-25 15:14:40 -08:00
Adam Cohen
d2e20de64b Adding framework support for resizable widgets
-> Added resizeMode to the widget xml
-> Fixed an unexposed bug in AppWidgetHost where
   minWidth and minHeight were never being converted
   from complex type to dp

Change-Id: Ibbc4fc6542d095623ac2a40694b6a3dbfeb279ad
2011-02-25 15:10:40 -08:00
Alex Sakhartchouk
45b1adf947 Merge "Moving dependency includes out of librs headers." 2011-02-25 14:53:34 -08:00
Dianne Hackborn
e7f972122d Implement issue #3426299: Introduce application "stopped" state
The package manager now keeps track of whether an application is
stopped.  There are new intent flags to control whether intent
filters in a stopped application will match the intent.  This is
currently used in one place, sending broadcasts, so that stopped
apps can not be launched due to background processes.

The package manager during first init makes sure no applications
are in the stopped state.  When new applications are installed,
that begin in the stopped state.  When the activity manager is
launching a component of an application, it ensures the application
is taken out of the stopped state.

The "force stop" button in manage applications will now put an
application back in to the stopped state; it can't go back out
of the stopped state until one of its components is launched by
the activity manager.

There will probably be a few more places where we need to filter
stopped applications out of intent matches, but doing this for
broadcast is a very big first step.

This also introduces a new broadcast that is sent to an application
after it is replaced with a new .apk.  But only if the app is not
in the stopped state.  This makes it a lot easier for developers to
implement code to get their application back in proper running shape
after an upgrade.

Finally another new broadcast is added that is sent to a package's
installer at the first time it is launched.  This allows the installer
to tell the package about it being installed only when it is first
actually used.

Change-Id: I589c53ff0e0ece868fe734ace4439c0d202dca2d
2011-02-25 14:46:27 -08:00
Winson Chung
541466f6d6 Merge "Fixing issue where RemoteViewsService.onDestroy() was never being called." 2011-02-25 14:30:37 -08:00
Xavier Ducrohet
75321ebf79 Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods." 2011-02-25 14:28:20 -08:00
Jaikumar Ganesh
63a2e62a39 Merge "Unset device trust state before unpairing." 2011-02-25 14:25:16 -08:00
Jaikumar Ganesh
cc2c06656c Unset device trust state before unpairing.
a) Device is trusted.
b) Device is unpaired.
c) We need to set the trusted value before unpairing.

Else on the next pairing, the device will be trusted automatically
and we will not show the PBAP authentication dialog.

Change-Id: I8d7c962688885885d37be341e5494069294eb392
2011-02-25 14:16:27 -08:00
Winson Chung
84bbb02021 Fixing issue where RemoteViewsService.onDestroy() was never being called.
Change-Id: I15ad04eee18bc3e09d4846c7f2f2d2d8d168e518
2011-02-25 14:06:47 -08:00
Gilles Debunne
0277c17128 Merge "Code clean-up around ScrollView." 2011-02-25 13:48:19 -08:00
Gilles Debunne
05b5590281 Merge "Removed ViewTreeObserver in TextView when handles are hidden" 2011-02-25 13:47:37 -08:00
Robert Greenwalt
db4afae70a Fixing the write of BackgroundData setting.
I outsmarted myself trying to minimize writes and caused no writes to occur.

bug:3485934
Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec
2011-02-25 13:44:09 -08:00
Jamie Gennis
8588732712 Expand on the SurfaceTexture API docs.
This change adds additional documentation explaining how a
SurfaceTexture should be used in OpenGL ES.  It describes some of the
limitations of using the GL_TEXTURE_EXTERNAL_OES texture target.

Change-Id: I7424c1b422e4f402e87372e8b361391fbec82c5c
2011-02-25 13:34:06 -08:00
David Li
4368c449d7 Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0" 2011-02-25 12:59:14 -08:00
Samyeoul Choi
4b7c6fa2c0 am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '350799b72c3180e04ec91469509f6079c932b971':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:55:35 -08:00
Samyeoul Choi
350799b72c am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:51:51 -08:00
Svetoslav Ganov
bc006dc0aa am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit 'dc365a36dac50bccc1411c37839513daec56d335':
  Use different version of CLDR data in DatePicker
2011-02-25 12:45:53 -08:00
Chet Haase
ba592d2003 ViewPropertyAnimator cancels prior animations
The initial approach of VPA was to cancel previous animations
on the same exact set of properties. This worked in most cases,
but if the new animation had a different set of properties
(like animating alpha, x, and y instead of just x and y), then
there was a possible artifact as the old animation continued to
run in the background and could show the button in the wrong
location as a result.

The new approach is to search all running animations for
a property when a new animation is requested on it and to
remove that property from the list of properties being animated
by that previous animation. The prior animations continue to
run, but will no longer update that property, which will now be
controlled solely by the new animation requested.

Change-Id: Ib35d54a5e91be0a1310725be6e2acbaa6ead4a4e
2011-02-25 12:44:42 -08:00
Svetoslav Ganov
dc365a36da Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-25 12:40:57 -08:00
Svetoslav Ganov
f114809031 resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Samyeoul Choi
6c5d9a0622 am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
David Li
cf28957c89 Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0
0 Is a valid attribute location.

Change-Id: Ib24335f48efd6cc59e2ab877569d7d0c95f8490a
Signed-off-by: David Li <davidxli@google.com>
2011-02-25 12:05:44 -08:00
James Dong
097d3a4729 Merge "mp4a box contains mp3 audio when the object type indication is 0x6b" 2011-02-25 11:52:14 -08:00
Eric Fischer
0805d104cc Merge "Import revised translations." 2011-02-25 11:48:14 -08:00
Eric Fischer
a1a71260b7 Import revised translations.
Change-Id: I15bff66ef87f6c0b0ac381b18f1b98a9ed05f560
2011-02-25 11:30:10 -08:00
Samyeoul Choi
092238916f Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.

So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.

Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
2011-02-25 11:28:43 -08:00