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
Alan Viverette
167bba4cbd
am b27239b4: am 116c12ef: Merge "Add public API for obtaining drag-to-open listener" into klp-dev
...
* commit 'b27239b4ca4b336c8e7a482212ee54643e660795':
Add public API for obtaining drag-to-open listener
2013-08-28 14:06:17 -07:00
Fabrice Di Meglio
f73df21a8e
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 '627dd9b584a267b206bace8dc518287fe58b9563':
Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
2013-08-28 12:57:03 -07:00
Fabrice Di Meglio
627dd9b584
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
2013-08-28 19:53:56 +00:00
Alan Viverette
c971f04067
am ce9e2526: Merge "Implement new accessibility APIs in lists, text view" into klp-dev
...
* commit 'ce9e2526d43159df931cc9c0ba7173960d8a6a06':
Implement new accessibility APIs in lists, text view
2013-08-28 10:49:44 -07:00
Alan Viverette
5b2081dc41
Implement new accessibility APIs in lists, text view
...
Sets contentInvalid for TextViews with errors, sets collection
and item properties in AbsListView, GridView, and ListView.
BUG: 10391326
Change-Id: I91191c8ce1e10a1112f74215e30b26349396344b
2013-08-28 10:43:07 -07:00
Alan Viverette
b27239b4ca
am 116c12ef: Merge "Add public API for obtaining drag-to-open listener" into klp-dev
...
* commit '116c12ef4c5fc2d5e5e90a417c4386c1f9a3ddf6':
Add public API for obtaining drag-to-open listener
2013-08-28 10:27:24 -07:00
Alan Viverette
116c12ef4c
Merge "Add public API for obtaining drag-to-open listener" into klp-dev
2013-08-28 17:25:06 +00:00
Jeff Hao
896e5d7587
am 09944b04: am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
...
* commit '09944b04fa29eca7f889413988a05a268a5521f5':
Merge MPSE and SPSE Chunk handlers for ddms.
2013-08-27 18:21:27 -07:00
Jeff Hao
f46f843171
am 5d21168b: am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
...
* commit '5d21168bb4b33fb5eb8770996895a729880c7dbc':
Add frameworks support for sample profiling from traceview gui.
2013-08-27 18:21:23 -07:00
Jeff Hao
09944b04fa
am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
...
* commit '6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4':
Merge MPSE and SPSE Chunk handlers for ddms.
2013-08-27 18:18:47 -07:00
Jeff Hao
5d21168bb4
am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
...
* commit '366291e2830b96268458dd6c5b15412e46d93145':
Add frameworks support for sample profiling from traceview gui.
2013-08-27 18:18:43 -07:00
Jeff Hao
6c7bac69f5
Merge MPSE and SPSE Chunk handlers for ddms.
...
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
2013-08-27 17:59:32 -07:00
Jeff Hao
ffee626c3a
Add frameworks support for sample profiling from traceview gui.
...
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
2013-08-27 17:46:18 -07:00
Fabrice Di Meglio
b08e5788a7
Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
...
- remove the "force to Sunday"
- code cleaning and remove dependency on deprecated API
Change-Id: I992e893a904c45c8e0ce1d9dedb59b352e3a449f
2013-08-27 17:43:53 -07:00
Svetoslav Ganov
6e59536da2
am 39149ff6: am ca09dbc6: Merge "Print APIs update." into klp-dev
...
* commit '39149ff6be57cb8b862aa4389609800fd111ec7b':
Print APIs update.
2013-08-27 17:12:10 -07:00
Svetoslav Ganov
ca09dbc67b
Merge "Print APIs update." into klp-dev
2013-08-28 00:07:09 +00:00
Martijn Coenen
ef97ba1958
am 61fdf6d1: am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
...
* commit '61fdf6d155a4fad1d27a7593618d29f638ea9f6a':
Add NFC reader-mode API.
2013-08-27 16:14:59 -07:00
Martijn Coenen
bbbc8660cd
Merge "Add NFC reader-mode API." into klp-dev
2013-08-27 23:08:56 +00:00
Alan Viverette
9d345ff4cb
am 5c5fbb39: am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
...
* commit '5c5fbb39ec7c2ee51ad2b74c9c4604bb575bb6f7':
Add documentation to onTouchEvent for accessibility
2013-08-27 15:55:58 -07:00
Alan Viverette
3d1b3cb9d9
Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
2013-08-27 22:48:03 +00:00
Alan Viverette
1955a5b531
Add public API for obtaining drag-to-open listener
...
BUG: 10457019
Change-Id: I66485521c54b82033044834e7aab6707a3049e6b
2013-08-27 15:45:16 -07:00
Jeff Hao
78da49f4bc
Merge MPSE and SPSE Chunk handlers for ddms.
...
Change-Id: Ic25d31ee16f65a638ecb8957636ebfdb9beb4eb7
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
2013-08-27 22:37:58 +00:00
Jeff Hao
55de3f5442
Merge "Add frameworks support for sample profiling from traceview gui."
2013-08-27 22:17:40 +00:00
Martijn Coenen
c20ed2ff12
Add NFC reader-mode API.
...
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.
Bug: 10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
2013-08-27 14:32:53 -07:00
Craig Mautner
c5dd502056
am 8fce994c: am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev
...
* commit '8fce994c8472a29197aa4c5dae070c7be518ad3f':
Hide stackId from prying eyes.
2013-08-27 14:27:29 -07:00
Craig Mautner
ac738a25f8
Merge "Hide stackId from prying eyes." into klp-dev
2013-08-27 21:20:30 +00:00
Jeff Hao
e3d54fe23a
Add frameworks support for sample profiling from traceview gui.
...
Change-Id: I702f12cdd8bd27b762f30e158fbe824909421dee
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
2013-08-27 20:53:09 +00:00
Chet Haase
f87fa1b5a8
am b9a474c2: am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev
...
* commit 'b9a474c29bfb2cc69710b0716f756cfea9e64c00':
Fix NPE when setting new LayoutTransition
2013-08-27 13:28:02 -07:00
Fabrice Di Meglio
e94aceabdb
resolved conflicts for merge of 71de1312 to master
...
Change-Id: Ib2065147a3160b5176fd44a4d14bec06c7c973e1
2013-08-27 12:56:20 -07:00
Chet Haase
f1c3f28eb9
Merge "Fix NPE when setting new LayoutTransition" into klp-dev
2013-08-27 19:50:43 +00:00
Chet Haase
fee6f2b3d3
Fix NPE when setting new LayoutTransition
...
ViewGroup.setLayoutTransition() has logic to cancel a previously-running
transition and remove the ViewGroup's listener from that transition. However,
it is possible for the transition to be set to null on the ViewGroup on the
cancel() call, making the next call to remove the listener crash with an NPE.
The fix is to use a temporary variable to hold the old reference and
not depend on the class instance variable remaining valid/non-null across
the call to cancel().
Issue #10488932 Hangout NPE in ViewGroup.setLayoutTransition on initiating a new conversation
Issue #10509201 ViewGroup.setLayoutTransition(null) causes crash when being called in LayoutTransition.TransitionListener.endTransition()
Change-Id: I7c181b79e6601024c93a8dc246d32b751f78b216
2013-08-27 12:22:29 -07:00
Fabrice Di Meglio
6d7771b575
Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev
2013-08-27 19:04:13 +00:00
Svetoslav Ganov
aec1417ca9
Print APIs update.
...
1. Added scale to fit and scale to fill fitting modes.
2. Added APIs for a print app to specify which constraints imposed
by the print attributes were satsified during a layout so they
are not handled by the printer again, e.g. if the content is to
be in landscape the the app generated such content the printer
should rotate the content again.
3. Added some printer statuses.
4. Added a helper class that generates PDF documents with correct
size based on the passed in print attributes.
5. Exposed a ctor for PageRange which was hidden by mistake and apps
could not create page ranges. Added API for changing the printer
status.
Change-Id: If1334a61d2d931027b98075f653018d456b1b768
2013-08-27 11:56:18 -07:00
Tom O'Neill
a6fd96c420
am 3bc13da4: am aeda265c: Merge "Remove or reduce visibility of deprecated methods" into klp-dev
...
* commit '3bc13da4814fa3020ada4707aee94156af0410fc':
Remove or reduce visibility of deprecated methods
2013-08-27 11:31:16 -07:00
Tom O'Neill
aeda265c4d
Merge "Remove or reduce visibility of deprecated methods" into klp-dev
2013-08-27 18:23:18 +00:00
Svetoslav Ganov
a07935f4a5
am c97ab7ea: am 6b8c69ed: Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev
...
* commit 'c97ab7ea992ff57835cf3be2805c71bcb7ac4658':
Update AccessibilityNodeInfo API as per API council request
2013-08-27 11:18:49 -07:00
Svetoslav Ganov
6b8c69edd2
Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev
2013-08-27 18:14:01 +00:00
Tom O'Neill
7f6f45723a
Remove or reduce visibility of deprecated methods
...
- Fix additional getInt() path, restores the location settings screen
functionality.
- Should fix "unresolved link" build breakages in
git_klp-dev-plus-aosp-without-vendor, which is much more persnickety than
klp-dev for some reason.
- Add warning that we may add additional location modes in the future.
- Finish fix for b/10461763 and b/10461474
Change-Id: Id7155e3a0d7526a377d446018ef3bdb057bad3a6
2013-08-27 10:53:15 -07:00
Eino-Ville Talvala
8997431aec
am 713f4914: am fb3d7811: Merge "Camera2: Add CameraDevice#flush()" into klp-dev
...
* commit '713f4914bc5bd1e822192ba4fcf78909c943c95d':
Camera2: Add CameraDevice#flush()
2013-08-27 10:30:46 -07:00
Tom O'Neill
8b38815108
am a413551c: am 4a9c7fec: Merge "Address API council comments on location mode API council" into klp-dev
...
* commit 'a413551cf92254106a61aa024509dc9e5b72fdfe':
Address API council comments on location mode API council
2013-08-27 10:30:35 -07:00
Sandeep Siddhartha
fe7b9ff5ce
am a9e0d7b9: am 4e22b851: Merge "Touch up the Hotword API" into klp-dev
...
* commit 'a9e0d7b952e7a9f49f8b3bceabbc75e93a67167b':
Touch up the Hotword API
2013-08-27 10:30:05 -07:00
Sandeep Siddhartha
b1401f99a1
am f7a7a636: am b0a17400: Merge "Add Service API to perform Hotword recognition" into klp-dev
...
* commit 'f7a7a636f6a38b8de9a54911152ec5858e344db6':
Add Service API to perform Hotword recognition
2013-08-27 10:29:52 -07:00
Vinit Deshapnde
be8df3d1eb
am 4bdda528: am ca915793: Merge "Increase sampling data size limits" into klp-dev
...
* commit '4bdda528182b5cb6e3f9c0a1c64d714d0d1d74d0':
Increase sampling data size limits
2013-08-27 10:29:41 -07:00
Eino-Ville Talvala
fb3d78118b
Merge "Camera2: Add CameraDevice#flush()" into klp-dev
2013-08-27 16:49:04 +00:00
Tom O'Neill
4a9c7fec66
Merge "Address API council comments on location mode API council" into klp-dev
2013-08-27 15:44:16 +00:00
Svetoslav Ganov
cb8ed39b3f
Update AccessibilityNodeInfo API as per API council request
...
bug:10461302
Change-Id: I9709a271ab3720e064b98c79c0950d811fe37b73
2013-08-27 08:26:13 -07:00
Ben Murdoch
74a6e28007
Fix the build.
...
Use correct javadoc in BluetoothHeadset.java.
Change-Id: I17b4cf570036ebf426252229fe9ef377ced9b67b
2013-08-27 12:39:40 +01:00
Sandeep Siddhartha
4e22b851be
Merge "Touch up the Hotword API" into klp-dev
2013-08-27 02:24:25 +00:00