Commit Graph

6851 Commits

Author SHA1 Message Date
George Mount
3f9a81757e am 7b44e5b5: am a31b76e4: am b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into mnc-dev
* commit '7b44e5b5b96bc88b4f328dc1d1c2228e525e1bc8':
  Fix crash during Activity Transition with TextureView.
2015-05-07 17:17:04 +00:00
Yohei Yukawa
c38088b4a4 am 9e391183: am c3d4c6a5: am f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '9e391183a59adddeb81537f0250b4434d1f71284':
  Retry "Always show auxiliary subtypes from NavBar keyboard icon."
2015-05-07 17:16:27 +00:00
George Mount
b3ba213895 Merge "Fix crash during Activity Transition with TextureView." into mnc-dev 2015-05-07 14:34:02 +00:00
Bart Sears
f90d8fe435 am 4bbfd055: am d54276f6: am 1b0888fe: Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '4bbfd055111b6120dcf4a8fa971806c27b7dca65':
  Revert "Always show auxiliary subtypes from NavBar keyboard icon."
2015-05-07 05:42:12 +00:00
Adam Powell
1ac256a1e7 am f1b3e224: am 7068697e: am 90ae4553: Merge "Move PhoneWindow and friends back into internal package" into mnc-dev
* commit 'f1b3e2243f93a626393602177162f0bebb8772ab':
  Move PhoneWindow and friends back into internal package
2015-05-07 05:41:04 +00:00
Seigo Nonaka
2f786847a7 am 47d2753a: am 98b14c46: am 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
* commit '47d2753a3b629011e31f43f953290ecd0a6b8c6a':
  Always show auxiliary subtypes from NavBar keyboard icon.
2015-05-07 05:39:40 +00:00
Seigo Nonaka
14e139179b Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.

Hereafter the original CL description is repeated.

The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
2015-05-06 21:34:07 -07:00
Bart Sears
1b0888fe8e Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 01:52:08 +00:00
Bart Sears
d130bdc462 Revert "Always show auxiliary subtypes from NavBar keyboard icon."
CL is breaking the build.  Discussed with Seigo and verting until he can take a look at it.

This reverts commit 80ff4ed6bb.

Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
2015-05-07 01:51:28 +00:00
George Mount
8261a3f5ed Fix crash during Activity Transition with TextureView.
Bug 20675857

GhostView was synchronously forcing the View's parent to get
the display list when it was created. TextureView's cannot
create a display list until a surface is available and will
crash if it is attempted. This change moves the request to
an invalidate to get it to execute at a later time.

Change-Id: I12afebdfd57eb29c1a35b23a63d045e319547faf
2015-05-06 16:24:07 -07:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
2015-05-06 15:57:09 -07:00
Seigo Nonaka
06bdf9c6a6 Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev 2015-05-06 20:31:19 +00:00
Seigo Nonaka
80ff4ed6bb Always show auxiliary subtypes from NavBar keyboard icon.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994

Change-Id: I1e50ee42838a1bf64a612da4904aa93458d44ea4
2015-05-06 20:29:05 +00:00
Alan Viverette
8876e44449 am 14823d60: am 72a04431: am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
* commit '14823d609aa66cf2980a7be0c613897752bd332a':
  Add scroll indicators on View, use in AlertDialog
2015-05-06 17:51:09 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
2015-05-06 10:09:35 -07:00
Chris Craik
629f9c715c am 8fffd604: am 217ade77: am 356b1777: Merge "Cleanup properties" into mnc-dev
* commit '8fffd6045d0eb27fbd6e894f6eee9818cda973bc':
  Cleanup properties
2015-05-05 22:03:13 +00:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00
Chris Craik
2507c34d91 Cleanup properties
bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9
2015-05-05 10:36:09 -07:00
Alan Viverette
21d7cb6f26 am dc49a8bb: am d0dfb237: am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev
* commit 'dc49a8bb23e765525f1bc752a417cb43cba19dbf':
  Always force constructors accessible during inflation
2015-05-05 01:36:10 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
P.Y. Laligand
5c7773d864 Display mode switches.
Knowledge of the various modes of a display is now available to apps, and they can request a specific mode for their windows.

b/18241736

Change-Id: I8eb16ff713e878512faca3ca6662254f08a9be7f
2015-05-04 13:30:58 -07:00
Alan Viverette
904de2ec93 Always force constructors accessible during inflation
We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.

Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.

Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f
2015-05-04 10:32:57 -07:00
John Reck
ecc00b8138 am 0b1c17bd: am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':
  Remove Bitmap#getSkBitmap
2015-05-04 14:53:48 +00:00
John Reck
a525bb6694 am dd447382: am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':
  Move AssetAtlas off of SkBitmap*
2015-05-04 14:53:43 +00:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Chris Craik
2eff3571b6 am 6e51a707: am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
2015-05-01 22:17:17 +00:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
Chris Craik
85dd91ac88 am 9eeb725d: am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev
* commit '9eeb725d91beeaec6631ec73e5856795dcdada73':
  Fix build.
2015-05-01 21:38:20 +00:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde2.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
2015-05-01 14:30:15 -07:00
Chris Craik
255951e204 am e920b145: am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
* commit 'e920b1459a0ecd4240df78a616b56c0230446c5c':
  Merge getDisplayList and updateDisplayListIfDirty
2015-05-01 21:14:55 +00:00
Chris Craik
07c801d712 am ed862369: am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev
* commit 'ed8623690b710ccb601373a622b09d96d7d15904':
  Update alpha documentation
2015-05-01 21:14:49 +00:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build.
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b53.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
2015-05-01 21:01:01 +00:00
Chris Craik
f4ff8f701f Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5 Merge "Update alpha documentation" into mnc-dev 2015-05-01 20:36:03 +00:00
Doris Liu
9f8c17d2bb am b343db76: am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
* commit 'b343db76aa8623a0253746f70beb5543c3ae5473':
  Make sure transform matrix is applied when hardware layer is re-created
2015-05-01 18:30:48 +00:00
Doris Liu
27cfed7ba5 Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 2015-05-01 17:54:44 +00:00
John Reck
1742c743c9 am 1ad0936c: am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev
* commit '1ad0936c77d3c742970e7051c62c715a00c082ca':
  A bunch more cleanups
2015-05-01 15:12:22 +00:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
Alan Viverette
ec48536d30 am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '4cff05e1f7ec780f1ab0b77202453867eaf146f3':
  LayoutInflater should always try to generate LayoutParams for include
2015-05-01 01:33:00 +00:00
Doris Liu
6b471995cb Make sure transform matrix is applied when hardware layer is re-created
Bug: 11168275
Change-Id: I9234a2efc7580d27ac8b7f0e60ceed7df23f5f25
2015-04-30 17:16:46 -07:00
Chris Craik
dd2a3bc1ba Update alpha documentation
bug:19412691
bug:20254728

Change-Id: I5bcdd888fb7b6498d43957a3ef32d3ad13683ad0
2015-04-30 16:57:30 -07:00
Chris Craik
f85d064b53 Merge getDisplayList and updateDisplayListIfDirty
bug:17767704

Change-Id: I5dffc0fa343d5d67d5fe59c78eca77bb8645ce0e
2015-04-30 16:18:22 -07:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
2015-04-30 16:17:16 -07:00
John Reck
3731dc220e A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-30 14:34:55 -07:00
Alan Viverette
ac7927a895 Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 2015-04-30 21:03:23 +00:00
Alan Viverette
84aa2fb65a LayoutInflater should always try to generate LayoutParams for include
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.

Bug: 20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
2015-04-30 12:33:54 -07:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00