Kenny Root
bd51158d61
resolved conflicts for merge of aca95ca0 to master
...
Change-Id: I91adf923288ca724a8040ecf887e28e42ad7e259
2013-09-12 21:49:35 -07:00
Alan Viverette
77e9a28e2f
Add live region politeness to View, AccessibilityNodeInfo
...
Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.
BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04
2013-09-12 17:16:09 -07:00
Tor Norbye
d9273d6f28
Add typedefs and nullness annotations.
...
This changeset adds in typedef annotations (custom annotations
marked with @IntDef) for various int parameters and return values
in the API. It also adds nullness annotations for cases where the
documentation explicitly mentioned null policy, or where it was
blindingly obvious from the context. Also fixed some typos in the
documentation.
Change-Id: Ica27c01368895818e26237544edd8483007155bb
2013-09-11 14:55:38 -07:00
Alan Viverette
e2c6f66921
am d54529c4: am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
...
* commit 'd54529c43545faa10cac4e34e9b8d623de121e2e':
Make ListView's illegal state exception more helpful
2013-09-10 13:10:29 -07:00
Alan Viverette
23819e7e5d
Merge "Make ListView's illegal state exception more helpful" into klp-dev
2013-09-10 20:05:59 +00:00
Adam Powell
ab83c7b9b5
am 218b1163: am 6a221b3f: Fix some bizarre Spinner behavior
...
* commit '218b116344688053d3856a8ea8abc3dc241bcee1':
Fix some bizarre Spinner behavior
2013-09-10 11:49:37 -07:00
Adam Powell
6a221b3f85
Fix some bizarre Spinner behavior
...
* Make sure the recycler is cleared when the adapter is changed.
Bug 10689596
* Don't add views to measure the baseline.
Bug 10690353
Change-Id: I841dc05652eef3319721631f96332f7900d1a631
2013-09-10 11:38:52 -07:00
Alan Viverette
7d8314db41
Make ListView's illegal state exception more helpful
...
Change-Id: I3d3205d32c6992c184a218248ba72ebf6c45a2d1
2013-09-10 11:22:53 -07:00
Alan Viverette
617feb99a0
Add View constructor that supplies a default style resource
...
Also updates the constructor of every class that extends View.
BUG: 10676369
Change-Id: Ifaf27bf82028d180afa4931c0e906df88d858ac3
2013-09-09 18:09:13 -07:00
Alan Viverette
4e17981cdc
am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev
...
* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
Add WebVTT caption renderer
2013-09-09 14:14:33 -07:00
Alan Viverette
013634cc44
Merge "Add WebVTT caption renderer" into klp-dev
2013-09-09 20:31:14 +00:00
Alan Viverette
2bd9dccc13
am 1519a158: am 23f31a1c: Merge "Only activate FastScroller when it\'s needed" into klp-dev
...
* commit '1519a1588a053eec3a3d0c8eb077e0cc12567d0b':
Only activate FastScroller when it's needed
2013-09-09 10:31:10 -07:00
Alan Viverette
23f31a1c4e
Merge "Only activate FastScroller when it's needed" into klp-dev
2013-09-09 17:24:32 +00:00
Alan Viverette
b9f2722f6f
Only activate FastScroller when it's needed
...
Removes code that was incorrectly handling ACTION_DOWN when the
host ListView started intercepting events for its own use. Fixes
handling of short lists and changes resulting from toggling the
FastScroller enabled state.
BUG: 10651874
Change-Id: I7b088b46d00a372a0a55291db892cc059f1aed20
2013-09-06 19:39:47 -07:00
Alan Viverette
d43daf361e
Add WebVTT caption renderer
...
Currently missing support for region anchor points, robust layout
when snapping to lines, and vertical text.
BUG: 10260603
Change-Id: I3463b4aa0039442159144e66922d67f5dfee58ed
2013-09-06 18:06:23 -07:00
Adam Powell
1d5ac31c0d
am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev
...
* commit 'f094655c804e3983a538b7bc28266b173ea5c78b':
Add View#cancelPendingInputEvents API
2013-09-05 12:43:32 -07:00
Adam Powell
a73c3a5488
Merge "Add View#cancelPendingInputEvents API" into klp-dev
2013-09-05 19:37:51 +00:00
Chet Haase
672fcd5c9a
am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
...
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3':
Change build version from KEY_LIME_PIE to KITKAT
2013-09-05 10:13:34 -07:00
Chet Haase
e8222dddaf
Change build version from KEY_LIME_PIE to KITKAT
...
Issue #10631619 Change build version to KitKat
Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
2013-09-05 08:44:33 -07:00
Dianne Hackborn
3facfed942
am a7a8cdfa: am 7f71206d: Merge "Fix issue #10461600 : KLP API Review: UndoManager" into klp-dev
...
* commit 'a7a8cdfab3af29d4bdec95abd6bde96824129e4e':
Fix issue #10461600 : KLP API Review: UndoManager
2013-09-04 17:58:58 -07:00
Adam Powell
1487466dc2
Add View#cancelPendingInputEvents API
...
This API allows an application to cancel deferred high-level input
events already in flight. It forms one tool of several to help apps
debounce input events and prevent things like multiple startActivity
calls, FragmentTransactions, etc. from executing when only one was
desired since it's otherwise not desirable for things like click
events to fire synchronously.
Change-Id: I60b12cd5350898065f0019d616e24d779eb8cff9
2013-09-05 00:55:20 +00:00
Dianne Hackborn
b811e64cb3
Fix issue #10461600 : KLP API Review: UndoManager
...
Hide, hide, hide!
Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
2013-09-04 17:43:56 -07:00
Alan Viverette
79a5feff95
Fix the build, use viscous fluid interpolator in OverScroller
...
Change-Id: I175a220d1d915161896b9b223acfee08e0face2c
2013-09-04 16:37:57 -07:00
Lajos Molnar
9c5b14977c
am a0d70290: am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev
...
* commit 'a0d702908cc2da75e0102e1a2f276e2b3feea198':
Add subtitle support to VideoView.
2013-09-04 14:38:51 -07:00
Fabrice Di Meglio
165d0d5738
am eb4ed48f: am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev
...
* commit 'eb4ed48f77b8d7889252dcbfcefd97d306347145':
Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
2013-09-04 14:35:09 -07:00
Alan Viverette
132fb928dc
Merge "Move viscous fluid interpolator to its own class"
2013-09-04 21:33:30 +00:00
Lajos Molnar
171c63db92
Merge "Add subtitle support to VideoView." into klp-dev
2013-09-04 21:32:43 +00:00
Fabrice Di Meglio
3ab8e8847d
Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev
2013-09-04 21:26:55 +00:00
Alan Viverette
5c08f7cf86
am 1d26f041: am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev
...
* commit '1d26f041ab15a9c30fcd8378d5284d9692fba56e':
Implement drag-to-open in ActivityChooserView
2013-09-04 14:24:41 -07:00
Alan Viverette
3aa1824801
Merge "Implement drag-to-open in ActivityChooserView" into klp-dev
2013-09-04 21:17:00 +00:00
Alan Viverette
d75e2539c1
Move viscous fluid interpolator to its own class
...
Change-Id: If7dcc968895ba9200b40fbc7d7aded6e6bbf6ff7
2013-09-04 14:16:08 -07:00
Fabrice Di Meglio
2bd961ae38
Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
...
- related to "wrap_content"
- self bounds should include childs horizontal / vertical margin too
- so make height / width computation follow similar pattern as top / bottom computation
Passing CTS tests: RelativeLayoutTest / RelativeLayout_LayoutParamsTest
Change-Id: Id019c2536e89d2d8a4991aaabf6de60aae2e263b
2013-09-04 12:30:19 -07:00
Lajos Molnar
484ff7a922
Add subtitle support to VideoView.
...
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com >
Bug: 10326117
2013-09-03 23:33:05 -07:00
Alan Viverette
c80531ae5f
am f37fb4d9: am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev
...
* commit 'f37fb4d95b6ed790b7c2de5268bd3e20d76aa146':
Fix pre tag formatting in getDragToOpenListener documentation
2013-09-03 17:53:43 -07:00
Alan Viverette
40fbaa79bc
Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev
2013-09-04 00:44:11 +00:00
Alan Viverette
84ae8913a7
am 751176ef: am 6416729c: Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev
...
* commit '751176ef3903239dc2de55664c3c1c273917201e':
Add methods for managing subtitle overlays in VideoView
2013-09-03 16:57:11 -07:00
Alan Viverette
6416729c47
Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev
2013-09-03 23:51:35 +00:00
Alan Viverette
419c8ebbdc
am b29cb9ec: am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev
...
* commit 'b29cb9ec4c343248dfd06b130459db13ae61142d':
Ensure list scrolling API is in parity with view scrolling API
2013-09-03 16:38:58 -07:00
Alan Viverette
de59baab31
Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev
2013-09-03 23:33:03 +00:00
Alan Viverette
de213f708f
Add methods for managing subtitle overlays in VideoView
...
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().
BUG: 10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
2013-09-03 16:18:42 -07:00
Alan Viverette
ba29906334
Ensure list scrolling API is in parity with view scrolling API
...
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
2013-09-03 16:01:51 -07:00
Lajos Molnar
3e63d77837
am a7cd8835: am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev
...
* commit 'a7cd8835bb1392d5512012160bc8bd2ccad3efaf':
VideoView: add addSubtitleSource
2013-09-03 15:54:54 -07:00
Lajos Molnar
a861245f06
Merge "VideoView: add addSubtitleSource" into klp-dev
2013-09-03 22:51:32 +00:00
Alan Viverette
5d46c89e3c
Implement drag-to-open in ActivityChooserView
...
BUG: 10606456
Change-Id: I9ac0c5076bb1bf6c3f8a674bb2ef998d8515e8d9
2013-09-03 14:56:26 -07:00
Lajos Molnar
af30982435
VideoView: add addSubtitleSource
...
A way to add external subtitle file to VideoView.
Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com >
Bug: 10326117
2013-08-30 14:59:46 -07:00
Alan Viverette
3f9832d3c7
Fix pre tag formatting in getDragToOpenListener documentation
...
BUG: 10549164
Change-Id: Ie3e05e918edbd737326c724e4e712279ac410238
2013-08-30 14:43:25 -07:00
Adam Powell
bdb284c516
am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev
...
* commit '91fa056a58fdad8f8e6e8a76a902c2a566364f29':
GridLayout changes for API council
2013-08-29 15:43:04 -07:00
Adam Powell
465ea74234
GridLayout changes for API council
...
* Hide set/getPrinter methods. A change/addition like this should
happen for all views if it happens, not just for one specific view.
* Follow Android style guidelines for fields.
Bug 10549037
Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit 916159461bf17e13c245a709935a0d1133e0ed91)
2013-08-29 21:59:22 +00:00
Fabrice Di Meglio
a31d3fa293
am f73df21a: am 627dd9b5: Merge "Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
...
* commit 'f73df21a8e311ab72a00dbdb0b1dbd8e8d79a143':
Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
2013-08-28 14:07:07 -07:00
Alan Viverette
c5c4809c95
am c971f040: am ce9e2526: Merge "Implement new accessibility APIs in lists, text view" into klp-dev
...
* commit 'c971f0406771faa6398f21e7b5a5a58cd4cba1fd':
Implement new accessibility APIs in lists, text view
2013-08-28 14:06:30 -07:00