diff options
author | John Spurlock <jspurlock@google.com> | 2013-12-03 22:19:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-03 22:19:06 +0000 |
commit | b4de207bc30b61c8834ffead882cd27a6bffe8ea (patch) | |
tree | 3e783d88de8ca02e22f920f150bf2ca8352bb608 /packages | |
parent | 9f4c54c2944beeb859ad65bf03c67f9b04158e1a (diff) | |
parent | 74d2480845b93afd96aef19825a8b384168328ed (diff) | |
download | frameworks_base-b4de207bc30b61c8834ffead882cd27a6bffe8ea.zip frameworks_base-b4de207bc30b61c8834ffead882cd27a6bffe8ea.tar.gz frameworks_base-b4de207bc30b61c8834ffead882cd27a6bffe8ea.tar.bz2 |
Merge "Move moveable non-public framework resources up to SystemUI"
Diffstat (limited to 'packages')
28 files changed, 73 insertions, 65 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_activated.png b/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 0000000..c0e2098 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_activated.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 0000000..a852e2c --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_action_assist_generic_normal.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_lockscreen_glowdot.png b/packages/SystemUI/res/drawable-hdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 0000000..983c45e --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_lockscreen_glowdot.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_activated.png b/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 0000000..f88f7e1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_activated.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 0000000..7426994 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_action_assist_generic_normal.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_lockscreen_glowdot.png b/packages/SystemUI/res/drawable-mdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 0000000..056c3f17 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_lockscreen_glowdot.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_activated.png b/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 0000000..500b157 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_activated.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 0000000..d0e4cf3 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_action_assist_generic_normal.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png b/packages/SystemUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 0000000..cbd039a --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_activated.png b/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 0000000..cc38e83 --- /dev/null +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_activated.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 0000000..42f96eb --- /dev/null +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_action_assist_generic_normal.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png b/packages/SystemUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 0000000..c0edd91 --- /dev/null +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png diff --git a/packages/SystemUI/res/drawable/ic_action_assist_generic.xml b/packages/SystemUI/res/drawable/ic_action_assist_generic.xml new file mode 100644 index 0000000..60f5d5d --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_action_assist_generic.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:state_enabled="true" + android:state_active="false" + android:state_focused="false" + android:drawable="@drawable/ic_action_assist_generic_normal" /> + + <item + android:state_enabled="true" + android:state_active="true" + android:state_focused="false" + android:drawable="@drawable/ic_action_assist_generic_activated" /> + + <item + android:state_enabled="true" + android:state_active="false" + android:state_focused="true" + android:drawable="@drawable/ic_action_assist_generic_activated" /> + +</selector> diff --git a/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml b/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml index 0e1bdd3..ce3372e 100644 --- a/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml +++ b/packages/SystemUI/res/drawable/notification_row_legacy_bg.xml @@ -17,6 +17,6 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> - <item android:state_pressed="true" android:drawable="@*android:drawable/notification_item_background_color_pressed" /> + <item android:state_pressed="true" android:drawable="@drawable/notification_item_background_color_pressed" /> <item android:state_pressed="false" android:drawable="@drawable/notification_item_background_legacy_color" /> </selector> diff --git a/packages/SystemUI/res/drawable/status_bar_item_background.xml b/packages/SystemUI/res/drawable/status_bar_item_background.xml index b82fed9..3a50aa9 100644 --- a/packages/SystemUI/res/drawable/status_bar_item_background.xml +++ b/packages/SystemUI/res/drawable/status_bar_item_background.xml @@ -19,7 +19,7 @@ android:opacity="translucent" > <item - android:drawable="@*android:drawable/notification_item_background_color" + android:drawable="@drawable/notification_item_background_color" /> </layer-list> diff --git a/packages/SystemUI/res/drawable/status_bar_ticker_background.xml b/packages/SystemUI/res/drawable/status_bar_ticker_background.xml deleted file mode 100644 index 7cb64c0..0000000 --- a/packages/SystemUI/res/drawable/status_bar_ticker_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<bitmap - xmlns:android="http://schemas.android.com/apk/res/android" - android:tileMode="repeat" - android:src="@*android:drawable/notify_panel_notification_icon_bg" - /> diff --git a/packages/SystemUI/res/drawable/system_bar_ticker_background.xml b/packages/SystemUI/res/drawable/system_bar_ticker_background.xml deleted file mode 100644 index 7cb64c0..0000000 --- a/packages/SystemUI/res/drawable/system_bar_ticker_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<bitmap - xmlns:android="http://schemas.android.com/apk/res/android" - android:tileMode="repeat" - android:src="@*android:drawable/notify_panel_notification_icon_bg" - /> diff --git a/packages/SystemUI/res/drawable/ticker_background.xml b/packages/SystemUI/res/drawable/ticker_background.xml index 07b44ca..7320fa0 100644 --- a/packages/SystemUI/res/drawable/ticker_background.xml +++ b/packages/SystemUI/res/drawable/ticker_background.xml @@ -20,7 +20,7 @@ > <!-- the large icon extends 12dp beyond the edge of the status bar --> <item - android:drawable="@*android:drawable/notification_item_background_color" + android:drawable="@drawable/notification_item_background_color" android:top="12dp" /> </layer-list> diff --git a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml index a109191..ddffd6e 100644 --- a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml @@ -51,13 +51,13 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" - prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:innerRadius="@dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" - prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" - prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + prvandroid:glowRadius="@dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@drawable/ic_lockscreen_glowdot" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml index 1fa67bd..08f61bb 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml @@ -37,12 +37,12 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" - prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:innerRadius="@dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" - prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" - prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"/> + prvandroid:glowRadius="@dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@drawable/ic_lockscreen_glowdot"/> </com.android.systemui.SearchPanelView> diff --git a/packages/SystemUI/res/layout/status_bar_search_panel.xml b/packages/SystemUI/res/layout/status_bar_search_panel.xml index b871bef..c01db7c 100644 --- a/packages/SystemUI/res/layout/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout/status_bar_search_panel.xml @@ -51,13 +51,13 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" - prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:innerRadius="@dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" - prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" - prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + prvandroid:glowRadius="@dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@drawable/ic_lockscreen_glowdot" /> </RelativeLayout> diff --git a/packages/SystemUI/res/values-land/arrays.xml b/packages/SystemUI/res/values-land/arrays.xml index 74a6c81..c32ce12 100644 --- a/packages/SystemUI/res/values-land/arrays.xml +++ b/packages/SystemUI/res/values-land/arrays.xml @@ -22,21 +22,21 @@ <array name="navbar_search_targets"> <item>@null</item> <item>@null</item> - <item>@*android:drawable/ic_action_assist_generic</item> + <item>@drawable/ic_action_assist_generic</item> <item>@null</item> </array> <array name="navbar_search_target_descriptions"> <item>@null</item> <item>@null</item> - <item>@*android:string/description_target_search</item> + <item>@string/description_target_search</item> <item>@null</item> </array> <array name="navbar_search_direction_descriptions"> <item>@null</item> <item>@null</item> - <item>@*android:string/description_direction_left</item> + <item>@string/description_direction_left</item> <item>@null</item> </array> diff --git a/packages/SystemUI/res/values-sw600dp/arrays.xml b/packages/SystemUI/res/values-sw600dp/arrays.xml index f3a1771..21c4bd3 100644 --- a/packages/SystemUI/res/values-sw600dp/arrays.xml +++ b/packages/SystemUI/res/values-sw600dp/arrays.xml @@ -21,21 +21,21 @@ <array name="navbar_search_targets"> <item>@null</item> - <item>@*android:drawable/ic_action_assist_generic</item> + <item>@drawable/ic_action_assist_generic</item> <item>@null</item> <item>@null</item> </array> <array name="navbar_search_target_descriptions"> <item>@null</item> - <item>@*android:string/description_target_search</item> + <item>@string/description_target_search</item> <item>@null</item> <item>@null</item> </array> <array name="navbar_search_direction_descriptions"> <item>@null</item> - <item>@*android:string/description_direction_left</item> + <item>@string/description_direction_left</item> <item>@null</item> <item>@null</item> </array> diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml index bfb600d..1ce4983 100644 --- a/packages/SystemUI/res/values/arrays.xml +++ b/packages/SystemUI/res/values/arrays.xml @@ -21,21 +21,21 @@ <array name="navbar_search_targets"> <item>@null</item> - <item>@*android:drawable/ic_action_assist_generic</item> + <item>@drawable/ic_action_assist_generic</item> <item>@null</item> <item>@null</item> </array> <array name="navbar_search_target_descriptions"> <item>@null</item> - <item>@*android:string/description_target_search</item> + <item>@string/description_target_search</item> <item>@null</item> <item>@null</item> </array> <array name="navbar_search_direction_descriptions"> <item>@null</item> - <item>@*android:string/description_direction_up</item> + <item>@string/description_direction_up</item> <item>@null</item> <item>@null</item> </array> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 0bbdead..3a35de5 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -36,4 +36,6 @@ <color name="batterymeter_charge_color">#FFFFFFFF</color> <color name="batterymeter_bolt_color">#B2000000</color><!-- 70% black --> <color name="status_bar_clock_color">#FFFFFFFF</color> + <drawable name="notification_item_background_color">#ff111111</drawable> + <drawable name="notification_item_background_color_pressed">#ff454545</drawable> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index cc78cb4..e6b2b8b 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -220,4 +220,10 @@ <!-- used by DessertCase --> <dimen name="dessert_case_cell_size">192dp</dimen> + + <!-- Default glow radius for GlowPadView --> + <dimen name="glowpadview_glow_radius">75dip</dimen> + + <!-- Default distance from each snap target that GlowPadView considers a "hit" --> + <dimen name="glowpadview_inner_radius">15dip</dimen> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 25202ed..5afd55b 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -513,4 +513,10 @@ linebreak to position it correctly. [CHAR LIMIT=45] --> <string name="ssl_ca_cert_warning">Network may\nbe monitored</string> + <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] --> + <string name="description_target_search">Search</string> + <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] --> + <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string> + <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] --> + <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java index c7f0e17..b096ead 100644 --- a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java @@ -135,7 +135,7 @@ public class SearchPanelView extends FrameLayout implements public void onTrigger(View v, final int target) { final int resId = mGlowPadView.getResourceIdForTarget(target); switch (resId) { - case com.android.internal.R.drawable.ic_action_assist_generic: + case R.drawable.ic_action_assist_generic: mWaitingForLaunch = true; startAssistActivity(); vibrate(); @@ -175,7 +175,7 @@ public class SearchPanelView extends FrameLayout implements ComponentName component = intent.getComponent(); if (component == null || !mGlowPadView.replaceTargetDrawablesIfPresent(component, ASSIST_ICON_METADATA_NAME, - com.android.internal.R.drawable.ic_action_assist_generic)) { + R.drawable.ic_action_assist_generic)) { if (DEBUG) Log.v(TAG, "Couldn't grab icon for component " + component); } } |