Dianne Hackborn
b2771f1a41
Merge "resolved conflicts for merge of 77dd616e to master"
2011-05-25 20:35:04 -07:00
satok
f9f0100862
Add Apis to send notifications when the suggestion was picked
...
- Due to a strong request from VoiceIME
Bug: 4443922
Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
2011-05-26 11:02:31 +09:00
Dianne Hackborn
fee1c69a49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Romain Guy
7d70fbf0b5
Use OpenGL to render transition bitmaps.
...
When the IME is opened/dismissed, ViewAncestor would draw the
view hierarchy into a Bitmap, using the software rendering
pipeline. With this change, ViewAncestor will now use OpenGL.
Change-Id: I69e24570e12ff55f6f3cec18a664b33410a0eaf4
2011-05-25 11:13:19 -07:00
Dianne Hackborn
77dd616e68
am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
...
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
More compatibility mode improvements.
2011-05-24 19:13:45 -07:00
Dianne Hackborn
00b3a5c65e
am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
...
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
More compatibility mode improvements.
2011-05-24 19:10:53 -07:00
Dianne Hackborn
5be8de3420
More compatibility mode improvements.
...
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner. In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.
Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
2011-05-24 18:13:25 -07:00
Chet Haase
8d5f808f70
Add more functionality to ViewPropertyAnimator.
...
Allow ViewPropertyAnimator animations to be started immediately, canceled,
and to have an optional startDelay. This is functionality parallel to that
in the base Animator class.
Change-Id: I391f1810bf697656999bd6e3e63a59e46eb7eb8a
2011-05-24 15:56:41 -07:00
Chet Haase
cca2c98072
Add ability to transition parent hierarchy in layout transitions
...
This change compensates for changes in the parent hierarchy of
transitioning views. It automatically animates parents with the same
animations as those used for the CHANGING animations run on the container
children.
Change-Id: I86471d16a9070b024cc09c8f6e0f504a881fa99f
2011-05-24 15:29:39 -07:00
Romain Guy
383715aafe
Merge "Code cleanup."
2011-05-24 15:00:52 -07:00
Romain Guy
1c90f032fa
Code cleanup.
...
Change-Id: I5469a2c826c054f20e045ea098bdbcad9e11b17b
2011-05-24 14:59:50 -07:00
Jeff Brown
80fd47ce75
Input device protocol enhancements.
...
Added support for Linux multitouch protocol B (slots).
Added support for using the device's input properties as a hint
to determine the intended usage of a touch device.
Added support for the ABS_MT_DISTANCE axis.
Fixed a bug reporting the presence of the orientation axis.
Change-Id: Icf7b5a5a0f1a9cdf6ad2b35be8ea0c1a35815d48
2011-05-24 14:39:19 -07:00
satok
33bdc3c999
am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
...
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
Do not merge. Backport two fixes for InputMethethodFramework
2011-05-20 06:51:14 -07:00
satok
d9435bcecc
am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
...
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
Do not merge. Backport two fixes for InputMethethodFramework
2011-05-20 06:41:03 -07:00
satok
b4788fdbfd
Do not merge. Backport two fixes for InputMethethodFramework
...
Bug: 3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
2011-05-20 22:11:54 +09:00
Dianne Hackborn
161e67ff3b
resolved conflicts for merge of 06a8ceac to master
...
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
2011-05-19 21:44:52 -07:00
Dianne Hackborn
06a8ceacb0
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
...
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
2011-05-19 19:34:21 -07:00
Dianne Hackborn
c851ea5672
am 69cb8757: Add new "-swNNNdp" resource qualifier.
...
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
2011-05-19 19:30:32 -07:00
Dianne Hackborn
69cb87576b
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Romain Guy
71fcc865e3
Merge "Code cleanup."
2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2
Code cleanup.
...
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
2011-05-19 16:15:46 -07:00
Cibu Johny
1714c21c15
View horizontalDirection public attribute resolution to an internal var.
...
- add more comment
Change-Id: I514c6ace3a98d56aa0b5c52221dee3045656071f
2011-05-19 10:18:16 -07:00
Svetoslav Ganov
d36a699410
Fixing my build fix
...
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
2011-05-18 20:50:03 -07:00
Romain Guy
0a2ed6de7b
Merge "Improve LayoutInflater's compliance."
2011-05-17 15:06:09 -07:00
Romain Guy
9c1223a713
Improve LayoutInflater's compliance.
...
There are standards, we should do our best to implement them
properly.
Change-Id: I83a7dc0651795d09b19d536c17b6aefc2eca5c81
2011-05-17 14:25:49 -07:00
Fabrice Di Meglio
dff7897548
Merge "View horizontalDirection public attribute resolution to an internal var."
2011-05-17 14:16:43 -07:00
Chet Haase
63e2c0888d
Merge "Fix for using HARDWARE layers on unaccelerated views."
2011-05-17 14:00:53 -07:00
Chet Haase
6f33e81a0b
Fix for using HARDWARE layers on unaccelerated views.
...
If a view is not accelerated but has its layer type set to
LAYER_TYPE_HARDWARE, then the framework will use the old drawing cache
approach, to cache it in a bitmap. This works fine, but when the layer
is set to NONE, that drawing cache is not destroyed, as it would be were
the layer set to LAYER_TYPE_SOFTWARE. This prevents future invalidations on
the view from working correctly because the bitmap cache has never been
destroyed and recreated.
The fix is to always destroy the drawing cache when the layer type is
changed from SOFTWARE or HARDWARE, to make sure that it gets set appropriately
regardless of the state of the view's acceleration.
Change-Id: I449649e6d370477825015505da76564455a156e6
2011-05-17 12:42:19 -07:00
Dianne Hackborn
9d31154d0b
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc
Add new command line option to change global screen size.
...
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Cibu Johny
8666663e6e
View horizontalDirection public attribute resolution to an internal var.
...
Change-Id: Id87ab188faef27ff039cf6a400118707ee74a27d
2011-05-16 16:03:31 -07:00
Fabrice Di Meglio
b5dde704cd
Merge "Adding horizontalDirection public attribute for View."
2011-05-16 15:13:10 -07:00
Cibu Johny
7632cb9be5
Adding horizontalDirection public attribute for View.
...
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
2011-05-16 15:08:27 -07:00
Dianne Hackborn
60e13114eb
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
68066c2f38
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
...
Not yet working, so turned off.
Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.
Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9
am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:04:49 -07:00
Dianne Hackborn
fddd927fb7
am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:02:57 -07:00
Dianne Hackborn
f97ed77197
am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 13:01:38 -07:00
Dianne Hackborn
29735689ce
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
...
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 12:57:00 -07:00
Dianne Hackborn
ac8dea12c1
DO NOT MERGE. Integrate from master: Rework display size access.
...
Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.
Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
2011-05-16 11:58:27 -07:00
Romain Guy
02739a8eec
Fix javadoc issues
...
Change-Id: Ife66a8664955ac1a79b6ffd0080000c820f24632
2011-05-16 11:53:31 -07:00
Dianne Hackborn
24df0757f8
am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d
am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Dianne Hackborn
f9dd34f4d3
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
And clean up some documentation.
Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
2011-05-13 18:31:04 -07:00
Eric Fischer
aa126171ae
Fix the build by removing @Override within javadoc comments.
...
Change-Id: I984cc6224185ab84e904bfc89eae80d567fcb59b
2011-05-13 16:08:24 -07:00
Romain Guy
8bd6d36c68
Merge "Remove useless code."
2011-05-13 14:50:06 -07:00