Jeff Brown
371790b774
resolved conflicts for merge of 955e8d79 to master
...
Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18
2011-06-03 17:24:05 -07:00
Fabrice Di Meglio
ce08f78560
Merge "Fix default TextView gravity"
2011-06-03 14:37:23 -07:00
Fabrice Di Meglio
ea28694aee
Fix default TextView gravity
...
- default set to Gravity.TOP | Gravity.BEFORE instead of Gravity.TOP | Gravity.LEFT
Change-Id: I5e528fb1d0a6e3c84dd506e899df33c9b58d25f3
2011-06-03 14:29:45 -07:00
Adam Powell
b93ffdb5d5
am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit 'b30dda6b550fedcf5c3b15671d483205a7757e1b':
Framework: bugfix for menu selector not showing up properly.
2011-06-03 14:28:26 -07:00
Philip Milne
160cbbb9ac
Merge "Response to code review for GridLayout:"
2011-06-03 13:46:34 -07:00
Philip Milne
aa616f31fe
Response to code review for GridLayout:
...
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.
Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
2011-06-03 13:22:52 -07:00
Amith Yamasani
99ce8abc3f
am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
Use Holo background and proper padding for App Permissions UI.
2011-06-03 11:11:22 -07:00
Gilles Debunne
955e8d79b1
am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
...
* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
Tap timeout removed on paste. Relying on position only.
2011-06-03 10:35:58 -07:00
Gilles Debunne
0538e6217d
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
2011-06-03 10:26:18 -07:00
Gilles Debunne
793a940b84
Tap timeout removed on paste. Relying on position only.
...
Change-Id: I2e2b4a68f17957a2631a545badd602e4d127cfc3
2011-06-02 16:55:15 -07:00
Fabrice Di Meglio
bce84d2bca
Improve ViewDebug informations for View and LineaLayout
...
Change-Id: Ie34519c975027dead806b7859b638d78c39ace77
2011-06-02 15:57:01 -07:00
Gilles Debunne
e9ff92d7d2
Merge "Remove suggestion span underline on device rotation"
2011-06-02 09:45:32 -07:00
Gilles Debunne
aa67eef1b6
Remove suggestion span underline on device rotation
...
Change-Id: I2fca995f839eff84ee8c62289f6f110ebb8dd321
2011-06-01 18:03:37 -07:00
Fabrice Di Meglio
77c1cc0aa4
Merge "Fix bug #4509967 (layout_gravity not always respected)"
2011-06-01 17:40:11 -07:00
Fabrice Di Meglio
de35ceeeb9
Fix bug #4509967 (layout_gravity not always respected)
...
- fix FrameLayout
- code refactoring on LinearLayout
- add more unit tests
Change-Id: I49302582c61aa31a4eb7eded92327b10408f71a4
2011-06-01 16:46:25 -07:00
Amith Yamasani
23a5996b2b
Merge "Keep track of USER_QUERY to pass to the intent."
2011-06-01 14:15:09 -07:00
Adam Powell
b30dda6b55
am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit '036c40f443a6d83881bc336a94b5da41bbc0bbcc':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:53:15 -07:00
Justin Koh
3c7b96a346
Framework: bugfix for menu selector not showing up properly.
...
Menu selector wasn't showing up properly because selector state wasn't updated after touch mode. Added this to resurrectselection call.
http://b/issue?id=4372583
TESTED = runs on M4.
Change-Id: I349c3b86f4e8a1a02a20494b547859d0c12867ee
2011-06-01 11:22:01 -07:00
Gilles Debunne
829de65b9a
Merge "Select all for text shown as an icon on smaller screens"
2011-06-01 10:13:42 -07:00
Gilles Debunne
5e9af2ddf0
Select all for text shown as an icon on smaller screens
...
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.
Note: requires a definitive selectAll icon from designers.
Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b
Merge "Fix TextView potential NPE in isLayoutRtl()"
2011-05-31 16:57:55 -07:00
Fabrice Di Meglio
83fa41b06e
Fix TextView potential NPE in isLayoutRtl()
...
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)
Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Amith Yamasani
42f53c7e6c
am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:06:38 -07:00
Amith Yamasani
ff7705e1d3
Use Holo background and proper padding for App Permissions UI.
...
Bug: 4515158
Change-Id: I47a8f2fbdc2547dd08e199ccbfa51710048963ae
2011-05-31 13:03:59 -07:00
Gilles Debunne
da188fbe4b
Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"
2011-05-31 10:41:58 -07:00
Svetoslav Ganov
ed9a34d54b
Merge "Refatoring a bit of accessibility code"
2011-05-27 16:40:17 -07:00
Svetoslav Ganov
bad9d97693
Refatoring a bit of accessibility code
...
Change-Id: I4df1741b622b21176c10311da0dc6347ca6fb390
2011-05-27 16:39:18 -07:00
Gilles Debunne
d4bb0b01c6
Fix for bug 4499752 - Detect nulled layouts in HandleViews
...
Change-Id: I6a7289150bf461cdf4cca0aff4aa4a0400e0d553
2011-05-27 16:02:40 -07:00
Amith Yamasani
068d73cf51
Keep track of USER_QUERY to pass to the intent.
...
Fixes bug: 3144023
Change-Id: Ib1f04119c7c0b5aa8ceaf7b15ccec70c76b2dff1
2011-05-27 15:53:36 -07:00
Fabrice Di Meglio
a98eef8601
Fix overrides of isLayoutRtl(Drawable dr)
...
Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
2011-05-27 14:54:59 -07:00
Fabrice Di Meglio
5ff0f99b23
Merge "Add support for Gravity BEFORE and AFTER"
2011-05-27 11:28:43 -07:00
Fabrice Di Meglio
6a03640539
Add support for Gravity BEFORE and AFTER
...
- update layouts
- add Callback2 for RTL aware Drawable
- add unit tests
Change-Id: Ic64d0291e262170aff7297c6580b0b422eaa8d89
2011-05-27 11:23:15 -07:00
Gilles Debunne
b1619e5615
EditText notifies the IME when a suggestion is picked.
...
Bug 4443922
Change-Id: Ie1e5a8164bf80bcfb48036c9337e649dc0d8a2fb
2011-05-26 18:28:22 -07:00
Philip Milne
3f8956d82b
Introduction of GridLayout.
...
Change-Id: Ia2ec315e7d29dcc5aa13b080fc6ce00708e9c034
2011-05-26 09:28:26 -07:00
Adam Powell
50f7fb9ca1
Merge "Action bar tab layout"
2011-05-25 12:01:00 -07:00
Adam Powell
f8ac6b7394
Action bar tab layout
...
Sync with UX on action bar tab layout behavior.
Make action bar tabs behave better with configuration changes.
LinearLayout now supports largest child measurement in unspecified
mode.
Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
2011-05-25 11:55:56 -07:00
Romain Guy
4725a90e8e
Code cleanup.
...
Change-Id: Ie7685b14e3eb81a2e1034004c3ba04b523e9dd13
2011-05-25 11:13:20 -07:00
Gilles Debunne
970ce73017
Merge "Made getOffsetForPosition public in TextView."
2011-05-24 09:26:44 -07:00
Gilles Debunne
bd4d582622
Merge "TextView uses floats for touch event positions."
2011-05-24 09:26:14 -07:00
Gilles Debunne
7a4adca1cb
Merge "Added a new flag in TextView to disable Suggestions."
2011-05-24 09:25:52 -07:00
Gilles Debunne
9511b41e05
Made getOffsetForPosition public in TextView.
...
Bug 4443839
Change-Id: I3e5d6f0fe3a45b068166f682daf3c4163903306e
2011-05-23 18:48:26 -07:00
Gilles Debunne
3bca69b09f
TextView uses floats for touch event positions.
...
This is the type returned by event.getX/Y methods. Conversion
to ints is only performed when needed. Low performance impact
since there is only a minimal amount of computations on these
values.
Change-Id: I53a56efe5e3a1a96911adc25fedaab7f40f1ba8e
2011-05-23 18:20:26 -07:00
Adam Powell
7d372b49e2
am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-23 17:18:54 -07:00
Gilles Debunne
f3a135bfba
Added a new flag in TextView to disable Suggestions.
...
This is needed for specific TextEdit (such as AutoCompleteTextField)
which do not want to display the "No suggestions available" message.
Bug 4443830
Change-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93
2011-05-23 17:15:20 -07:00
Fabrice Di Meglio
f32e0fe66f
Merge "RTL Ordering of visual elements in LinearLayout"
2011-05-20 17:39:40 -07:00
Fabrice Di Meglio
1e4cfbeba5
RTL Ordering of visual elements in LinearLayout
...
- also update unit tests for testing LinearLayout
Change-Id: I0794d48c45a8fd4a899fdf6f6a1d05485b416e1a
2011-05-20 16:23:36 -07:00
Adam Powell
7dfdb91420
am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit 'f483ed90401d63b7317f823fcac10315146d3072':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-20 16:14:42 -07:00
Adam Powell
3f4a764cf4
Change measurement of effective screen height for PopupWindow now that
...
DisplayMetrics reports it without system decorations.
Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
2011-05-20 15:56:25 -07:00
John Reck
63f46e7145
expandGroup can now animate
...
Add a boolean to have expandGroup animate the same as
performItemClick does
Change-Id: I652c6fa8f9a7b527572337b11900d653b5285352
2011-05-19 10:10:51 -07:00
Romain Guy
51d6eb7dcf
Fix crash when using a SimpleCursorAdapter initialized with a null Cursor.
...
Change-Id: Ia7d078db8ab941c830663e6af7cbb07d7bad24a8
2011-05-16 11:55:08 -07:00