diff options
Diffstat (limited to 'core/res')
40 files changed, 275 insertions, 54 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e9db5f0..1b145af 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -924,13 +924,13 @@ android:description="@string/permdesc_batteryStats" android:protectionLevel="normal" /> - <!-- Allows an application to tell the gadget service which application - can access gadget's data. The normal user flow is that a user - picks a gadget to go into a particular host, thereby giving that - host application access to the private data from the gadget app. + <!-- Allows an application to tell the AppWidget service which application + can access AppWidget's data. The normal user flow is that a user + picks an AppWidget to go into a particular host, thereby giving that + host application access to the private data from the AppWidget app. An application that has this permission should honor that contract. Very few applications should need to use this permission. --> - <permission android:name="android.permission.BIND_GADGET" + <permission android:name="android.permission.BIND_APPWIDGET" android:permissionGroup="android.permission-group.PERSONAL_INFO" android:label="@string/permlab_bindGadget" android:description="@string/permdesc_bindGadget" diff --git a/core/res/res/drawable/btn_browser_zoom_fit_page.xml b/core/res/res/drawable/btn_browser_zoom_fit_page.xml new file mode 100644 index 0000000..2f4761a --- /dev/null +++ b/core/res/res/drawable/btn_browser_zoom_fit_page.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:drawable/btn_square_overlay" /> + <item android:drawable="@android:drawable/ic_btn_square_browser_zoom_fit_page" /> +</layer-list> diff --git a/core/res/res/drawable/btn_browser_zoom_page_overview.xml b/core/res/res/drawable/btn_browser_zoom_page_overview.xml new file mode 100644 index 0000000..16fb1e6 --- /dev/null +++ b/core/res/res/drawable/btn_browser_zoom_page_overview.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:drawable/btn_square_overlay" /> + <item android:drawable="@android:drawable/ic_btn_square_browser_zoom_page_overview" /> +</layer-list> diff --git a/core/res/res/drawable/btn_square_overlay.xml b/core/res/res/drawable/btn_square_overlay.xml new file mode 100644 index 0000000..a2c698c --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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="false" android:state_focused="true" + android:state_window_focused="true" + android:drawable="@drawable/btn_square_overlay_disabled_focused" /> + <item android:state_enabled="false" android:drawable="@drawable/btn_square_overlay_disabled" /> + <item android:state_pressed="true" android:drawable="@drawable/btn_square_overlay_pressed" /> + <item android:state_focused="true" android:state_window_focused="true" + android:drawable="@drawable/btn_square_overlay_selected" /> + <item android:drawable="@drawable/btn_square_overlay_normal" /> +</selector>
\ No newline at end of file diff --git a/core/res/res/drawable/btn_square_overlay_disabled.png b/core/res/res/drawable/btn_square_overlay_disabled.png Binary files differnew file mode 100644 index 0000000..cf7e4ea --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay_disabled.png diff --git a/core/res/res/drawable/btn_square_overlay_disabled_focused.png b/core/res/res/drawable/btn_square_overlay_disabled_focused.png Binary files differnew file mode 100644 index 0000000..5aa1143 --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay_disabled_focused.png diff --git a/core/res/res/drawable/btn_square_overlay_normal.png b/core/res/res/drawable/btn_square_overlay_normal.png Binary files differnew file mode 100644 index 0000000..45fa4fe --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay_normal.png diff --git a/core/res/res/drawable/btn_square_overlay_pressed.png b/core/res/res/drawable/btn_square_overlay_pressed.png Binary files differnew file mode 100644 index 0000000..952571b --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay_pressed.png diff --git a/core/res/res/drawable/btn_square_overlay_selected.png b/core/res/res/drawable/btn_square_overlay_selected.png Binary files differnew file mode 100644 index 0000000..ce4515e --- /dev/null +++ b/core/res/res/drawable/btn_square_overlay_selected.png diff --git a/core/res/res/drawable/btn_zoom_down.xml b/core/res/res/drawable/btn_zoom_down.xml new file mode 100644 index 0000000..e7449aa --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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="false" android:state_focused="true" + android:state_window_focused="true" + android:drawable="@drawable/btn_zoom_down_disabled_focused" /> + <item android:state_enabled="false" android:drawable="@drawable/btn_zoom_down_disabled" /> + <item android:state_pressed="true" android:drawable="@drawable/btn_zoom_down_pressed" /> + <item android:state_focused="true" android:state_window_focused="true" + android:drawable="@drawable/btn_zoom_down_selected" /> + <item android:drawable="@drawable/btn_zoom_down_normal" /> +</selector> + diff --git a/core/res/res/drawable/btn_zoom_down_disabled.9.png b/core/res/res/drawable/btn_zoom_down_disabled.9.png Binary files differnew file mode 100644 index 0000000..7780bd7 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_disabled.9.png diff --git a/core/res/res/drawable/btn_zoom_down_disabled_focused.9.png b/core/res/res/drawable/btn_zoom_down_disabled_focused.9.png Binary files differnew file mode 100644 index 0000000..39131c5 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_disabled_focused.9.png diff --git a/core/res/res/drawable/btn_zoom_down_longpress.9.png b/core/res/res/drawable/btn_zoom_down_longpress.9.png Binary files differnew file mode 100644 index 0000000..09a3bb3 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_longpress.9.png diff --git a/core/res/res/drawable/btn_zoom_down_normal.9.png b/core/res/res/drawable/btn_zoom_down_normal.9.png Binary files differnew file mode 100644 index 0000000..b589a84 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_normal.9.png diff --git a/core/res/res/drawable/btn_zoom_down_pressed.9.png b/core/res/res/drawable/btn_zoom_down_pressed.9.png Binary files differnew file mode 100644 index 0000000..a8ca467 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_pressed.9.png diff --git a/core/res/res/drawable/btn_zoom_down_selected.9.png b/core/res/res/drawable/btn_zoom_down_selected.9.png Binary files differnew file mode 100644 index 0000000..af551e7 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_down_selected.9.png diff --git a/core/res/res/drawable/btn_zoom_up.xml b/core/res/res/drawable/btn_zoom_up.xml new file mode 100644 index 0000000..045b3c3 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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="false" android:state_focused="true" + android:state_window_focused="true" + android:drawable="@drawable/btn_zoom_up_disabled_focused" /> + <item android:state_enabled="false" android:drawable="@drawable/btn_zoom_up_disabled" /> + <item android:state_pressed="true" android:drawable="@drawable/btn_zoom_up_pressed" /> + <item android:state_focused="true" android:state_window_focused="true" + android:drawable="@drawable/btn_zoom_up_selected" /> + <item android:drawable="@drawable/btn_zoom_up_normal" /> +</selector> + diff --git a/core/res/res/drawable/btn_zoom_up_disabled.9.png b/core/res/res/drawable/btn_zoom_up_disabled.9.png Binary files differnew file mode 100644 index 0000000..5203630 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_disabled.9.png diff --git a/core/res/res/drawable/btn_zoom_up_disabled_focused.9.png b/core/res/res/drawable/btn_zoom_up_disabled_focused.9.png Binary files differnew file mode 100644 index 0000000..c72c9cd --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_disabled_focused.9.png diff --git a/core/res/res/drawable/btn_zoom_up_longpress.9.png b/core/res/res/drawable/btn_zoom_up_longpress.9.png Binary files differnew file mode 100644 index 0000000..8de48d1 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_longpress.9.png diff --git a/core/res/res/drawable/btn_zoom_up_normal.9.png b/core/res/res/drawable/btn_zoom_up_normal.9.png Binary files differnew file mode 100644 index 0000000..5027348 --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_normal.9.png diff --git a/core/res/res/drawable/btn_zoom_up_pressed.9.png b/core/res/res/drawable/btn_zoom_up_pressed.9.png Binary files differnew file mode 100644 index 0000000..1a93e3a --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_pressed.9.png diff --git a/core/res/res/drawable/btn_zoom_up_selected.9.png b/core/res/res/drawable/btn_zoom_up_selected.9.png Binary files differnew file mode 100644 index 0000000..26aafee --- /dev/null +++ b/core/res/res/drawable/btn_zoom_up_selected.9.png diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page.xml b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page.xml new file mode 100644 index 0000000..bec869a --- /dev/null +++ b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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="false" android:drawable="@drawable/ic_btn_square_browser_zoom_fit_page_disabled" /> + <item android:drawable="@drawable/ic_btn_square_browser_zoom_fit_page_normal" /> +</selector>
\ No newline at end of file diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_disabled.png b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_disabled.png Binary files differnew file mode 100644 index 0000000..326397c --- /dev/null +++ b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_disabled.png diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_normal.png b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_normal.png Binary files differnew file mode 100644 index 0000000..5583401 --- /dev/null +++ b/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_normal.png diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_page_overview.png b/core/res/res/drawable/ic_btn_square_browser_zoom_page_overview.png Binary files differnew file mode 100644 index 0000000..4e8ff35 --- /dev/null +++ b/core/res/res/drawable/ic_btn_square_browser_zoom_page_overview.png diff --git a/core/res/res/drawable/seek_thumb.xml b/core/res/res/drawable/seek_thumb.xml index 7fe51b3..c7a862d 100644 --- a/core/res/res/drawable/seek_thumb.xml +++ b/core/res/res/drawable/seek_thumb.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<!-- This is the rating bar drawable that is used to a show a filled star. --> +<!-- This is the thumb on the seek bar. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" diff --git a/core/res/res/drawable/seek_thumb_normal.png b/core/res/res/drawable/seek_thumb_normal.png Binary files differindex dbaae91..e9f2e23 100644 --- a/core/res/res/drawable/seek_thumb_normal.png +++ b/core/res/res/drawable/seek_thumb_normal.png diff --git a/core/res/res/drawable/seek_thumb_pressed.png b/core/res/res/drawable/seek_thumb_pressed.png Binary files differindex dbaae91..3ea5051 100644 --- a/core/res/res/drawable/seek_thumb_pressed.png +++ b/core/res/res/drawable/seek_thumb_pressed.png diff --git a/core/res/res/drawable/seek_thumb_selected.png b/core/res/res/drawable/seek_thumb_selected.png Binary files differindex dbaae91..98b7ba0 100644 --- a/core/res/res/drawable/seek_thumb_selected.png +++ b/core/res/res/drawable/seek_thumb_selected.png diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml index 13b619a..1244c1d 100644 --- a/core/res/res/layout/input_method_extract_view.xml +++ b/core/res/res/layout/input_method_extract_view.xml @@ -44,7 +44,7 @@ android:background="@android:drawable/keyboard_accessory_bg_landscape" > - <Button android:id="@+id/inputExtractAction" + <android.inputmethodservice.ExtractButton android:id="@+id/inputExtractAction" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml index b78bb94..4834b28 100644 --- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml @@ -20,7 +20,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:background="#A0000000" + android:background="@android:color/background_dark" > <ScrollView android:layout_width="fill_parent" @@ -35,10 +35,11 @@ <TextView android:id="@+id/topHeader" android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_height="64dip" android:layout_alignParentTop="true" - android:textSize="24sp" - android:layout_marginTop="8dip" + android:layout_marginLeft="4dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_vertical" android:drawableLeft="@drawable/ic_lock_idle_lock" android:drawablePadding="5dip" android:text="@android:string/lockscreen_glogin_too_many_attempts" @@ -50,8 +51,7 @@ android:layout_width="fill_parent" android:layout_height="1dip" android:layout_below="@id/topHeader" - android:layout_marginTop="8dip" - android:background="@android:drawable/divider_horizontal_bright"/> + android:background="@drawable/divider_horizontal_dark"/> <TextView android:id="@+id/instructions" @@ -59,8 +59,8 @@ android:layout_height="wrap_content" android:layout_below="@+id/spacerTop" android:layout_marginTop="8dip" - android:gravity="center" - android:textSize="18sp" + android:layout_marginLeft="9dip" + android:textAppearance="?android:attr/textAppearanceSmall" android:text="@android:string/lockscreen_glogin_instructions" /> @@ -70,6 +70,8 @@ android:layout_height="wrap_content" android:layout_below="@id/instructions" android:layout_marginTop="8dip" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" android:hint="@android:string/lockscreen_glogin_username_hint" android:inputType="textEmailAddress" /> @@ -79,7 +81,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/login" - android:layout_marginTop="8dip" + android:layout_marginTop="15dip" + android:layout_marginLeft="7dip" + android:layout_marginRight="7dip" android:inputType="textPassword" android:hint="@android:string/lockscreen_glogin_password_hint" android:nextFocusRight="@+id/ok" @@ -89,38 +93,35 @@ <!-- ok below password, aligned to right of screen --> <Button android:id="@+id/ok" - android:layout_width="wrap_content" + android:layout_width="85dip" android:layout_height="wrap_content" android:layout_below="@id/password" - android:layout_marginTop="8dip" + android:layout_marginTop="7dip" + android:layout_marginRight="7dip" android:layout_alignParentRight="true" - android:textSize="18sp" android:text="@android:string/lockscreen_glogin_submit_button" /> </RelativeLayout> </ScrollView> - <View android:layout_width="1dp" android:layout_height="3dp" /> - + <!-- spacer above emergency call --> + <View + android:layout_width="fill_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dip" + + android:background="@drawable/divider_horizontal_dark"/> + <!-- emergency call button at bottom center --> <Button android:id="@+id/emergencyCall" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_weight="0" - android:textSize="18sp" android:drawableLeft="@drawable/ic_emergency" android:drawablePadding="3dip" android:text="@android:string/lockscreen_emergency_call" /> - <!-- spacer above emergency call (doesn't fit in landscape...)--> - <!--View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_above="@id/emergencyCall" - android:layout_marginBottom="8dip" - android:background="@android:drawable/divider_horizontal_bright"/--> </LinearLayout> diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml index fbbc1a4..952fc5d 100644 --- a/core/res/res/layout/keyguard_screen_lock.xml +++ b/core/res/res/layout/keyguard_screen_lock.xml @@ -36,8 +36,8 @@ android:layout_marginBottom="15dip" android:layout_marginLeft="15dip" android:layout_marginRight="15dip" - android:paddingTop="20dip" - android:paddingBottom="20dip" + android:paddingTop="20dip" + android:paddingBottom="20dip" android:background="@android:drawable/popup_full_dark" > @@ -59,13 +59,15 @@ android:layout_height="wrap_content" android:gravity="center" android:text="@android:string/lockscreen_missing_sim_message" - android:textSize="22sp"/> + android:textAppearance="?android:attr/textAppearanceLarge"/> <TextView android:id="@+id/headerSimBad2" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_marginTop="7dip" + android:layout_marginBottom="7dip" android:gravity="center" android:text="@android:string/lockscreen_missing_sim_instructions" - android:textSize="20sp"/> + android:textAppearance="?android:attr/textAppearanceSmall"/> <!-- spacer after carrier info / sim messages --> <View @@ -203,17 +205,15 @@ <!-- emergency call button shown when sim is missing or PUKd --> <Button android:id="@+id/emergencyCallButton" - android:layout_width="fill_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dip" - android:layout_marginRight="5dip" android:layout_marginBottom="5dip" - android:drawableTop="@drawable/ic_emergency" + android:layout_marginTop="5dip" + android:layout_gravity="center_horizontal" + android:drawableLeft="@drawable/ic_emergency" android:drawablePadding="3dip" android:text="@android:string/lockscreen_emergency_call" - android:textSize="14sp" /> - </LinearLayout> </LinearLayout> diff --git a/core/res/res/layout/zoom_browser_accessory_buttons.xml b/core/res/res/layout/zoom_browser_accessory_buttons.xml new file mode 100644 index 0000000..4bf2bdf --- /dev/null +++ b/core/res/res/layout/zoom_browser_accessory_buttons.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, 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. +*/ +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <ImageView android:id="@+id/zoom_fit_page" + android:background="@android:drawable/btn_browser_zoom_fit_page" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|left" + android:layout_marginLeft="7dip" + /> + <ImageView android:id="@+id/zoom_page_overview" + android:background="@android:drawable/btn_browser_zoom_page_overview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|right" + android:layout_marginRight="7dip" + /> +</merge> diff --git a/core/res/res/layout/zoom_container.xml b/core/res/res/layout/zoom_container.xml new file mode 100644 index 0000000..fc5cf3d --- /dev/null +++ b/core/res/res/layout/zoom_container.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, 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. +*/ +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <ZoomControls android:id="@+id/zoomControls" + android:layout_gravity="bottom|center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/ZoomControls" + android:background="@null" + /> +</merge> diff --git a/core/res/res/layout/zoom_controls.xml b/core/res/res/layout/zoom_controls.xml index 729af1b..95cf1d5 100644 --- a/core/res/res/layout/zoom_controls.xml +++ b/core/res/res/layout/zoom_controls.xml @@ -18,13 +18,13 @@ */ --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ZoomButton android:id="@+id/zoomIn" - android:background="@android:drawable/btn_plus" + <ZoomButton android:id="@+id/zoomOut" + android:background="@android:drawable/btn_zoom_down" android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <ZoomButton android:id="@+id/zoomOut" - android:background="@android:drawable/btn_minus" + <ZoomButton android:id="@+id/zoomIn" + android:background="@android:drawable/btn_zoom_up" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 5fa5f8d..899d109 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -586,7 +586,7 @@ <!-- There is no specific action associated with this editor, let the editor come up with its own if it can. Corresponds to - {@link android.view.inputmethod.EditorInfo#IME_ACTION_UNSPECIFIED}. --> + {@link android.view.inputmethod.EditorInfo#IME_NULL}. --> <flag name="actionUnspecified" value="0x00000000" /> <!-- This editor has no action associated with it. Corresponds to @@ -595,28 +595,38 @@ <!-- The action key performs a "go" operation to take the user to the target of the text they typed. Typically used, for example, when entering a URL. + Corresponds to {@link android.view.inputmethod.EditorInfo#IME_ACTION_GO}. --> <flag name="actionGo" value="0x00000002" /> <!-- The action key performs a "search" operation, taking the user to the results of searching for the text the have typed (in whatever context is appropriate). + Corresponds to {@link android.view.inputmethod.EditorInfo#IME_ACTION_SEARCH}. --> <flag name="actionSearch" value="0x00000003" /> <!-- The action key performs a "send" operation, delivering the text to its target. This is typically used when composing a message. + Corresponds to {@link android.view.inputmethod.EditorInfo#IME_ACTION_SEND}. --> <flag name="actionSend" value="0x00000004" /> <!-- The action key performs a "next" operation, taking the user to the next field that will accept text. + Corresponds to {@link android.view.inputmethod.EditorInfo#IME_ACTION_NEXT}. --> <flag name="actionNext" value="0x00000005" /> + <!-- The action key performs a "done" + operation, closing the soft input method. + Corresponds to + {@link android.view.inputmethod.EditorInfo#IME_ACTION_DONE}. --> + <flag name="actionDone" value="0x00000006" /> <!-- Used in conjunction with a custom action, this indicates that the action should not be available in-line as the same as a "enter" key. Typically this is because the action has such a significant impact or is not recoverable enough that accidentally hitting it should be avoided, such as sending a message. + <p>Corresponds to {@link android.view.inputmethod.EditorInfo#IME_FLAG_NO_ENTER_ACTION}. --> <flag name="flagNoEnterAction" value="0x40000000" /> </attr> @@ -3115,23 +3125,23 @@ </declare-styleable> <!-- =============================== --> - <!-- Gadget package class attributes --> + <!-- AppWidget package class attributes --> <!-- =============================== --> - <!-- Use <code>gadget-provider</code> as the root tag of the XML resource that - describes a gadget provider. See TODO android.gadget package + <!-- Use <code>appwidget-provider</code> as the root tag of the XML resource that + describes an AppWidget provider. See TODO android.appwidget package for more info. --> - <declare-styleable name="GadgetProviderInfo"> - <!-- Minimum width of the gadget. --> + <declare-styleable name="AppWidgetProviderInfo"> + <!-- Minimum width of the AppWidget. --> <attr name="minWidth"/> - <!-- Minimum height of the gadget. --> + <!-- Minimum height of the AppWidget. --> <attr name="minHeight"/> - <!-- Update period in milliseconds, or 0 if the gadget will update itself. --> + <!-- Update period in milliseconds, or 0 if the AppWidget will update itself. --> <attr name="updatePeriodMillis" format="integer" /> <!-- A resource id of a layout. --> <attr name="initialLayout" format="reference" /> - <!-- A class name in the gadget's package to be launched to configure. + <!-- A class name in the AppWidget's package to be launched to configure. If not supplied, then no activity will be launched. --> <attr name="configure" format="string" /> </declare-styleable> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index cb63e17..761cedd 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1184,7 +1184,7 @@ <!-- Title of the unlock screen that uses your Google login and password --> <string name="lockscreen_glogin_too_many_attempts">Too many pattern attempts!</string> <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone --> - <string name="lockscreen_glogin_instructions">To unlock,\nsign in with your Google account</string> + <string name="lockscreen_glogin_instructions">To unlock, sign in with your Google account</string> <!-- Hint caption for the username field when unlocking the phone using login and password --> <string name="lockscreen_glogin_username_hint">Username (email)</string> <!-- Hint caption for the password field when unlocking the phone using login and password --> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 54eba62..ff8f8c2 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -144,6 +144,13 @@ <item name="windowExitAnimation">@anim/search_bar_exit</item> </style> + <!-- Window animations that are applied to the zoom buttons overlay window. + {@hide Pending API council approval} --> + <style name="Animation.ZoomButtons"> + <item name="windowEnterAnimation">@anim/fade_in</item> + <item name="windowExitAnimation">@anim/fade_out</item> + </style> + <!-- Status Bar Styles --> <style name="TextAppearance.StatusBarTitle"> |
