OSDN Git Service
Chet Haase [Thu, 5 Sep 2013 17:07:30 +0000 (17:07 +0000)]
Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
Justin Koh [Thu, 5 Sep 2013 17:06:14 +0000 (17:06 +0000)]
Merge "Add keypress invalid to all AudioPackage mk files." into klp-dev
Svetoslav [Thu, 5 Sep 2013 17:01:39 +0000 (17:01 +0000)]
Merge "Hiding some unneeded APIs," into klp-dev
Andy McFadden [Thu, 5 Sep 2013 17:00:05 +0000 (17:00 +0000)]
Merge "Add #! to 'am' shell script" into klp-dev
Svetoslav [Thu, 5 Sep 2013 16:38:02 +0000 (09:38 -0700)]
Hiding some unneeded APIs,
1. Hide the MediaSize and Resolution constructors that take
package and resource Id.
2. Fix a bug and docs in creating portrait and landscape media
size.
Change-Id: If59992e355391de6ad6d14d4f7b3be8c8b6cc0e0
Tom O'Neill [Thu, 5 Sep 2013 16:45:03 +0000 (09:45 -0700)]
Incorporate new API council comments
- Split getStatus() into onGetSummary() and onGetEnabled()
- Call them on app's UI thread
- Allow runtime exceptions to propagate up
- Make a couple of more methods final to prevent subclasses from playing
around with the intent
- Remove explicit timing requirement from javadoc
- Mention that this will be restricted to system-image apps (will be
enforced by the actual settings code)
- b/
10461474
Change-Id: Id22dd7a707c05de396ae4c5810e839ca734714c0
Chet Haase [Thu, 5 Sep 2013 14:44:18 +0000 (07:44 -0700)]
Change build version from KEY_LIME_PIE to KITKAT
Issue #
10631619 Change build version to KitKat
Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
John Spurlock [Thu, 5 Sep 2013 14:16:54 +0000 (14:16 +0000)]
Merge "Force the nav bar visible when an IME window is visible." into klp-dev
John Spurlock [Thu, 5 Sep 2013 13:37:56 +0000 (09:37 -0400)]
Force the nav bar visible when an IME window is visible.
Bug:
9499956
Change-Id: I1ed895c6283476440b6c47e1764b6b0fe2aa949a
John Spurlock [Thu, 5 Sep 2013 11:30:51 +0000 (07:30 -0400)]
Remove obsolete indicator icons.
Bug:
10607423
Change-Id: I8d4e1037edf2394a1065c9b0a85a1f3e3c21e70e
Tim Murray [Thu, 5 Sep 2013 07:36:42 +0000 (07:36 +0000)]
Merge "Add YUV element convenience function." into klp-dev
Svetoslav [Thu, 5 Sep 2013 05:36:51 +0000 (05:36 +0000)]
Merge "Print API updated." into klp-dev
Dirk Dougherty [Thu, 5 Sep 2013 05:29:02 +0000 (22:29 -0700)]
am
76fcf6c7: am
07c9bcc3: am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
76fcf6c73e7dda99ec80e6da616bee26c2a088e6':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:26:54 +0000 (22:26 -0700)]
am
07c9bcc3: am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
07c9bcc3a60a8860b65aa43badd8ab1f1858522b':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:23:48 +0000 (22:23 -0700)]
am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:19:41 +0000 (05:19 +0000)]
Merge "Add a few more samples to browser." into jb-mr2-docs
Svetoslav Ganov [Thu, 5 Sep 2013 05:09:56 +0000 (05:09 +0000)]
Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev
Dirk Dougherty [Tue, 3 Sep 2013 22:32:24 +0000 (15:32 -0700)]
Add a few more samples to browser.
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
Svetoslav [Tue, 3 Sep 2013 21:01:43 +0000 (14:01 -0700)]
Print API updated.
1. Removed the updatePrinters API on PrinterDiscoverySession.
Now re-adding a printer updates it.
2. Added getTrackedPrinters() API to allow a print service to
figure out which printers' state should be tracked by the
service.
3. Removed the APIs on PrintDocumentInfo that describe the
layout of the content as they are not needed. For example,
if the print attributes passed in layout require landscape
mode, the the app should just create a PDF page with the
wider side up and draw its content in portrait. The printer
will then rotate the page.
Change-Id: Idd72c6e9c129e8b17eef1236573a99773f8ff0a2
Jeff Sharkey [Thu, 5 Sep 2013 03:04:18 +0000 (03:04 +0000)]
Merge "Asset drop, icons for common MIME types." into klp-dev
Jeff Sharkey [Thu, 5 Sep 2013 03:04:09 +0000 (03:04 +0000)]
Merge "Fix document management permission enforcement." into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:44:28 +0000 (02:44 +0000)]
Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:39:46 +0000 (02:39 +0000)]
Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
This reverts commit
5e777f668526104e7dd97d3972d35eb7b9eef5a2.
Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d
Svetoslav Ganov [Thu, 5 Sep 2013 02:27:32 +0000 (02:27 +0000)]
Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:19:18 +0000 (02:19 +0000)]
Merge "SystemUI demo mode." into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:18:30 +0000 (02:18 +0000)]
Merge "Remove signal/wifi activity indicator icon overlays." into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:09:28 +0000 (02:09 +0000)]
Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev
John Spurlock [Thu, 5 Sep 2013 02:02:52 +0000 (02:02 +0000)]
Merge "SystemUI asset update." into klp-dev
John Spurlock [Thu, 5 Sep 2013 01:52:37 +0000 (21:52 -0400)]
SystemUI asset update.
Plus a few framework resources used as status icons.
Bug:
10502089
Change-Id: I66d3bcbb408a8e008cbb383cb3a1a55f97d3d64c
Jeff Sharkey [Thu, 5 Sep 2013 01:03:18 +0000 (18:03 -0700)]
Asset drop, icons for common MIME types.
Bring in latest assets from UX. Map common MIME types to specific
icons.
Bug:
10510022
Change-Id: I01ea8749ca5515a04efcbc15eb0c8cbb43e5e7ad
Jeff Sharkey [Wed, 4 Sep 2013 21:30:31 +0000 (14:30 -0700)]
Fix document management permission enforcement.
Allow both explicit holders of the MANAGE_DOCUMENTS permission and
those holding Uri grants to perform management tasks.
Extend grants for newly created documents when caller doesn't have
permission. Revoke grants when deleting documents.
Test now writes actual content into picked file. Workaround updated
flags for Drive app.
Bug:
10623211
Change-Id: Ia8e90b33e0fac8294b2cacb96d083c43fdf75aab
Ruben Brunk [Thu, 5 Sep 2013 01:23:40 +0000 (01:23 +0000)]
Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 01:21:32 +0000 (01:21 +0000)]
Merge "Fix issue #
10422349: Limit/change the battery history data in batterystats" into klp-dev
Wink Saville [Thu, 5 Sep 2013 01:17:15 +0000 (18:17 -0700)]
am
323af8b4: am
aa5b0f8b: am
ce1e3798: Add provisioning apn timeout.
* commit '
323af8b49df3535977b5aa7f5b31c429d8a50f10':
Add provisioning apn timeout.
Wink Saville [Thu, 5 Sep 2013 01:14:07 +0000 (18:14 -0700)]
am
aa5b0f8b: am
ce1e3798: Add provisioning apn timeout.
* commit '
aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
Add provisioning apn timeout.
Wink Saville [Thu, 5 Sep 2013 01:11:07 +0000 (18:11 -0700)]
am
ce1e3798: Add provisioning apn timeout.
* commit '
ce1e37981caec29df2671a6e2909f00da7f24a00':
Add provisioning apn timeout.
Sandeep Siddhartha [Thu, 5 Sep 2013 01:08:23 +0000 (01:08 +0000)]
Merge "Move the hotword code to KeyguardHostView" into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 01:03:40 +0000 (18:03 -0700)]
Fix issue #
10422349: Limit/change the battery history data in batterystats
Don't include history in real checkins; have a new compact option
for bug reports.
Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
Dianne Hackborn [Thu, 5 Sep 2013 00:53:27 +0000 (00:53 +0000)]
Merge "Fix issue #
10461600: KLP API Review: UndoManager" into klp-dev
Sandeep Siddhartha [Wed, 4 Sep 2013 21:59:59 +0000 (14:59 -0700)]
Move the hotword code to KeyguardHostView
- Try hotword detection on Pattern unlock screen as well - disabled in
this CL
- Explicitly stop hotword detection when starting the assist intent.
Change-Id: I3d22a9029abf888431113b86e4410ea9e9866c57
Dianne Hackborn [Thu, 5 Sep 2013 00:43:56 +0000 (17:43 -0700)]
Fix issue #
10461600: KLP API Review: UndoManager
Hide, hide, hide!
Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
Chet Haase [Wed, 4 Sep 2013 23:47:44 +0000 (23:47 +0000)]
Merge "Transition API changes from API council recommendations" into klp-dev
Tim Murray [Tue, 3 Sep 2013 18:42:26 +0000 (11:42 -0700)]
Add YUV element convenience function.
Change-Id: Ie67dfba6a4c4f1913875ad9817c53e45d56809ae
Scott Main [Wed, 4 Sep 2013 22:43:40 +0000 (15:43 -0700)]
am
f56076ee: am
966b9d46: am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
f56076eefba47dad9b66b3011f487dc9a22e2756':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:40:27 +0000 (15:40 -0700)]
am
966b9d46: am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
update dashboards for 9/13
Andy McFadden [Wed, 4 Sep 2013 22:39:51 +0000 (15:39 -0700)]
Add #! to 'am' shell script
Shell script needs to start with #! for exec().
Bug
10606037
Change-Id: I594da6f0433e838dcf5b45b991188ceaa52d9bd1
Michael Wright [Wed, 4 Sep 2013 22:37:05 +0000 (22:37 +0000)]
Merge "Fix keymap build dependencies and variable name collisions" into klp-dev
Scott Main [Wed, 4 Sep 2013 22:36:59 +0000 (15:36 -0700)]
am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
002057bf0452168fd88eb81c2d36f02cfb260769':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:35:04 +0000 (22:35 +0000)]
Merge "update dashboards for 9/13" into jb-mr2-docs
Glenn Kasten [Wed, 4 Sep 2013 22:29:19 +0000 (22:29 +0000)]
Merge "Java API for AudioTrack timestamps" into klp-dev
Glenn Kasten [Wed, 4 Sep 2013 20:51:29 +0000 (13:51 -0700)]
Java API for AudioTrack timestamps
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.
Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
Scott Main [Wed, 4 Sep 2013 01:01:31 +0000 (18:01 -0700)]
update dashboards for 9/13
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
Chong Zhang [Wed, 4 Sep 2013 22:07:05 +0000 (22:07 +0000)]
Merge "wifi-display: add a global setting to force WPS config method" into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:06:45 +0000 (22:06 +0000)]
Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev
Chet Haase [Mon, 26 Aug 2013 21:20:16 +0000 (14:20 -0700)]
Transition API changes from API council recommendations
Issue #
10460684 KLP API Review: android.view.transition and android.animation
Issue #
10570740 Transitions: inflate transition targets from xml
Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
Lajos Molnar [Wed, 4 Sep 2013 21:32:43 +0000 (21:32 +0000)]
Merge "Add subtitle support to VideoView." into klp-dev
Fabrice Di Meglio [Wed, 4 Sep 2013 21:26:55 +0000 (21:26 +0000)]
Merge "Fix bug #
10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev
Lajos Molnar [Wed, 4 Sep 2013 21:22:46 +0000 (21:22 +0000)]
Merge "Internal WebVtt subtitle support" into klp-dev
Alan Viverette [Wed, 4 Sep 2013 21:17:00 +0000 (21:17 +0000)]
Merge "Implement drag-to-open in ActivityChooserView" into klp-dev
Romain Guy [Wed, 4 Sep 2013 21:16:23 +0000 (21:16 +0000)]
Merge "Don't draw with invalid display lists Bug #
10301674" into klp-dev
Romain Guy [Wed, 4 Sep 2013 21:14:07 +0000 (14:14 -0700)]
Don't draw with invalid display lists
Bug #
10301674
Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
Chet Haase [Wed, 4 Sep 2013 21:13:31 +0000 (21:13 +0000)]
Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev
Timothy Knight [Wed, 4 Sep 2013 00:23:23 +0000 (17:23 -0700)]
Camera2: Clarified docs for 3A regions.
Bug:
10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
Timothy Knight [Wed, 4 Sep 2013 20:25:35 +0000 (20:25 +0000)]
Merge "Camera2: Updated Rational for denom=0." into klp-dev
Dianne Hackborn [Wed, 4 Sep 2013 20:22:27 +0000 (20:22 +0000)]
Merge "Fix issue #
10427108: Google+ has long running process" into klp-dev
Fabrice Di Meglio [Wed, 28 Aug 2013 02:46:43 +0000 (19:46 -0700)]
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
David Christie [Wed, 4 Sep 2013 19:22:25 +0000 (19:22 +0000)]
Merge "Make location QuickSettings multi-user compatible (b/
10563313)" into klp-dev
Lajos Molnar [Thu, 15 Aug 2013 23:43:08 +0000 (16:43 -0700)]
Internal WebVtt subtitle support
Change-Id: Ia55673a68a99c277dd6e3246e6f1913c8eb476d8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Ruben Brunk [Wed, 4 Sep 2013 19:09:23 +0000 (12:09 -0700)]
Fix CameraService error flag when running HAL1 with API2.
Bug:
10620944
Change-Id: I72517a25bfe0e891ed150c568c37e04a9d6cc38c
John Spurlock [Wed, 4 Sep 2013 19:03:52 +0000 (19:03 +0000)]
Merge "Change semi-transparent system bar from 33 to 40% black." into klp-dev
Lajos Molnar [Wed, 4 Sep 2013 18:58:12 +0000 (18:58 +0000)]
Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev
John Spurlock [Wed, 4 Sep 2013 18:47:17 +0000 (14:47 -0400)]
Change semi-transparent system bar from 33 to 40% black.
Bug:
10502089
Change-Id: I045dab25e16a2711ed48659412022bee0fd4e2b2
David Christie [Wed, 4 Sep 2013 00:15:28 +0000 (17:15 -0700)]
Make location QuickSettings multi-user compatible (b/
10563313)
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
Chet Haase [Wed, 4 Sep 2013 17:21:46 +0000 (10:21 -0700)]
Perform layout and invalidation after bringChildToFront()
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.
Issue #
8667065 bringtoTop does not work
Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
John Spurlock [Sat, 31 Aug 2013 19:07:25 +0000 (15:07 -0400)]
SystemUI demo mode.
Control the status bar visuals via a simple intent protocol.
Useful for comprehensive visual testing reachable assets
and the various bar modes.
Protected behind a global system setting. To enable:
adb shell settings put global sysui_demo_allowed 1
Remove obsolete sync failing asset, and tighten up
BluetoothController to represent reality.
Bug:
10502089
Change-Id: I28443af3d6b22fcb7b367ef70e1d95fc23ebd407
Derek Sollenberger [Wed, 4 Sep 2013 17:36:21 +0000 (17:36 +0000)]
Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev
Timothy Knight [Wed, 21 Aug 2013 21:33:40 +0000 (14:33 -0700)]
Camera2: Updated Rational for denom=0.
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.
This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.
Bug:
10337323
Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
Scott Main [Wed, 4 Sep 2013 16:23:13 +0000 (09:23 -0700)]
am
c6ed9ff7: am
ca0d88b8: am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)]
am
ca0d88b8: am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
ca0d88b841db52fc926027f412003a8bf6efdf39':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:19:46 +0000 (09:19 -0700)]
am
f579f134: am
e0718c04: am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
f579f134ee9495571899be958983a1a242457603':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)]
am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c3adcf9dc745932bf3a059a7201644dd96b97750':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:17:05 +0000 (09:17 -0700)]
am
e0718c04: am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
e0718c044bc81db0334f2973b9884b968c18ce07':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:14:59 +0000 (16:14 +0000)]
Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 16:13:57 +0000 (09:13 -0700)]
am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
605d56c0492536488c997c6ca0b85fd38fd4e19a':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:10:58 +0000 (16:10 +0000)]
Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
Victoria Lease [Wed, 4 Sep 2013 15:34:56 +0000 (15:34 +0000)]
Merge "add Noto Sans Khmer and Lao" into klp-dev
John Spurlock [Wed, 4 Sep 2013 15:26:01 +0000 (11:26 -0400)]
Re-@hide activity-level FLAG_IMMERSIVE and helpers.
Un-@hidden in api 18, but probably should not have been.
The framework currently takes no action based on the flag,
making the docs misleading.
Bug:
10460791
Change-Id: If6cc8791a85710897c8fe77cf6682d1460e3416e
Derek Sollenberger [Wed, 4 Sep 2013 14:50:06 +0000 (10:50 -0400)]
Revert workaround for Skia bug now that Skia has been fixed.
bug:
7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
John Spurlock [Wed, 4 Sep 2013 14:36:27 +0000 (10:36 -0400)]
Remove signal/wifi activity indicator icon overlays.
Bug:
10607423
Change-Id: Ib58c5a6759b54f5c84aa2de414bef0f7f3d9b21d
Tom O'Neill [Wed, 4 Sep 2013 14:16:11 +0000 (14:16 +0000)]
Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:35:06 +0000 (13:35 +0000)]
Merge "Icon updates: location, settings, cdma roaming" into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:32:18 +0000 (13:32 +0000)]
Merge "Remove unused status bar icon stat_sys_secure." into klp-dev
John Spurlock [Wed, 4 Sep 2013 13:04:37 +0000 (09:04 -0400)]
Icon updates: location, settings, cdma roaming
Bug:
10502089
Change-Id: I2cc1b6bd8e1998830228b1d174cd4af13a1f1b6e
Adam Skory [Wed, 4 Sep 2013 12:22:10 +0000 (12:22 +0000)]
Merge "Add provideAssistData attr to public.xml" into klp-dev
Ben Murdoch [Wed, 4 Sep 2013 12:09:10 +0000 (13:09 +0100)]
Fix the build.
Fix javadoc typo.
Change-Id: I3e5f8f43650ce7b0958512bacc36e0ee744efa40
Adam Skory [Sat, 31 Aug 2013 03:53:33 +0000 (04:53 +0100)]
Add provideAssistData attr to public.xml
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.
It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.
So, add it.
Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).
Also, make some log warnings related to
providing assist data slightly more verbose.
Bug:
10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
Lajos Molnar [Thu, 15 Aug 2013 18:37:47 +0000 (11:37 -0700)]
Add subtitle support to VideoView.
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Lajos Molnar [Wed, 4 Sep 2013 05:52:36 +0000 (22:52 -0700)]
SubtitleController: update to new CaptioningManager APIs
This resolves the build issue.
Change-Id: I4db018c1abd9677ceb6d355921e4f7fa4be3b037
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Baligh Uddin [Wed, 4 Sep 2013 04:44:27 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 04:43:47 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev