Commit Graph

6702 Commits

Author SHA1 Message Date
Mady Mellor
d032091fec Merge "Recognizes the stylus scale gesture in ScaleGestureDetector" 2015-03-31 17:11:44 +00:00
John Reck
c74e289a65 Merge "Add GraphicsStatsService" 2015-03-30 19:39:27 +00:00
Alan Viverette
34457f51e0 Fix ViewRootImpl handling of content changes, fix ViewPager parenting
Previously content changes were only handled if they came directly from
the focused host, which meant that changes that occurred higher in the
tree were ignored. As a result, scrolling in ViewPager that contained
virtual nodes would fail to update the focus position.

Change-Id: I028bd8c670f1210339da331626e1986c5b5d4b87
2015-03-30 12:15:25 -07:00
Alan Viverette
60b674e07b Clean up date picker attributes, add carets
Bug: 19819283
Bug: 19431364
Change-Id: Idd66f4ceb99d598c0f256d85c43bff6e25ccdd8f
2015-03-30 12:15:25 -07:00
Mady Mellor
847d17fcba Recognizes the stylus scale gesture in ScaleGestureDetector
If a user drags with a stylus (or mouse) across the screen with
the stylus primary (or mouse secondary) button clicked, this will
initiate a scale gesture that functions similarly to the quick
scale gesture: drag below starting point zooms in, drag above
starting point zooms out.

Combines some of the logic for quick scale and button
scale due to similarities.

Bug: 19620246
Change-Id: Ic53499d07cf6cef48b467dbb41f83cea433febad
2015-03-30 09:42:12 -07:00
Mathieu Chartier
f37c099c70 am 2169c68a: am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '2169c68aa330670ab340ec7faaedb5e5a9a59360':
  Change getDeclaredFieldsUnchecked call to new return value
2015-03-30 00:36:51 +00:00
Mathieu Chartier
d9dddea504 am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
2015-03-29 22:42:53 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
2015-03-27 18:55:50 -07:00
John Spurlock
0f09c3d0b6 Merge "Fix a few found doc problems." 2015-03-27 21:13:22 +00:00
John Reck
edc524c905 Add GraphicsStatsService
More S's for More Speed

Split JankTracker's backing data from the
class to allow for data relocation to/from ashmem regions

Pack the jank tracking data to fit in 256 bytes

Change-Id: Ife86a64b71a328fbd0c8075fe6a0404e081f725b
2015-03-27 11:50:56 -07:00
Adam Powell
9c66583379 Merge "Fix default gravity for View foreground drawables" 2015-03-26 02:17:49 +00:00
Adam Powell
6579f5090a Fix default gravity for View foreground drawables
Use the expected default gravity of Gravity.FILL as FrameLayout used
to do. Reset the bounds correctly when a new drawable is set.

Bug 19922909

Change-Id: I80181923c37e33ba308e364e322d84f3cc86e93b
2015-03-25 19:14:12 -07:00
Alan Viverette
26c44eeecf Add accessibility action for making a node visible on screen
Bug: 19872425
Change-Id: I39c971f949d08d6573da2e5567dca1e187a17d7e
2015-03-25 14:54:13 -07:00
Prerepa Viswanadham
e564c00e2b Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge" 2015-03-25 20:02:29 +00:00
Adam Powell
16e30f5e5f Merge "Fix right click to context menu behavior of View." 2015-03-25 02:26:26 +00:00
John Spurlock
bc4cf00dc5 Fix a few found doc problems.
Change-Id: I98567f4a0fc96f501c00bf361688e2c55232f78d
2015-03-24 21:51:20 -04:00
Jun Mukai
33e3036a38 Fix right click to context menu behavior of View.
When the View opens the context menu, the mouse-down event is
already handled. Therefore, the next ACTION_UP should be canceled,
otherwise, single right click shows the context menu and then
invokes the normal click actions.

Also, the right-down event should always be consumed regardless
of the context menu support. "the right click opens the context
menu on some views, but it behaves as a normal click on some
other views" would confuse users.

Bug: 19641497
Change-Id: Ibbc18fe641745cf42382129b81858d8f3d14768b
2015-03-24 17:24:10 -07:00
Adam Powell
cd9db854dc Merge "Move foreground drawable down from FrameLayout into View" 2015-03-24 23:26:59 +00:00
Adam Powell
2b25e2eee0 Move foreground drawable down from FrameLayout into View
This will allow any View to include foreground drawables. This is
useful for cases where a foreground drawable is a more appropriate
place to put a state list to show focus or touch highlighting.

Also add View#onDrawForeground as a public API hook for drawing
decorations after primary view content and child views such as
scrollbars, foreground drawables and EdgeEffects.

Change-Id: If1e4700af69db6876970f8f4ad5e3eab11b8034c
2015-03-24 16:19:20 -07:00
John Spurlock
b4f01b966b Remove the ability to disable audio service.
Running in a configuration without audio service is not fully tested.
Remove the configuration option for now. Also remove unused delegation
layer in SoundPool.

Bug: 19891112
Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
2015-03-24 17:22:13 -04:00
Prerepa Viswanadham
4209a28270 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
2015-03-24 13:46:08 -07:00
Griff Hazen
daf5c0ebd0 Merge commit '583c7c56' into master
Change-Id: I89c2c63005fbb6b1c058b2022f4469be5244505f
2015-03-23 16:34:11 -07:00
Jeff Brown
04bf45a300 Merge "resolved conflicts for merge of 13d81b6d to master" 2015-03-23 21:02:30 +00:00
Jeff Brown
221a8277dc resolved conflicts for merge of 13d81b6d to master
Change-Id: Icb72123fcf4b74e97d9a62504caf8a17eb65c9e6
2015-03-23 13:53:09 -07:00
Alan Viverette
29abdb429c Merge "Correctly apply android:theme attribute from <include> tag" 2015-03-23 20:50:54 +00:00
Griff Hazen
38f75097ff am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
  Allow emulator to select a window outset bottom
