diff options
114 files changed, 107 insertions, 85 deletions
diff --git a/api/current.txt b/api/current.txt index 6072ad9bdfb4..3069221e59f8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11565,10 +11565,19 @@ package android.media { method public android.graphics.drawable.Drawable getIconDrawable(); method public java.lang.CharSequence getName(); method public java.lang.CharSequence getName(android.content.Context); + method public int getPlaybackStream(); + method public int getPlaybackType(); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); method public java.lang.Object getTag(); + method public int getVolume(); + method public int getVolumeHandling(); + method public int getVolumeMax(); method public void setTag(java.lang.Object); + field public static final int PLAYBACK_TYPE_LOCAL = 0; // 0x0 + field public static final int PLAYBACK_TYPE_REMOTE = 1; // 0x1 + field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0 + field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1 } public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback { @@ -11588,8 +11597,20 @@ package android.media { method public void setIconResource(int); method public void setName(java.lang.CharSequence); method public void setName(int); + method public void setPlaybackStream(int); + method public void setPlaybackType(int); method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); + method public void setVolume(int); + method public void setVolumeCallback(android.media.MediaRouter.VolumeCallback); + method public void setVolumeHandling(int); + method public void setVolumeMax(int); + } + + public static abstract class MediaRouter.VolumeCallback { + ctor public MediaRouter.VolumeCallback(); + method public abstract void onVolumeSetRequest(android.media.MediaRouter.RouteInfo, int); + method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int); } public class MediaScannerConnection implements android.content.ServiceConnection { diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 1029161b0445..140bff04cc39 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -651,6 +651,14 @@ public abstract class PreferenceActivity extends ListActivity implements } /** + * Returns the Header list + * @hide + */ + public List<Header> getHeaders() { + return mHeaders; + } + + /** * Returns true if this activity is showing multiple panes -- the headers * and a preference fragment. */ diff --git a/core/java/android/widget/SimpleCursorAdapter.java b/core/java/android/widget/SimpleCursorAdapter.java index f74a31452583..3dd0a9546909 100644 --- a/core/java/android/widget/SimpleCursorAdapter.java +++ b/core/java/android/widget/SimpleCursorAdapter.java @@ -78,7 +78,7 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { super(context, layout, c); mTo = to; mOriginalFrom = from; - findColumns(from); + findColumns(c, from); } /** @@ -104,7 +104,7 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { super(context, layout, c, flags); mTo = to; mOriginalFrom = from; - findColumns(from); + findColumns(c, from); } /** @@ -316,20 +316,21 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { } /** - * Create a map from an array of strings to an array of column-id integers in mCursor. - * If mCursor is null, the array will be discarded. - * + * Create a map from an array of strings to an array of column-id integers in cursor c. + * If c is null, the array will be discarded. + * + * @param c the cursor to find the columns from * @param from the Strings naming the columns of interest */ - private void findColumns(String[] from) { - if (mCursor != null) { + private void findColumns(Cursor c, String[] from) { + if (c != null) { int i; int count = from.length; if (mFrom == null || mFrom.length != count) { mFrom = new int[count]; } for (i = 0; i < count; i++) { - mFrom[i] = mCursor.getColumnIndexOrThrow(from[i]); + mFrom[i] = c.getColumnIndexOrThrow(from[i]); } } else { mFrom = null; @@ -341,13 +342,8 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { // super.swapCursor() will notify observers before we have // a valid mapping, make sure we have a mapping before this // happens - if (mFrom == null) { - findColumns(mOriginalFrom); - } - Cursor res = super.swapCursor(c); - // rescan columns in case cursor layout is different - findColumns(mOriginalFrom); - return res; + findColumns(c, mOriginalFrom); + return super.swapCursor(c); } /** @@ -367,11 +363,8 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { // super.changeCursor() will notify observers before we have // a valid mapping, make sure we have a mapping before this // happens - if (mFrom == null) { - findColumns(mOriginalFrom); - } + findColumns(c, mOriginalFrom); super.changeCursor(c); - findColumns(mOriginalFrom); } /** diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java index 62410ed74b4d..4e60b7537e71 100644 --- a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java +++ b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java @@ -881,7 +881,7 @@ public class GlowPadView extends View { } if (AccessibilityManager.getInstance(mContext).isEnabled()) { String targetContentDescription = getTargetDescription(activeTarget); - announceText(targetContentDescription); + announceForAccessibility(targetContentDescription); } } } @@ -1089,16 +1089,10 @@ public class GlowPadView extends View { String text = String.format(directionDescription, targetDescription); utterance.append(text); } - if (utterance.length() > 0) { - announceText(utterance.toString()); - } } - } - - private void announceText(String text) { - setContentDescription(text); - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); - setContentDescription(null); + if (utterance.length() > 0) { + announceForAccessibility(utterance.toString()); + } } private String getTargetDescription(int index) { diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml index c92f00021e6d..d553bdfc98ef 100644 --- a/core/res/res/anim/activity_open_enter.xml +++ b/core/res/res/anim/activity_open_enter.xml @@ -23,13 +23,13 @@ <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:interpolator="@interpolator/decelerate_cubic" android:fillEnabled="true" - android:fillBefore="false" android:fillAfter="false" + android:fillBefore="false" android:fillAfter="true" android:duration="300"/> <scale android:fromXScale=".8" android:toXScale="1.0" android:fromYScale=".8" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" android:interpolator="@interpolator/decelerate_cubic" android:fillEnabled="true" - android:fillBefore="false" android:fillAfter="false" + android:fillBefore="false" android:fillAfter="true" android:duration="300"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml index d7bfe8252193..2d105d185baa 100644 --- a/core/res/res/anim/activity_open_exit.xml +++ b/core/res/res/anim/activity_open_exit.xml @@ -17,9 +17,10 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:background="#ff000000" android:zAdjustment="normal"> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:fillEnabled="true" android:fillBefore="false" android:fillAfter="false" + android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" android:interpolator="@interpolator/decelerate_quint" android:duration="300"/> </set>
\ No newline at end of file diff --git a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml index 356e7cf7af6a..af7d011dda33 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml @@ -89,6 +89,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:gravity="center" + android:focusable="true" android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml index cb1cb2114b3d..9c18b7e84887 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml @@ -89,6 +89,7 @@ android:layout_rowSpan="7" android:layout_gravity="center_vertical|right" android:gravity="center" + android:focusable="true" android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 91f65e9cfb1c..811662221895 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -130,6 +130,7 @@ android:layout_height="match_parent" android:layout_alignParentBottom="true" android:gravity="top" + android:focusable="true" android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 8b9d8e4cb328..35e4d1114e5b 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -135,6 +135,7 @@ android:layout_height="match_parent" android:layout_rowSpan="7" android:gravity="left|center_vertical" + android:focusable="true" android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd index 18beab05fec7..1c28cbefb117 100644 --- a/docs/html/design/building-blocks/buttons.jd +++ b/docs/html/design/building-blocks/buttons.jd @@ -5,9 +5,7 @@ page.title=Buttons user touches it. Android supports two different types of buttons: <em>basic buttons</em> and <em>borderless buttons</em>. Both can contain text labels and/or images.</p> -<div style="text-align: center"> - <img src="{@docRoot}design/media/buttons_basic.png"> -</div> +<img src="{@docRoot}design/media/buttons_basic.png"> <h2 id="basic">Basic Buttons</h2> diff --git a/docs/html/design/building-blocks/pickers.jd b/docs/html/design/building-blocks/pickers.jd index 85f2187e37b2..e3cf6424c7e3 100644 --- a/docs/html/design/building-blocks/pickers.jd +++ b/docs/html/design/building-blocks/pickers.jd @@ -6,13 +6,12 @@ up/down arrow buttons, it's possible to set the desired value from the keyboard gesture.</p> <div class="layout-content-row"> - <div class="layout-content-col span-2"> </div> <div class="layout-content-col span-6"> <img src="{@docRoot}design/media/picker_space.png"> </div> - <div class="layout-content-col span-5"> + <div class="layout-content-col span-6"> <h4>Space considerations</h4> <p>Pickers can be used inline on a form, but their relatively large footprint is best suited for diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd index 607e0b6a0827..c4dfc4bdeb9f 100644 --- a/docs/html/design/building-blocks/switches.jd +++ b/docs/html/design/building-blocks/switches.jd @@ -8,9 +8,7 @@ buttons, and on/off switches.</p> <p>Checkboxes allow the user to select multiple options from a set. Avoid using a single checkbox to turn an option off or on. Instead, use an on/off switch.</p> -<div style="text-align: center"> <img src="{@docRoot}design/media/switches_checkboxes.png"> -</div> <h2 id="radio-buttons">Radio Buttons</h2> @@ -18,14 +16,10 @@ turn an option off or on. Instead, use an on/off switch.</p> selection if you think that the user needs to see all available options side-by-side. Otherwise, consider a spinner, which uses less space.</p> -<div style="text-align: center"> <img src="{@docRoot}design/media/switches_radios.png"> -</div> <h2 id="switches">On/off Switches</h2> <p>On/off switches toggle the state of a single settings option.</p> -<div style="text-align: center"> <img src="{@docRoot}design/media/switches_switches.png"> -</div> diff --git a/docs/html/design/media/action_bar_basics.png b/docs/html/design/media/action_bar_basics.png Binary files differindex 0bf3d56aea15..4b4e987e1c92 100644 --- a/docs/html/design/media/action_bar_basics.png +++ b/docs/html/design/media/action_bar_basics.png diff --git a/docs/html/design/media/action_bar_cab.png b/docs/html/design/media/action_bar_cab.png Binary files differindex aa629b95b25c..405b4943c461 100644 --- a/docs/html/design/media/action_bar_cab.png +++ b/docs/html/design/media/action_bar_cab.png diff --git a/docs/html/design/media/action_bar_pattern_considerations.png b/docs/html/design/media/action_bar_pattern_considerations.png Binary files differindex 977e7f2b9279..022288c8318a 100644 --- a/docs/html/design/media/action_bar_pattern_considerations.png +++ b/docs/html/design/media/action_bar_pattern_considerations.png diff --git a/docs/html/design/media/action_bar_pattern_default_tabs.png b/docs/html/design/media/action_bar_pattern_default_tabs.png Binary files differindex 69df289c6987..a6d0d905ce48 100644 --- a/docs/html/design/media/action_bar_pattern_default_tabs.png +++ b/docs/html/design/media/action_bar_pattern_default_tabs.png diff --git a/docs/html/design/media/action_bar_pattern_share_pack.png b/docs/html/design/media/action_bar_pattern_share_pack.png Binary files differindex 7ae8a0ac050c..dde18f39f81e 100644 --- a/docs/html/design/media/action_bar_pattern_share_pack.png +++ b/docs/html/design/media/action_bar_pattern_share_pack.png diff --git a/docs/html/design/media/action_bar_pattern_spinner.png b/docs/html/design/media/action_bar_pattern_spinner.png Binary files differindex 9c054b5d444a..9aff41296813 100644 --- a/docs/html/design/media/action_bar_pattern_spinner.png +++ b/docs/html/design/media/action_bar_pattern_spinner.png diff --git a/docs/html/design/media/action_bar_pattern_table.png b/docs/html/design/media/action_bar_pattern_table.png Binary files differindex dac7e21f7627..6a8c371ec1ca 100644 --- a/docs/html/design/media/action_bar_pattern_table.png +++ b/docs/html/design/media/action_bar_pattern_table.png diff --git a/docs/html/design/media/action_bar_pattern_up_app_icon.png b/docs/html/design/media/action_bar_pattern_up_app_icon.png Binary files differindex 11b8aa9fc547..cfc03330e3a1 100644 --- a/docs/html/design/media/action_bar_pattern_up_app_icon.png +++ b/docs/html/design/media/action_bar_pattern_up_app_icon.png diff --git a/docs/html/design/media/app_structure_book_detail_page_flip.png b/docs/html/design/media/app_structure_book_detail_page_flip.png Binary files differindex 13c9c52384e3..0cca58748b23 100644 --- a/docs/html/design/media/app_structure_book_detail_page_flip.png +++ b/docs/html/design/media/app_structure_book_detail_page_flip.png diff --git a/docs/html/design/media/app_structure_fixedtabs.png b/docs/html/design/media/app_structure_fixedtabs.png Binary files differindex e41f97e4cc58..6d1c63b8217a 100644 --- a/docs/html/design/media/app_structure_fixedtabs.png +++ b/docs/html/design/media/app_structure_fixedtabs.png diff --git a/docs/html/design/media/app_structure_gallery_filmstrip.png b/docs/html/design/media/app_structure_gallery_filmstrip.png Binary files differindex deed672e3e36..483bafa4ff1e 100644 --- a/docs/html/design/media/app_structure_gallery_filmstrip.png +++ b/docs/html/design/media/app_structure_gallery_filmstrip.png diff --git a/docs/html/design/media/app_structure_gmail.png b/docs/html/design/media/app_structure_gmail.png Binary files differindex 862ac75e60ce..33ae0920843b 100644 --- a/docs/html/design/media/app_structure_gmail.png +++ b/docs/html/design/media/app_structure_gmail.png diff --git a/docs/html/design/media/app_structure_gmail_swipe.png b/docs/html/design/media/app_structure_gmail_swipe.png Binary files differindex 21da4ac1847b..8f6f71ca523b 100644 --- a/docs/html/design/media/app_structure_gmail_swipe.png +++ b/docs/html/design/media/app_structure_gmail_swipe.png diff --git a/docs/html/design/media/app_structure_market.png b/docs/html/design/media/app_structure_market.png Binary files differindex 5aa595e61307..7ab0189e8855 100644 --- a/docs/html/design/media/app_structure_market.png +++ b/docs/html/design/media/app_structure_market.png diff --git a/docs/html/design/media/app_structure_music_lndscp.png b/docs/html/design/media/app_structure_music_lndscp.png Binary files differindex 67354de8e162..f6aaf3b506af 100644 --- a/docs/html/design/media/app_structure_music_lndscp.png +++ b/docs/html/design/media/app_structure_music_lndscp.png diff --git a/docs/html/design/media/app_structure_people_detail.png b/docs/html/design/media/app_structure_people_detail.png Binary files differindex b8707966591d..de54e828612b 100644 --- a/docs/html/design/media/app_structure_people_detail.png +++ b/docs/html/design/media/app_structure_people_detail.png diff --git a/docs/html/design/media/app_structure_scrolltabs.png b/docs/html/design/media/app_structure_scrolltabs.png Binary files differindex ea742c2d7fb6..3c20436124da 100644 --- a/docs/html/design/media/app_structure_scrolltabs.png +++ b/docs/html/design/media/app_structure_scrolltabs.png diff --git a/docs/html/design/media/app_structure_shortcut_on_item.png b/docs/html/design/media/app_structure_shortcut_on_item.png Binary files differindex 1341f1f31d15..3b10cb98bd69 100644 --- a/docs/html/design/media/app_structure_shortcut_on_item.png +++ b/docs/html/design/media/app_structure_shortcut_on_item.png diff --git a/docs/html/design/media/buttons_basic.png b/docs/html/design/media/buttons_basic.png Binary files differindex 7fa3d090d6cb..d91ab5c1c43d 100644 --- a/docs/html/design/media/buttons_basic.png +++ b/docs/html/design/media/buttons_basic.png diff --git a/docs/html/design/media/color_spectrum.png b/docs/html/design/media/color_spectrum.png Binary files differindex 3fd7a578c583..7d2c0236bc15 100644 --- a/docs/html/design/media/color_spectrum.png +++ b/docs/html/design/media/color_spectrum.png diff --git a/docs/html/design/media/creative_vision_main.png b/docs/html/design/media/creative_vision_main.png Binary files differindex c9d31cb81dce..2b3bb2f80257 100644 --- a/docs/html/design/media/creative_vision_main.png +++ b/docs/html/design/media/creative_vision_main.png diff --git a/docs/html/design/media/devices_displays_density.png b/docs/html/design/media/devices_displays_density.png Binary files differindex a21b48208fae..7ddad31efdad 100644 --- a/docs/html/design/media/devices_displays_density.png +++ b/docs/html/design/media/devices_displays_density.png diff --git a/docs/html/design/media/devices_displays_main.png b/docs/html/design/media/devices_displays_main.png Binary files differindex fd1c645ae774..1b0b16cfd9c3 100644 --- a/docs/html/design/media/devices_displays_main.png +++ b/docs/html/design/media/devices_displays_main.png diff --git a/docs/html/design/media/dialogs_popups_example.png b/docs/html/design/media/dialogs_popups_example.png Binary files differindex c2a66f6c0a0b..2deb00dd07bd 100644 --- a/docs/html/design/media/dialogs_popups_example.png +++ b/docs/html/design/media/dialogs_popups_example.png diff --git a/docs/html/design/media/dialogs_w_no_title.png b/docs/html/design/media/dialogs_w_no_title.png Binary files differindex 47e2dbf35e8c..a4abebc76bc5 100644 --- a/docs/html/design/media/dialogs_w_no_title.png +++ b/docs/html/design/media/dialogs_w_no_title.png diff --git a/docs/html/design/media/dialogs_w_title.png b/docs/html/design/media/dialogs_w_title.png Binary files differindex 4f2b81f69fad..24428fe89f95 100644 --- a/docs/html/design/media/dialogs_w_title.png +++ b/docs/html/design/media/dialogs_w_title.png diff --git a/docs/html/design/media/gesture_doubletouch.png b/docs/html/design/media/gesture_doubletouch.png Binary files differindex 693a5934c0f0..4c68ae654626 100644 --- a/docs/html/design/media/gesture_doubletouch.png +++ b/docs/html/design/media/gesture_doubletouch.png diff --git a/docs/html/design/media/gesture_drag.png b/docs/html/design/media/gesture_drag.png Binary files differindex 62626447d715..cb0d72c0cb55 100644 --- a/docs/html/design/media/gesture_drag.png +++ b/docs/html/design/media/gesture_drag.png diff --git a/docs/html/design/media/gesture_longtouch.png b/docs/html/design/media/gesture_longtouch.png Binary files differindex 3eb3cbcb30e2..30d13d4e310e 100644 --- a/docs/html/design/media/gesture_longtouch.png +++ b/docs/html/design/media/gesture_longtouch.png diff --git a/docs/html/design/media/gesture_pinchclose.png b/docs/html/design/media/gesture_pinchclose.png Binary files differindex 471251f6a390..daf29058c972 100644 --- a/docs/html/design/media/gesture_pinchclose.png +++ b/docs/html/design/media/gesture_pinchclose.png diff --git a/docs/html/design/media/gesture_pinchopen.png b/docs/html/design/media/gesture_pinchopen.png Binary files differindex b7c3ee3d2b0d..c05b633cbe81 100644 --- a/docs/html/design/media/gesture_pinchopen.png +++ b/docs/html/design/media/gesture_pinchopen.png diff --git a/docs/html/design/media/gesture_swipe.png b/docs/html/design/media/gesture_swipe.png Binary files differindex f8e8a2689e83..6f47df60c910 100644 --- a/docs/html/design/media/gesture_swipe.png +++ b/docs/html/design/media/gesture_swipe.png diff --git a/docs/html/design/media/gesture_touch.png b/docs/html/design/media/gesture_touch.png Binary files differindex 5c49b17806c2..365c3523a819 100644 --- a/docs/html/design/media/gesture_touch.png +++ b/docs/html/design/media/gesture_touch.png diff --git a/docs/html/design/media/lists_main.png b/docs/html/design/media/lists_main.png Binary files differindex d89ac79ad0a1..3762ba5a6e7b 100644 --- a/docs/html/design/media/lists_main.png +++ b/docs/html/design/media/lists_main.png diff --git a/docs/html/design/media/metrics_48.png b/docs/html/design/media/metrics_48.png Binary files differindex 5e6c57e4a6dd..d1fbc8266a8c 100644 --- a/docs/html/design/media/metrics_48.png +++ b/docs/html/design/media/metrics_48.png diff --git a/docs/html/design/media/metrics_diagram.png b/docs/html/design/media/metrics_diagram.png Binary files differindex b5e6cd2170e0..3cdc5e642283 100644 --- a/docs/html/design/media/metrics_diagram.png +++ b/docs/html/design/media/metrics_diagram.png diff --git a/docs/html/design/media/migrating_intents.png b/docs/html/design/media/migrating_intents.png Binary files differindex 65fc1a57b061..9ec5da839afa 100644 --- a/docs/html/design/media/migrating_intents.png +++ b/docs/html/design/media/migrating_intents.png diff --git a/docs/html/design/media/migrating_ios_dialers.png b/docs/html/design/media/migrating_ios_dialers.png Binary files differindex 27751d870c5a..a9230bcf492f 100644 --- a/docs/html/design/media/migrating_ios_dialers.png +++ b/docs/html/design/media/migrating_ios_dialers.png diff --git a/docs/html/design/media/migrating_ios_galleries.png b/docs/html/design/media/migrating_ios_galleries.png Binary files differindex 04472fee35a1..6bc1351a7193 100644 --- a/docs/html/design/media/migrating_ios_galleries.png +++ b/docs/html/design/media/migrating_ios_galleries.png diff --git a/docs/html/design/media/migrating_ios_settings.png b/docs/html/design/media/migrating_ios_settings.png Binary files differindex b17cb72fd94f..5b335fecf699 100644 --- a/docs/html/design/media/migrating_ios_settings.png +++ b/docs/html/design/media/migrating_ios_settings.png diff --git a/docs/html/design/media/multipane_expand.png b/docs/html/design/media/multipane_expand.png Binary files differindex bb4f371d2692..f761e5f80226 100644 --- a/docs/html/design/media/multipane_expand.png +++ b/docs/html/design/media/multipane_expand.png diff --git a/docs/html/design/media/multipane_show.png b/docs/html/design/media/multipane_show.png Binary files differindex 0231adb97604..b10c91c30414 100644 --- a/docs/html/design/media/multipane_show.png +++ b/docs/html/design/media/multipane_show.png diff --git a/docs/html/design/media/multipane_stack.png b/docs/html/design/media/multipane_stack.png Binary files differindex 7769f0c7fde2..567099e64bd0 100644 --- a/docs/html/design/media/multipane_stack.png +++ b/docs/html/design/media/multipane_stack.png diff --git a/docs/html/design/media/multipane_stretch.png b/docs/html/design/media/multipane_stretch.png Binary files differindex 5075af68f03e..b2dca02d7a3c 100644 --- a/docs/html/design/media/multipane_stretch.png +++ b/docs/html/design/media/multipane_stretch.png diff --git a/docs/html/design/media/multipane_view_tablet.png b/docs/html/design/media/multipane_view_tablet.png Binary files differindex 56a67188ad34..f116b6f12e04 100644 --- a/docs/html/design/media/multipane_view_tablet.png +++ b/docs/html/design/media/multipane_view_tablet.png diff --git a/docs/html/design/media/multipane_views.png b/docs/html/design/media/multipane_views.png Binary files differindex 9fdfcfd8c8be..40b8af65d10d 100644 --- a/docs/html/design/media/multipane_views.png +++ b/docs/html/design/media/multipane_views.png diff --git a/docs/html/design/media/navigation_between_apps_back.png b/docs/html/design/media/navigation_between_apps_back.png Binary files differindex ded5d0ac6633..d5cd979de774 100755 --- a/docs/html/design/media/navigation_between_apps_back.png +++ b/docs/html/design/media/navigation_between_apps_back.png diff --git a/docs/html/design/media/navigation_between_apps_inward.png b/docs/html/design/media/navigation_between_apps_inward.png Binary files differindex 1f5e401585ec..7394b1cd9e4c 100755 --- a/docs/html/design/media/navigation_between_apps_inward.png +++ b/docs/html/design/media/navigation_between_apps_inward.png diff --git a/docs/html/design/media/navigation_between_apps_up.png b/docs/html/design/media/navigation_between_apps_up.png Binary files differindex f192c88e53b6..99c311204e90 100755 --- a/docs/html/design/media/navigation_between_apps_up.png +++ b/docs/html/design/media/navigation_between_apps_up.png diff --git a/docs/html/design/media/navigation_between_siblings_gmail.png b/docs/html/design/media/navigation_between_siblings_gmail.png Binary files differindex fe01ed300030..64f06c66a337 100644 --- a/docs/html/design/media/navigation_between_siblings_gmail.png +++ b/docs/html/design/media/navigation_between_siblings_gmail.png diff --git a/docs/html/design/media/navigation_between_siblings_market1.png b/docs/html/design/media/navigation_between_siblings_market1.png Binary files differindex 8f2b3dcf70c6..b12a43202ac4 100755 --- a/docs/html/design/media/navigation_between_siblings_market1.png +++ b/docs/html/design/media/navigation_between_siblings_market1.png diff --git a/docs/html/design/media/navigation_between_siblings_market2.png b/docs/html/design/media/navigation_between_siblings_market2.png Binary files differindex 33b654ced3a0..a09d9d7a6e08 100755 --- a/docs/html/design/media/navigation_between_siblings_market2.png +++ b/docs/html/design/media/navigation_between_siblings_market2.png diff --git a/docs/html/design/media/navigation_from_outside_back.png b/docs/html/design/media/navigation_from_outside_back.png Binary files differindex 971ee5778e6c..a94e9c369895 100644 --- a/docs/html/design/media/navigation_from_outside_back.png +++ b/docs/html/design/media/navigation_from_outside_back.png diff --git a/docs/html/design/media/navigation_indirect_notification.png b/docs/html/design/media/navigation_indirect_notification.png Binary files differindex 6f99267f2057..ca9a1b57bad8 100644 --- a/docs/html/design/media/navigation_indirect_notification.png +++ b/docs/html/design/media/navigation_indirect_notification.png diff --git a/docs/html/design/media/navigation_popup_notification.png b/docs/html/design/media/navigation_popup_notification.png Binary files differindex a0a3ee7059c5..76ed98489e61 100644 --- a/docs/html/design/media/navigation_popup_notification.png +++ b/docs/html/design/media/navigation_popup_notification.png diff --git a/docs/html/design/media/navigation_up_vs_back_gmail.png b/docs/html/design/media/navigation_up_vs_back_gmail.png Binary files differindex ff7adfe23980..fdeeb904e261 100644 --- a/docs/html/design/media/navigation_up_vs_back_gmail.png +++ b/docs/html/design/media/navigation_up_vs_back_gmail.png diff --git a/docs/html/design/media/navigation_with_back_and_up.png b/docs/html/design/media/navigation_with_back_and_up.png Binary files differindex 544022044634..af2de78a6a55 100644 --- a/docs/html/design/media/navigation_with_back_and_up.png +++ b/docs/html/design/media/navigation_with_back_and_up.png diff --git a/docs/html/design/media/notifications_pattern_additional_fail.png b/docs/html/design/media/notifications_pattern_additional_fail.png Binary files differindex 3945ffb8cb61..707c98c5cbcf 100644 --- a/docs/html/design/media/notifications_pattern_additional_fail.png +++ b/docs/html/design/media/notifications_pattern_additional_fail.png diff --git a/docs/html/design/media/notifications_pattern_additional_win.png b/docs/html/design/media/notifications_pattern_additional_win.png Binary files differindex 74472c3fbdc8..eb193d8c279c 100644 --- a/docs/html/design/media/notifications_pattern_additional_win.png +++ b/docs/html/design/media/notifications_pattern_additional_win.png diff --git a/docs/html/design/media/notifications_pattern_real_time_people.png b/docs/html/design/media/notifications_pattern_real_time_people.png Binary files differindex 32e62eb10574..2af40b854b8c 100644 --- a/docs/html/design/media/notifications_pattern_real_time_people.png +++ b/docs/html/design/media/notifications_pattern_real_time_people.png diff --git a/docs/html/design/media/picker_datetime.png b/docs/html/design/media/picker_datetime.png Binary files differindex 9876ab2a255c..fb495ee90d2c 100644 --- a/docs/html/design/media/picker_datetime.png +++ b/docs/html/design/media/picker_datetime.png diff --git a/docs/html/design/media/picker_space.png b/docs/html/design/media/picker_space.png Binary files differindex 024776fbcb04..8b8e3b3dbd31 100644 --- a/docs/html/design/media/picker_space.png +++ b/docs/html/design/media/picker_space.png diff --git a/docs/html/design/media/progress_activity.png b/docs/html/design/media/progress_activity.png Binary files differindex 32cf1f528f0a..f4dffab36769 100644 --- a/docs/html/design/media/progress_activity.png +++ b/docs/html/design/media/progress_activity.png diff --git a/docs/html/design/media/progress_activity2.png b/docs/html/design/media/progress_activity2.png Binary files differindex ec3df9980bd6..07205f560f31 100644 --- a/docs/html/design/media/progress_activity2.png +++ b/docs/html/design/media/progress_activity2.png diff --git a/docs/html/design/media/seekbar_example.png b/docs/html/design/media/seekbar_example.png Binary files differindex 70b7e5e3f833..4c0790a726f0 100644 --- a/docs/html/design/media/seekbar_example.png +++ b/docs/html/design/media/seekbar_example.png diff --git a/docs/html/design/media/selection_cab_big.png b/docs/html/design/media/selection_cab_big.png Binary files differindex 72567cbc391b..ee21fa438791 100644 --- a/docs/html/design/media/selection_cab_big.png +++ b/docs/html/design/media/selection_cab_big.png diff --git a/docs/html/design/media/selection_context_menu.png b/docs/html/design/media/selection_context_menu.png Binary files differindex c71154640269..93b00b0c9c60 100644 --- a/docs/html/design/media/selection_context_menu.png +++ b/docs/html/design/media/selection_context_menu.png diff --git a/docs/html/design/media/settings_flowchart.png b/docs/html/design/media/settings_flowchart.png Binary files differindex 7e8623c9ffbc..d92cfa0c06e7 100644 --- a/docs/html/design/media/settings_flowchart.png +++ b/docs/html/design/media/settings_flowchart.png diff --git a/docs/html/design/media/settings_overflow.png b/docs/html/design/media/settings_overflow.png Binary files differindex 9000bec98ddb..c13b9fcb4119 100644 --- a/docs/html/design/media/settings_overflow.png +++ b/docs/html/design/media/settings_overflow.png diff --git a/docs/html/design/media/spinners_form.png b/docs/html/design/media/spinners_form.png Binary files differindex 79ee4e443626..5556e2b063c2 100644 --- a/docs/html/design/media/spinners_form.png +++ b/docs/html/design/media/spinners_form.png diff --git a/docs/html/design/media/spinners_hololightanddark.png b/docs/html/design/media/spinners_hololightanddark.png Binary files differindex 9b0601e1bbb1..cea5ec22f5b8 100644 --- a/docs/html/design/media/spinners_hololightanddark.png +++ b/docs/html/design/media/spinners_hololightanddark.png diff --git a/docs/html/design/media/swipe_tabs.png b/docs/html/design/media/swipe_tabs.png Binary files differindex f25f06100472..1f6b5e6d1225 100644 --- a/docs/html/design/media/swipe_tabs.png +++ b/docs/html/design/media/swipe_tabs.png diff --git a/docs/html/design/media/swipe_views.png b/docs/html/design/media/swipe_views.png Binary files differindex 3b6ecafc671a..ea1e635f6bbd 100644 --- a/docs/html/design/media/swipe_views.png +++ b/docs/html/design/media/swipe_views.png diff --git a/docs/html/design/media/swipe_views2.png b/docs/html/design/media/swipe_views2.png Binary files differindex 2ed366ca4478..6479a2f3fc10 100644 --- a/docs/html/design/media/swipe_views2.png +++ b/docs/html/design/media/swipe_views2.png diff --git a/docs/html/design/media/text_input_holodarkandlight.png b/docs/html/design/media/text_input_holodarkandlight.png Binary files differindex aff61fcc7476..5ef20eec6f75 100644 --- a/docs/html/design/media/text_input_holodarkandlight.png +++ b/docs/html/design/media/text_input_holodarkandlight.png diff --git a/docs/html/design/media/text_input_singlevsmultiline.png b/docs/html/design/media/text_input_singlevsmultiline.png Binary files differindex 7bb9a5c196cf..4890a83b5052 100644 --- a/docs/html/design/media/text_input_singlevsmultiline.png +++ b/docs/html/design/media/text_input_singlevsmultiline.png diff --git a/docs/html/design/media/text_input_textselection.png b/docs/html/design/media/text_input_textselection.png Binary files differindex 85689cf7bff2..f2ede0dcb488 100644 --- a/docs/html/design/media/text_input_textselection.png +++ b/docs/html/design/media/text_input_textselection.png diff --git a/docs/html/design/media/text_input_typesandtypedown.png b/docs/html/design/media/text_input_typesandtypedown.png Binary files differindex 32f761cebdc4..1feac284a36b 100644 --- a/docs/html/design/media/text_input_typesandtypedown.png +++ b/docs/html/design/media/text_input_typesandtypedown.png diff --git a/docs/html/design/media/themes_holo_dark.png b/docs/html/design/media/themes_holo_dark.png Binary files differindex 916ad276ff67..0a5876a99ecc 100644 --- a/docs/html/design/media/themes_holo_dark.png +++ b/docs/html/design/media/themes_holo_dark.png diff --git a/docs/html/design/media/themes_holo_inverse.png b/docs/html/design/media/themes_holo_inverse.png Binary files differindex 72c024486feb..50be4fb935e7 100644 --- a/docs/html/design/media/themes_holo_inverse.png +++ b/docs/html/design/media/themes_holo_inverse.png diff --git a/docs/html/design/media/themes_holo_light.png b/docs/html/design/media/themes_holo_light.png Binary files differindex d4b086137aa6..edc7f77f050f 100644 --- a/docs/html/design/media/themes_holo_light.png +++ b/docs/html/design/media/themes_holo_light.png diff --git a/docs/html/design/media/touch_feedback_communication.png b/docs/html/design/media/touch_feedback_communication.png Binary files differindex bb2725038b71..6388b774061e 100644 --- a/docs/html/design/media/touch_feedback_communication.png +++ b/docs/html/design/media/touch_feedback_communication.png diff --git a/docs/html/design/media/touch_feedback_states.png b/docs/html/design/media/touch_feedback_states.png Binary files differindex 972198cd34af..9e306bbc4205 100644 --- a/docs/html/design/media/touch_feedback_states.png +++ b/docs/html/design/media/touch_feedback_states.png diff --git a/docs/html/design/media/ui_overview_all_apps.png b/docs/html/design/media/ui_overview_all_apps.png Binary files differindex 17e7ece70433..d44e5a481af9 100644 --- a/docs/html/design/media/ui_overview_all_apps.png +++ b/docs/html/design/media/ui_overview_all_apps.png diff --git a/docs/html/design/media/ui_overview_home_screen.png b/docs/html/design/media/ui_overview_home_screen.png Binary files differindex ee0e4d6e811e..d1376b5f1819 100644 --- a/docs/html/design/media/ui_overview_home_screen.png +++ b/docs/html/design/media/ui_overview_home_screen.png diff --git a/docs/html/design/media/ui_overview_notifications.png b/docs/html/design/media/ui_overview_notifications.png Binary files differindex fd7438af0fb7..bc0513f22bfa 100644 --- a/docs/html/design/media/ui_overview_notifications.png +++ b/docs/html/design/media/ui_overview_notifications.png diff --git a/docs/html/design/media/ui_overview_recents.png b/docs/html/design/media/ui_overview_recents.png Binary files differindex 4ea058350fee..aabd7c794218 100644 --- a/docs/html/design/media/ui_overview_recents.png +++ b/docs/html/design/media/ui_overview_recents.png diff --git a/docs/html/design/media/ui_overview_system_ui.png b/docs/html/design/media/ui_overview_system_ui.png Binary files differindex ecc4b7d800cf..8993fff92132 100644 --- a/docs/html/design/media/ui_overview_system_ui.png +++ b/docs/html/design/media/ui_overview_system_ui.png diff --git a/docs/html/design/media/whats_new_action_bar.png b/docs/html/design/media/whats_new_action_bar.png Binary files differindex 713187e0c1f3..7bb89d191055 100644 --- a/docs/html/design/media/whats_new_action_bar.png +++ b/docs/html/design/media/whats_new_action_bar.png diff --git a/docs/html/design/media/whats_new_multipanel.png b/docs/html/design/media/whats_new_multipanel.png Binary files differindex 8e9c2f0480a9..fbe2d56b9aac 100644 --- a/docs/html/design/media/whats_new_multipanel.png +++ b/docs/html/design/media/whats_new_multipanel.png diff --git a/docs/html/design/media/whats_new_multiselect.png b/docs/html/design/media/whats_new_multiselect.png Binary files differindex ab34b241d302..6d979395df58 100644 --- a/docs/html/design/media/whats_new_multiselect.png +++ b/docs/html/design/media/whats_new_multiselect.png diff --git a/docs/html/design/media/whats_new_nav_bar.png b/docs/html/design/media/whats_new_nav_bar.png Binary files differindex 46239e5099f6..b0c490ca09f3 100644 --- a/docs/html/design/media/whats_new_nav_bar.png +++ b/docs/html/design/media/whats_new_nav_bar.png diff --git a/docs/html/design/patterns/actionbar.jd b/docs/html/design/patterns/actionbar.jd index 2226fec3b262..fe77e7955053 100644 --- a/docs/html/design/patterns/actionbar.jd +++ b/docs/html/design/patterns/actionbar.jd @@ -34,15 +34,13 @@ if you wish. Important: If the app is currently not displaying the top-level screen, be sure to display the Up caret to the left of the app icon, so the user can navigate up the hierarchy. For more discussion of Up navigation, see the <a href="{@docRoot}design/patterns/navigation.html">Navigation</a> pattern. + </p> -<div class="figure"> - <img src="{@docRoot}design/media/action_bar_pattern_up_app_icon.png"> - <div class="figure-caption"> - App icon with and without "up" affordance. - </div> +<img src="{@docRoot}design/media/action_bar_pattern_up_app_icon.png"> +<div class="figure-caption"> + App icon with and without "up" affordance. </div> - </p> </li> </ol> @@ -114,7 +112,7 @@ the top bar.</p> <p>To display actions and, if necessary, the action overflow, use the bottom bar.</p> </div> - <div class="layout-content-col span-3"> + <div class="layout-content-col span-5"> <img src="{@docRoot}design/media/action_bar_pattern_considerations.png"> diff --git a/docs/html/design/patterns/gestures.jd b/docs/html/design/patterns/gestures.jd index 9868df204c62..e579cee1aed5 100644 --- a/docs/html/design/patterns/gestures.jd +++ b/docs/html/design/patterns/gestures.jd @@ -82,7 +82,7 @@ following table shows the core gesture set that is supported in Android.</p> </div> <div class="layout-content-col span-4"> - <img src="{@docRoot}design/media/gesture_pinchopen.png"> + <img src="{@docRoot}design/media/gesture_pinchopen.png" style="margin-left:-4px"> <h4>Pinch open</h4> <p>Zooms into content.</p> diff --git a/docs/html/design/style/color.jd b/docs/html/design/style/color.jd index e25f7c672434..9c7b6b6f0acc 100644 --- a/docs/html/design/style/color.jd +++ b/docs/html/design/style/color.jd @@ -3,9 +3,8 @@ page.title=Color <style> .color-row { - width: 740px; - margin-left: 10px !important; - margin-right: 10px !important; + width: 760px; + margin:0; display: -webkit-box; display: -moz-box; diff --git a/docs/html/design/style/devices-displays.jd b/docs/html/design/style/devices-displays.jd index e5fe26d34ae6..df77c1bdf86c 100644 --- a/docs/html/design/style/devices-displays.jd +++ b/docs/html/design/style/devices-displays.jd @@ -32,9 +32,7 @@ ensure that your app looks great on any device.</p> </div> </div> -<div style="text-align:center"> <img src="{@docRoot}design/media/devices_displays_density.png"> -</div> <h4>Strategies</h4> <p>So where do you begin when designing for multiple screens? One approach is to work in the base diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 1b47602775a0..2e153ddc0eaa 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -141,11 +141,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { private static final int MSG_PERSIST_MASTER_VOLUME_MUTE = 15; private static final int MSG_REPORT_NEW_ROUTES = 16; private static final int MSG_REEVALUATE_REMOTE = 17; + private static final int MSG_RCC_NEW_PLAYBACK_INFO = 18; + private static final int MSG_RCC_NEW_VOLUME_OBS = 19; // start of messages handled under wakelock // these messages can only be queued, i.e. sent with queueMsgUnderWakeLock(), // and not with sendMsg(..., ..., SENDMSG_QUEUE, ...) - private static final int MSG_SET_WIRED_DEVICE_CONNECTION_STATE = 18; - private static final int MSG_SET_A2DP_CONNECTION_STATE = 19; + private static final int MSG_SET_WIRED_DEVICE_CONNECTION_STATE = 20; + private static final int MSG_SET_A2DP_CONNECTION_STATE = 21; // end of messages handled under wakelock // flags for MSG_PERSIST_VOLUME indicating if current and/or last audible volume should be @@ -3100,6 +3102,15 @@ public class AudioService extends IAudioService.Stub implements OnFinished { case MSG_REEVALUATE_REMOTE: onReevaluateRemote(); break; + + case MSG_RCC_NEW_PLAYBACK_INFO: + onNewPlaybackInfoForRcc(msg.arg1 /* rccId */, msg.arg2 /* key */, + ((Integer)msg.obj).intValue() /* value */); + break; + case MSG_RCC_NEW_VOLUME_OBS: + onRegisterVolumeObserverForRcc(msg.arg1 /* rccId */, + (IRemoteVolumeObserver)msg.obj /* rvo */); + break; } } } @@ -4960,15 +4971,21 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } } - // FIXME send a message instead of updating the stack synchronously public void setPlaybackInfoForRcc(int rccId, int what, int value) { - if(DEBUG_RC) Log.d(TAG, "setPlaybackInfoForRcc(id="+rccId+", what="+what+",val="+value+")"); + sendMsg(mAudioHandler, MSG_RCC_NEW_PLAYBACK_INFO, SENDMSG_QUEUE, + rccId /* arg1 */, what /* arg2 */, Integer.valueOf(value) /* obj */, 0 /* delay */); + } + + // handler for MSG_RCC_NEW_PLAYBACK_INFO + private void onNewPlaybackInfoForRcc(int rccId, int key, int value) { + if(DEBUG_RC) Log.d(TAG, "onNewPlaybackInfoForRcc(id=" + rccId + + ", what=" + key + ",val=" + value + ")"); synchronized(mRCStack) { Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator(); while(stackIterator.hasNext()) { RemoteControlStackEntry rcse = stackIterator.next(); if (rcse.mRccId == rccId) { - switch (what) { + switch (key) { case RemoteControlClient.PLAYBACKINFO_PLAYBACK_TYPE: rcse.mPlaybackType = value; postReevaluateRemote(); @@ -5013,7 +5030,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } break; default: - Log.e(TAG, "unhandled key " + what + " for RCC " + rccId); + Log.e(TAG, "unhandled key " + key + " for RCC " + rccId); break; } return; @@ -5022,8 +5039,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } } - // FIXME send a message instead of updating the stack synchronously public void registerRemoteVolumeObserverForRcc(int rccId, IRemoteVolumeObserver rvo) { + sendMsg(mAudioHandler, MSG_RCC_NEW_VOLUME_OBS, SENDMSG_QUEUE, + rccId /* arg1 */, 0, rvo /* obj */, 0 /* delay */); + } + + // handler for MSG_RCC_NEW_VOLUME_OBS + private void onRegisterVolumeObserverForRcc(int rccId, IRemoteVolumeObserver rvo) { synchronized(mRCStack) { Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator(); while(stackIterator.hasNext()) { diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index a309c3fb6fea..b6187dabe1ae 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -600,21 +600,18 @@ public class MediaRouter { private Object mTag; /** - * @hide (to be un-hidden) * The default playback type, "local", indicating the presentation of the media is happening * on the same device (e.g. a phone, a tablet) as where it is controlled from. * @see #setPlaybackType(int) */ public final static int PLAYBACK_TYPE_LOCAL = 0; /** - * @hide (to be un-hidden) * A playback type indicating the presentation of the media is happening on * a different device (i.e. the remote device) than where it is controlled from. * @see #setPlaybackType(int) */ public final static int PLAYBACK_TYPE_REMOTE = 1; /** - * @hide (to be un-hidden) * Playback information indicating the playback volume is fixed, i.e. it cannot be * controlled from this object. An example of fixed playback volume is a remote player, * playing over HDMI where the user prefers to control the volume on the HDMI sink, rather @@ -623,7 +620,6 @@ public class MediaRouter { */ public final static int PLAYBACK_VOLUME_FIXED = 0; /** - * @hide (to be un-hidden) * Playback information indicating the playback volume is variable and can be controlled * from this object. */ @@ -723,7 +719,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * @return the type of playback associated with this route * @see UserRouteInfo#setPlaybackType(int) */ @@ -732,7 +727,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * @return the stream over which the playback associated with this route is performed * @see UserRouteInfo#setPlaybackStream(int) */ @@ -741,7 +735,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * @return the volume at which the playback associated with this route is performed * @see UserRouteInfo#setVolume(int) */ @@ -760,7 +753,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * @return the maximum volume at which the playback associated with this route is performed * @see UserRouteInfo#setVolumeMax(int) */ @@ -779,7 +771,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * @return how volume is handling on the route * @see UserRouteInfo#setVolumeHandling(int) */ @@ -918,7 +909,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Set a callback to be notified of volume update requests * @param vcb */ @@ -927,7 +917,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Defines whether playback associated with this route is "local" * ({@link RouteInfo#PLAYBACK_TYPE_LOCAL}) or "remote" * ({@link RouteInfo#PLAYBACK_TYPE_REMOTE}). @@ -941,7 +930,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Defines whether volume for the playback associated with this route is fixed * ({@link RouteInfo#PLAYBACK_VOLUME_FIXED}) or can modified * ({@link RouteInfo#PLAYBACK_VOLUME_VARIABLE}). @@ -956,7 +944,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Defines at what volume the playback associated with this route is performed (for user * feedback purposes). This information is only used when the playback is not local. * @param volume @@ -969,7 +956,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Defines the maximum volume at which the playback associated with this route is performed * (for user feedback purposes). This information is only used when the playback is not * local. @@ -983,7 +969,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Defines over what stream type the media is presented. * @param stream */ @@ -1447,7 +1432,6 @@ public class MediaRouter { } /** - * @hide (to be un-hidden) * Interface for receiving events about volume changes. * All methods of this interface will be called from the application's main thread. * diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 79f9d37d3687..4c71aced56c5 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -1055,7 +1055,7 @@ public class RemoteControlClient if (mRcseId == RCSE_ID_UNREGISTERED) { return; } - Log.d(TAG, "sending to AudioService key=" + what + ", value=" + value); + //Log.d(TAG, "sending to AudioService key=" + what + ", value=" + value); IAudioService service = getService(); try { service.setPlaybackInfoForRcc(mRcseId, what, value); diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java index 674a2bdcb539..b6d9f9413190 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java @@ -162,6 +162,10 @@ public class SurfaceTextureTarget extends Filter { @Override public synchronized void open(FilterContext context) { // Set up SurfaceTexture internals + if (mSurfaceTexture == null) { + Log.e(TAG, "SurfaceTexture is null!!"); + throw new RuntimeException("Could not register SurfaceTexture: " + mSurfaceTexture); + } mSurfaceId = context.getGLEnvironment().registerSurfaceTexture( mSurfaceTexture, mScreenWidth, mScreenHeight); if (mSurfaceId <= 0) { @@ -170,19 +174,24 @@ public class SurfaceTextureTarget extends Filter { } + // Once the surface is unregistered, we still need the surfacetexture reference. + // That is because when the the filter graph stops and starts again, the app + // may not set the mSurfaceTexture again on the filter. In some cases, the app + // may not even know that the graph has re-started. So it is difficult to enforce + // that condition on an app using this filter. The only case where we need + // to let go of the mSurfaceTexure reference is when the app wants to shut + // down the graph on purpose, such as in the disconnect call. @Override public synchronized void close(FilterContext context) { if (mSurfaceId > 0) { context.getGLEnvironment().unregisterSurfaceId(mSurfaceId); mSurfaceId = -1; - // Once the surface is unregistered, remove the surfacetexture reference. - // The surfaceId could not have been valid without a valid surfacetexture. - mSurfaceTexture = null; } } // This should be called from the client side when the surfacetexture is no longer // valid. e.g. from onPause() in the application using the filter graph. + // In this case, we need to let go of our surfacetexture reference. public synchronized void disconnect(FilterContext context) { if (mLogVerbose) Log.v(TAG, "disconnect"); if (mSurfaceTexture == null) { diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 3a8e3fc6fcff..cd0da5a0783c 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -120,7 +120,7 @@ <!-- Default for Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION_URL --> <string name="def_accessibility_screen_reader_url" translatable="false"> - https://ssl.gstatic.com/accessibility/javascript/android/AndroidScriptChooser.user.js + https://ssl.gstatic.com/accessibility/javascript/android/AndroidVox_v1.js </string> <!-- Default for Settings.Secure.TOUCH_EXPLORATION_ENABLED --> |
