commit | f9e105a8516efe06d1bdb8df2d569261c3b11dc6 | [log] [tgz] |
---|---|---|
author | Tim Kilbourn <tkilbourn@google.com> | Fri May 23 12:25:54 2014 -0700 |
committer | Tim Kilbourn <tkilbourn@google.com> | Fri May 23 14:12:10 2014 -0700 |
tree | eeff1291fb29d6863f88c6e6041dbdf8420d6d45 | |
parent | c1cdb35d486629618365a627961fdc1985b18372 [diff] |
Update leanback lib assets. Some names were updated by UX to prevent possible naming collisions. Change-Id: I64594c5b4f682c0b916e0485270da129074752e1
diff --git a/v17/leanback/res/drawable-hdpi/lb_actions_right_arrow.png b/v17/leanback/res/drawable-hdpi/lb_actions_right_arrow.png deleted file mode 100644 index 1e98bc9..0000000 --- a/v17/leanback/res/drawable-hdpi/lb_actions_right_arrow.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_bg_protection.png b/v17/leanback/res/drawable-hdpi/lb_bg_protection.png new file mode 100644 index 0000000..34fb6a2 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_bg_protection.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_ic_actions_right_arrow.png b/v17/leanback/res/drawable-hdpi/lb_ic_actions_right_arrow.png new file mode 100644 index 0000000..e737a66 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_ic_actions_right_arrow.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_ic_in_app_search.png b/v17/leanback/res/drawable-hdpi/lb_ic_in_app_search.png new file mode 100644 index 0000000..d58ac6c --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_ic_in_app_search.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png b/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png new file mode 100644 index 0000000..913e404 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_ic_search_mic.png b/v17/leanback/res/drawable-hdpi/lb_ic_search_mic.png new file mode 100644 index 0000000..b097ef9 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_ic_search_mic.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_ic_search_mic_out.png b/v17/leanback/res/drawable-hdpi/lb_ic_search_mic_out.png new file mode 100644 index 0000000..16c1b81 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_ic_search_mic_out.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_focused.9.png b/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_focused.9.png new file mode 100644 index 0000000..562ae9d --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_focused.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_normal.9.png b/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_normal.9.png new file mode 100644 index 0000000..db44754 --- /dev/null +++ b/v17/leanback/res/drawable-hdpi/lb_in_app_search_shadow_normal.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_search_mic.png b/v17/leanback/res/drawable-hdpi/lb_search_mic.png deleted file mode 100644 index 3d2551e..0000000 --- a/v17/leanback/res/drawable-hdpi/lb_search_mic.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-hdpi/lb_search_mic_out.png b/v17/leanback/res/drawable-hdpi/lb_search_mic_out.png deleted file mode 100644 index 6afac94..0000000 --- a/v17/leanback/res/drawable-hdpi/lb_search_mic_out.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_actions_right_arrow.png b/v17/leanback/res/drawable-mdpi/lb_actions_right_arrow.png deleted file mode 100644 index 921792e..0000000 --- a/v17/leanback/res/drawable-mdpi/lb_actions_right_arrow.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_bg_protection.png b/v17/leanback/res/drawable-mdpi/lb_bg_protection.png new file mode 100644 index 0000000..369e36a --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_bg_protection.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_ic_actions_right_arrow.png b/v17/leanback/res/drawable-mdpi/lb_ic_actions_right_arrow.png new file mode 100644 index 0000000..aa6b44f --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_ic_actions_right_arrow.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_ic_in_app_search.png b/v17/leanback/res/drawable-mdpi/lb_ic_in_app_search.png new file mode 100644 index 0000000..74f439d --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_ic_in_app_search.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png b/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png new file mode 100644 index 0000000..98dc39a --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_ic_search_mic.png b/v17/leanback/res/drawable-mdpi/lb_ic_search_mic.png new file mode 100644 index 0000000..1b40609 --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_ic_search_mic.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_ic_search_mic_out.png b/v17/leanback/res/drawable-mdpi/lb_ic_search_mic_out.png new file mode 100644 index 0000000..5fdd381 --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_ic_search_mic_out.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_focused.9.png b/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_focused.9.png new file mode 100644 index 0000000..b63a57f --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_focused.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_normal.9.png b/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_normal.9.png new file mode 100644 index 0000000..d91acee --- /dev/null +++ b/v17/leanback/res/drawable-mdpi/lb_in_app_search_shadow_normal.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_search_mic.png b/v17/leanback/res/drawable-mdpi/lb_search_mic.png deleted file mode 100644 index 546e5eb..0000000 --- a/v17/leanback/res/drawable-mdpi/lb_search_mic.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-mdpi/lb_search_mic_out.png b/v17/leanback/res/drawable-mdpi/lb_search_mic_out.png deleted file mode 100644 index d47b758..0000000 --- a/v17/leanback/res/drawable-mdpi/lb_search_mic_out.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_actions_right_arrow.png b/v17/leanback/res/drawable-xhdpi/lb_actions_right_arrow.png deleted file mode 100644 index 7f0821e..0000000 --- a/v17/leanback/res/drawable-xhdpi/lb_actions_right_arrow.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png b/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png new file mode 100644 index 0000000..5e9f150 --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_ic_actions_right_arrow.png b/v17/leanback/res/drawable-xhdpi/lb_ic_actions_right_arrow.png new file mode 100644 index 0000000..9796171 --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_ic_actions_right_arrow.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_ic_in_app_search.png b/v17/leanback/res/drawable-xhdpi/lb_ic_in_app_search.png new file mode 100644 index 0000000..ca78f0d --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_ic_in_app_search.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png b/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png new file mode 100644 index 0000000..1db0c04 --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png b/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png new file mode 100644 index 0000000..d4eaff1 --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png b/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png new file mode 100644 index 0000000..0558e8a --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_focused.9.png b/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_focused.9.png new file mode 100644 index 0000000..f913c0f --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_focused.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_normal.9.png b/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_normal.9.png new file mode 100644 index 0000000..791ffd7 --- /dev/null +++ b/v17/leanback/res/drawable-xhdpi/lb_in_app_search_shadow_normal.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_search_mic.png b/v17/leanback/res/drawable-xhdpi/lb_search_mic.png deleted file mode 100644 index d612eb0..0000000 --- a/v17/leanback/res/drawable-xhdpi/lb_search_mic.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-xhdpi/lb_search_mic_out.png b/v17/leanback/res/drawable-xhdpi/lb_search_mic_out.png deleted file mode 100644 index 1dd327b..0000000 --- a/v17/leanback/res/drawable-xhdpi/lb_search_mic_out.png +++ /dev/null Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_action_bg_focused.9.png b/v17/leanback/res/drawable-xxhdpi/lb_action_bg_focused.9.png index 48f82a4..d2227b9 100644 --- a/v17/leanback/res/drawable-xxhdpi/lb_action_bg_focused.9.png +++ b/v17/leanback/res/drawable-xxhdpi/lb_action_bg_focused.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_actions_right_arrow.png b/v17/leanback/res/drawable-xxhdpi/lb_ic_actions_right_arrow.png similarity index 100% rename from v17/leanback/res/drawable-xxhdpi/lb_actions_right_arrow.png rename to v17/leanback/res/drawable-xxhdpi/lb_ic_actions_right_arrow.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_ic_in_app_search.png b/v17/leanback/res/drawable-xxhdpi/lb_ic_in_app_search.png new file mode 100644 index 0000000..dae6e51 --- /dev/null +++ b/v17/leanback/res/drawable-xxhdpi/lb_ic_in_app_search.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png b/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png new file mode 100644 index 0000000..fac4c29 --- /dev/null +++ b/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_search_mic.png b/v17/leanback/res/drawable-xxhdpi/lb_ic_search_mic.png similarity index 100% rename from v17/leanback/res/drawable-xxhdpi/lb_search_mic.png rename to v17/leanback/res/drawable-xxhdpi/lb_ic_search_mic.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_search_mic_out.png b/v17/leanback/res/drawable-xxhdpi/lb_ic_search_mic_out.png similarity index 100% rename from v17/leanback/res/drawable-xxhdpi/lb_search_mic_out.png rename to v17/leanback/res/drawable-xxhdpi/lb_ic_search_mic_out.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_focused.9.png b/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_focused.9.png new file mode 100644 index 0000000..65f3a9e --- /dev/null +++ b/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_focused.9.png Binary files differ
diff --git a/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_normal.9.png b/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_normal.9.png new file mode 100644 index 0000000..9bc3f6f --- /dev/null +++ b/v17/leanback/res/drawable-xxhdpi/lb_in_app_search_shadow_normal.9.png Binary files differ
diff --git a/v17/leanback/res/layout/lb_details_overview.xml b/v17/leanback/res/layout/lb_details_overview.xml index 7f3c248..beca042 100644 --- a/v17/leanback/res/layout/lb_details_overview.xml +++ b/v17/leanback/res/layout/lb_details_overview.xml
@@ -42,7 +42,7 @@ android:id="@+id/details_overview_actions_more" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/lb_actions_right_arrow" + android:src="@drawable/lb_ic_actions_right_arrow" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_marginRight="@dimen/lb_details_overview_actions_more_margin_right" @@ -81,4 +81,4 @@ </LinearLayout> </RelativeLayout> -</FrameLayout> \ No newline at end of file +</FrameLayout>
diff --git a/v17/leanback/res/layout/lb_speech_orb.xml b/v17/leanback/res/layout/lb_speech_orb.xml index 15bd984..ff6129b 100644 --- a/v17/leanback/res/layout/lb_speech_orb.xml +++ b/v17/leanback/res/layout/lb_speech_orb.xml
@@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/lb_search_mic_out" + android:src="@drawable/lb_ic_search_mic_out" android:contentDescription="@string/orb_search_action" /> </merge>
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/SpeechOrbView.java b/v17/leanback/src/android/support/v17/leanback/widget/SpeechOrbView.java index 21a7f8c..46165d5 100644 --- a/v17/leanback/src/android/support/v17/leanback/widget/SpeechOrbView.java +++ b/v17/leanback/src/android/support/v17/leanback/widget/SpeechOrbView.java
@@ -68,9 +68,9 @@ final float zoom = gainFocus ? mFocusedZoom : 1f; mSpeechOrbView.animate().scaleX(zoom).scaleY(zoom).setDuration(200).start(); if (gainFocus) { - mIcon.setImageResource(R.drawable.lb_search_mic); + mIcon.setImageResource(R.drawable.lb_ic_search_mic); } else { - mIcon.setImageResource(R.drawable.lb_search_mic_out); + mIcon.setImageResource(R.drawable.lb_ic_search_mic_out); } }