2015-03-22 00:05:48 +00:00
Alan Viverette
6194d728cf Correctly apply android:theme attribute from <include> tag
Bug: 19865544
Change-Id: I6b50fa9f28a9d7f1685f9f55e505c630c12c53a2
2015-03-20 15:49:06 -07:00
Tim Kilbourn
a81c231d31 Merge "Add unique id to InputDevice." 2015-03-20 18:46:20 +00:00
Tim Kilbourn
415b450bf2 Add unique id to InputDevice.
If an input device driver assigns unique ids to devices (e.g., MAC
address), this method will be used to retrieve it from the device.

Change-Id: If1fd6643c5be7af5b989ef47f4bb653e7a63b6c6
2015-03-20 11:43:12 -07:00
Alan Viverette
eef3bcbbe4 Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()" 2015-03-19 01:54:09 +00:00
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList()
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
2015-03-18 18:37:18 -07:00
Andreas Gampe
27f2fe5c1a am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 23:50:54 +00:00
Naveen Kalla
fd69e2a258 Fix setSurfaceTexture to handle surface caching
TextureView contains its surfaceTexture (i.e. mSurface)
and its OnFrameAvailableListener(i.e. mUpdateListener).
In order to apply a cached/pre-existing SurfaceTexture s1 to a
TextureView, if we call TextureView.setSurfaceTexture(s1),
the OnFrameAvailableListener of s1 should get set to mUpdateListener
of TextureView since the mSurface has been updated.
The existing code doesn't apply this and causes the frames to not be
updated on a TextureView that uses setSurfaceTexture.
This change fixes setSurfaceTexture method by setting s1's
OnFrameAvailableListener to mUpdateListener.

Change-Id: I4c1a704c587e977ab7a6b1fe3a7d3e0d20d00218
2015-03-18 15:57:10 -07:00
Andreas Gampe
b078ff16a3 am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
  Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 22:33:28 +00:00
Chris Craik
43c410eaac Merge "Remove HardwareCanvas" 2015-03-18 21:36:56 +00:00
Alan Viverette
dd0d4b7579 Merge "Enable/disable hardware rendering on windows by application tag" 2015-03-18 21:32:19 +00:00
Alan Viverette
9b0ab65ed4 Enable/disable hardware rendering on windows by application tag
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6.
This patch provides a way of setting hardware rendering for
that case.

Change-Id: I60ee9566e99db39cd661fe6f196f43c3968b311a
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-18 14:21:04 -07:00
Ed Heyl
07459a3617 Merge "Fix build: Revert "Enable/disable hardware rendering on windows by application tag"" 2015-03-18 20:40:47 +00:00
Ed Heyl
1445469b9e Fix build: Revert "Enable/disable hardware rendering on windows by application tag"
This reverts commit ae114d2eb4.

Change-Id: I5400c9aa121491164e8739892408c377b99f3980
2015-03-18 20:39:37 +00:00
Alan Viverette
78d9de97a6 Merge "Enable/disable hardware rendering on windows by application tag" 2015-03-18 20:01:50 +00:00
Alan Viverette
ae114d2eb4 Enable/disable hardware rendering on windows by application tag
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6.
This patch provides a way of setting hardware rendering for
that case.

Change-Id: I08ce58a8644970a2a18407e83ad317a72a2dad10
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-18 12:43:08 -07:00
Andreas Gampe
4236ad7a2f Frameworks/base: Fix potential NPE in InputMethod
Don't read the size of an unchecked list.

Bug: 19797138
Change-Id: I9d8c087aff7bc9cc1e8aae9a0b489e23b5442765
2015-03-17 21:07:21 -07:00
Dianne Hackborn
27eac1d58f Add ability to get a screenshot for assist.
New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.

Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a
2015-03-17 16:45:51 -07:00
John Spurlock
d799f70187 Merge "Audio: Flag volume adjustments from hardware keys." 2015-03-17 19:19:01 +00:00
John Spurlock
b94f2d6cad Audio: Flag volume adjustments from hardware keys.
Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
2015-03-17 14:15:02 -04:00
Clara Bayarri
15f78bbd6f Merge "Floating toolbars: Add content rect related methods to API" 2015-03-17 15:43:51 +00:00
Andreas Gampe
11b07c05ac am 14e436ae: am 345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '14e436aec45e7d83c2b3695c07d9740b9fd7f043':
  Frameworks/base: Fix a comparison
2015-03-17 14:29:50 +00:00
Clara Bayarri
cba5fc22d1 Floating toolbars: Add content rect related methods to API
This CL adds the ActionMode.Callback2 abstract class and the rect
invalidate method needed to add the content rect API for Floating
Toolbars. It also extends the existing ActionModeCallbackWrapper in
DecorView to handle the case when ActionMode.Callback is provided
instead of Callback2, falling back to a default implementation.

Change-Id: Ia918ddfcfdf73d0e4cafd24c4a0573245d497cfe
2015-03-17 01:07:14 +00:00
Andreas Gampe
14e436aec4 am 345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
  Frameworks/base: Fix a comparison
2015-03-17 00:25:04 +00:00
Andreas Gampe
345a8f69ea Merge "Frameworks/base: Fix a comparison" 2015-03-17 00:12:25 +00:00