diff options
Diffstat (limited to 'res')
27 files changed, 215 insertions, 92 deletions
diff --git a/res/drawable/btn_circle.xml b/res/drawable/btn_add.xml index 9208010..1345fd1 100644 --- a/res/drawable/btn_circle.xml +++ b/res/drawable/btn_add.xml @@ -16,17 +16,11 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_window_focused="false" android:state_enabled="true" - android:drawable="@drawable/btn_circle_normal" /> - <item android:state_window_focused="false" android:state_enabled="false" - android:drawable="@drawable/btn_circle_disable" /> + android:drawable="@drawable/plus_normal" /> <item android:state_pressed="true" - android:drawable="@drawable/btn_circle_pressed" /> + android:drawable="@drawable/plus_pressed" /> <item android:state_focused="true" android:state_enabled="true" - android:drawable="@drawable/btn_circle_selected" /> + android:drawable="@drawable/plus_selected" /> <item android:state_enabled="true" - android:drawable="@drawable/btn_circle_normal" /> - <item android:state_focused="true" - android:drawable="@drawable/btn_circle_disable_focused" /> - <item - android:drawable="@drawable/btn_circle_disable" /> + android:drawable="@drawable/plus_normal" /> </selector> diff --git a/res/drawable/btn_circle_disable.png b/res/drawable/btn_circle_disable.png Binary files differdeleted file mode 100644 index 33b74a6..0000000 --- a/res/drawable/btn_circle_disable.png +++ /dev/null diff --git a/res/drawable/btn_circle_disable_focused.png b/res/drawable/btn_circle_disable_focused.png Binary files differdeleted file mode 100644 index 005ad8d..0000000 --- a/res/drawable/btn_circle_disable_focused.png +++ /dev/null diff --git a/res/drawable/btn_circle_normal.png b/res/drawable/btn_circle_normal.png Binary files differdeleted file mode 100644 index fc5af1c..0000000 --- a/res/drawable/btn_circle_normal.png +++ /dev/null diff --git a/res/drawable/btn_circle_pressed.png b/res/drawable/btn_circle_pressed.png Binary files differdeleted file mode 100644 index 8f40afd..0000000 --- a/res/drawable/btn_circle_pressed.png +++ /dev/null diff --git a/res/drawable/btn_circle_selected.png b/res/drawable/btn_circle_selected.png Binary files differdeleted file mode 100644 index c74fac2..0000000 --- a/res/drawable/btn_circle_selected.png +++ /dev/null diff --git a/res/drawable/btn_g.xml b/res/drawable/btn_g.xml new file mode 100644 index 0000000..d033b43 --- /dev/null +++ b/res/drawable/btn_g.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/g_normal" /> + <item android:state_pressed="true" + android:drawable="@drawable/g_pressed" /> + <item android:state_focused="true" android:state_enabled="true" + android:drawable="@drawable/g_selected" /> + <item android:state_enabled="true" + android:drawable="@drawable/g_normal" /> +</selector> diff --git a/res/drawable/btn_list.xml b/res/drawable/btn_list.xml new file mode 100644 index 0000000..84a033e --- /dev/null +++ b/res/drawable/btn_list.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/list_normal" /> + <item android:state_pressed="true" + android:drawable="@drawable/list_pressed" /> + <item android:state_focused="true" android:state_enabled="true" + android:drawable="@drawable/list_selected" /> + <item android:state_enabled="true" + android:drawable="@drawable/list_normal" /> +</selector> diff --git a/res/drawable/g_normal.png b/res/drawable/g_normal.png Binary files differnew file mode 100644 index 0000000..2ae9703 --- /dev/null +++ b/res/drawable/g_normal.png diff --git a/res/drawable/g_pressed.png b/res/drawable/g_pressed.png Binary files differnew file mode 100644 index 0000000..13667dc --- /dev/null +++ b/res/drawable/g_pressed.png diff --git a/res/drawable/g_selected.png b/res/drawable/g_selected.png Binary files differnew file mode 100644 index 0000000..faed865 --- /dev/null +++ b/res/drawable/g_selected.png diff --git a/res/drawable/gestures_background.xml b/res/drawable/gestures_background.xml index 34ec051..59c11dc 100755..100644 --- a/res/drawable/gestures_background.xml +++ b/res/drawable/gestures_background.xml @@ -1,20 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2009 Romain Guy +<!-- Copyright (C) 2009 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 + 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 + 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. + 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:src="@drawable/texture_paper" - android:tileMode="repeat" /> +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/gestures_frame" + android:dither="true" /> diff --git a/res/drawable/gestures_frame.9.png b/res/drawable/gestures_frame.9.png Binary files differnew file mode 100644 index 0000000..c5f5640 --- /dev/null +++ b/res/drawable/gestures_frame.9.png diff --git a/res/drawable/ic_btn_round_plus.png b/res/drawable/ic_btn_round_plus.png Binary files differdeleted file mode 100644 index 1ec8a95..0000000 --- a/res/drawable/ic_btn_round_plus.png +++ /dev/null diff --git a/res/drawable/list_normal.png b/res/drawable/list_normal.png Binary files differnew file mode 100644 index 0000000..ee05949 --- /dev/null +++ b/res/drawable/list_normal.png diff --git a/res/drawable/list_pressed.png b/res/drawable/list_pressed.png Binary files differnew file mode 100644 index 0000000..8e3c68c --- /dev/null +++ b/res/drawable/list_pressed.png diff --git a/res/drawable/list_selected.png b/res/drawable/list_selected.png Binary files differnew file mode 100644 index 0000000..93858f4 --- /dev/null +++ b/res/drawable/list_selected.png diff --git a/res/drawable/plus_normal.png b/res/drawable/plus_normal.png Binary files differnew file mode 100644 index 0000000..ddc5888 --- /dev/null +++ b/res/drawable/plus_normal.png diff --git a/res/drawable/plus_pressed.png b/res/drawable/plus_pressed.png Binary files differnew file mode 100644 index 0000000..872f092 --- /dev/null +++ b/res/drawable/plus_pressed.png diff --git a/res/drawable/plus_selected.png b/res/drawable/plus_selected.png Binary files differnew file mode 100644 index 0000000..32c441f --- /dev/null +++ b/res/drawable/plus_selected.png diff --git a/res/drawable/texture_paper.jpg b/res/drawable/texture_paper.jpg Binary files differdeleted file mode 100644 index 27f4fd6..0000000 --- a/res/drawable/texture_paper.jpg +++ /dev/null diff --git a/res/layout/gestures.xml b/res/layout/gestures.xml index c9ea2a5..a22ce06 100644 --- a/res/layout/gestures.xml +++ b/res/layout/gestures.xml @@ -14,83 +14,89 @@ limitations under the License. --> -<!-- Note: GesturesPanel is a special implementation that forces the widget - to be opaque for performance reasons. Make sure it visually is. --> +<!-- TODO: Replace all this with a RelativeLayout --> <com.android.launcher.GesturesPanel xmlns:android="http://schemas.android.com/apk/res/android" - - android:id="@+id/gestures_panel" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <ViewSwitcher - android:id="@+id/gestures_actions" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + + android:paddingLeft="13dip" + android:paddingRight="13dip" + + android:orientation="vertical" + android:background="@drawable/gestures_background"> + + <FrameLayout android:layout_width="fill_parent" - android:layout_height="83dip" - android:layout_alignParentBottom="true" - - android:inAnimation="@anim/fade_in_fast" - android:outAnimation="@anim/fade_out_fast" - - android:foregroundGravity="top|fill_horizontal" - android:foreground="@*android:drawable/title_bar_shadow" - android:background="@android:drawable/title_bar_tall"> - + android:layout_height="wrap_content" + + android:paddingTop="13dip" + android:paddingBottom="13dip"> + <TextView - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="center_horizontal" - - android:gravity="center_vertical" - - android:shadowColor="#FF000000" - android:shadowRadius="2.0" - - android:drawablePadding="8dip" - android:textAppearance="?android:attr/textAppearanceLarge" + android:id="@+id/gestures_prompt" + android:layout_width="fill_parent" + android:layout_height="64dip" + + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceLargeInverse" android:ellipsize="end" - android:maxLines="2" + android:maxLines="1" + android:singleLine="true" android:text="@string/gestures_instructions" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="center_horizontal" - - android:gravity="center_vertical" - - android:shadowColor="#FF000000" - android:shadowRadius="2.0" + <Button + android:id="@+id/gestures_action" + android:layout_width="fill_parent" + android:layout_height="64dip" - android:drawablePadding="8dip" - android:textAppearance="?android:attr/textAppearanceLarge" + android:gravity="left|center_vertical" + android:textAppearance="?android:attr/textAppearanceLargeInverse" android:ellipsize="end" - android:maxLines="2" - android:text="@string/gestures_instructions" /> - - </ViewSwitcher> + android:maxLines="1" + android:singleLine="true" + android:drawablePadding="6dip" + + android:visibility="gone" /> + + </FrameLayout> <android.gesture.GestureOverlayView android:id="@+id/gestures_overlay" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1.0" - android:layout_alignParentTop="true" - android:layout_above="@id/gestures_actions" - - android:background="@drawable/gestures_background" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:gestureColor="@color/gesture_color" + android:uncertainGestureColor="@color/uncertain_gesture_color" android:gestureStrokeType="multiple" /> - <ImageButton - style="@style/PlusButton" - - android:id="@+id/gestures_add" - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignTop="@id/gestures_actions" - android:layout_marginRight="5dip" - android:layout_marginTop="-47dip" /> + + android:paddingTop="15dip" + android:paddingBottom="13dip"> + + <ImageButton + android:id="@+id/gestures_add" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + + android:background="@drawable/btn_add" /> + + <ImageButton + android:id="@+id/gestures_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + + android:background="@drawable/btn_list" /> + + </RelativeLayout> </com.android.launcher.GesturesPanel> diff --git a/res/layout/gestures_settings.xml b/res/layout/gestures_settings.xml index 4b1976f..d32b3ec 100644 --- a/res/layout/gestures_settings.xml +++ b/res/layout/gestures_settings.xml @@ -14,9 +14,7 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> <ListView android:id="@android:id/list" @@ -34,4 +32,4 @@ android:text="@string/gestures_loading" android:textAppearance="?android:attr/textAppearanceMedium" /> -</FrameLayout> +</merge> diff --git a/res/layout/list_category.xml b/res/layout/list_category.xml new file mode 100644 index 0000000..1e8d04c --- /dev/null +++ b/res/layout/list_category.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + style="?android:attr/listSeparatorTextViewStyle" /> diff --git a/res/layout/list_checkbox_2lines.xml b/res/layout/list_checkbox_2lines.xml new file mode 100644 index 0000000..ed80c5f --- /dev/null +++ b/res/layout/list_checkbox_2lines.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize"> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="15dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + + <TextView android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_alignLeft="@id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:maxLines="2" /> + + </RelativeLayout> + + <CheckBox + android:id="@+id/checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="4dip" + android:layout_gravity="center_vertical" + android:focusable="false" + android:clickable="false" /> + +</LinearLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index e1b4843..9b9700f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -26,5 +26,6 @@ <color name="appwidget_error_color">#FCCC</color> <color name="snag_callout_color">#F444</color> - <color name="gesture_color">#FFFFFF00</color> + <color name="gesture_color">#ff0563c1</color> + <color name="uncertain_gesture_color">#ff848484</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5319bb0..6f4365f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -61,9 +61,4 @@ <item name="android:paddingRight">10dip</item> </style> - <style name="PlusButton"> - <item name="android:background">@drawable/btn_circle</item> - <item name="android:src">@drawable/ic_btn_round_plus</item> - </style> - </resources> |
