summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_appwidget_settings_brightness_auto.pngbin0 -> 1167 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_selected_all.pngbin0 -> 819 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_selected_download.pngbin0 -> 983 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_selected_running.pngbin0 -> 2122 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_selected_sdcard.pngbin0 -> 906 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_unselected_all.pngbin0 -> 1017 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_unselected_download.pngbin0 -> 1323 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_unselected_running.pngbin0 -> 2606 bytes
-rw-r--r--res/drawable-hdpi/ic_tab_unselected_sdcard.pngbin0 -> 1179 bytes
-rw-r--r--res/drawable-mdpi/ic_appwidget_settings_brightness_auto.pngbin0 -> 792 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_selected_all.pngbin0 -> 647 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_selected_download.pngbin0 -> 768 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_selected_running.pngbin0 -> 1302 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_selected_sdcard.pngbin0 -> 711 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_unselected_all.pngbin0 -> 780 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_unselected_download.pngbin0 -> 989 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_unselected_running.pngbin0 -> 1588 bytes
-rw-r--r--res/drawable-mdpi/ic_tab_unselected_sdcard.pngbin0 -> 897 bytes
-rw-r--r--res/drawable/ic_tab_all.xml21
-rw-r--r--res/drawable/ic_tab_download.xml21
-rw-r--r--res/drawable/ic_tab_running.xml21
-rw-r--r--res/drawable/ic_tab_sdcard.xml21
-rw-r--r--res/layout/installed_app_details.xml52
-rw-r--r--res/values/strings.xml10
-rw-r--r--res/xml/dock_settings.xml9
-rw-r--r--res/xml/tether_prefs.xml5
26 files changed, 111 insertions, 49 deletions
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
new file mode 100644
index 0000000..14c3e04
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_all.png b/res/drawable-hdpi/ic_tab_selected_all.png
new file mode 100644
index 0000000..d5a7878
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_download.png b/res/drawable-hdpi/ic_tab_selected_download.png
new file mode 100644
index 0000000..d316c10
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_running.png b/res/drawable-hdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..56849f8
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_sdcard.png b/res/drawable-hdpi/ic_tab_selected_sdcard.png
new file mode 100644
index 0000000..f4bd7d1
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_all.png b/res/drawable-hdpi/ic_tab_unselected_all.png
new file mode 100644
index 0000000..2ef5115
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_download.png b/res/drawable-hdpi/ic_tab_unselected_download.png
new file mode 100644
index 0000000..bd74ee9
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_running.png b/res/drawable-hdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..f27cb93
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_sdcard.png b/res/drawable-hdpi/ic_tab_unselected_sdcard.png
new file mode 100644
index 0000000..b73b939
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
new file mode 100644
index 0000000..6e2237a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_all.png b/res/drawable-mdpi/ic_tab_selected_all.png
new file mode 100644
index 0000000..bdcfc16
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_download.png b/res/drawable-mdpi/ic_tab_selected_download.png
new file mode 100644
index 0000000..e9d02c8
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_running.png b/res/drawable-mdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..5f07d4b
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_sdcard.png b/res/drawable-mdpi/ic_tab_selected_sdcard.png
new file mode 100644
index 0000000..f90c7ea
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_all.png b/res/drawable-mdpi/ic_tab_unselected_all.png
new file mode 100644
index 0000000..dfd81cc
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_download.png b/res/drawable-mdpi/ic_tab_unselected_download.png
new file mode 100644
index 0000000..b7e56d4
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_running.png b/res/drawable-mdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..6a72513
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_sdcard.png b/res/drawable-mdpi/ic_tab_unselected_sdcard.png
new file mode 100644
index 0000000..59af3a2
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable/ic_tab_all.xml b/res/drawable/ic_tab_all.xml
new file mode 100644
index 0000000..9e5756b
--- /dev/null
+++ b/res/drawable/ic_tab_all.xml
@@ -0,0 +1,21 @@
+<?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_selected="true" android:state_pressed="false" android:drawable="@drawable/ic_tab_selected_all" />
+ <item android:drawable="@drawable/ic_tab_unselected_all" />
+</selector>
+
diff --git a/res/drawable/ic_tab_download.xml b/res/drawable/ic_tab_download.xml
new file mode 100644
index 0000000..d126f5b
--- /dev/null
+++ b/res/drawable/ic_tab_download.xml
@@ -0,0 +1,21 @@
+<?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_selected="true" android:state_pressed="false" android:drawable="@drawable/ic_tab_selected_download" />
+ <item android:drawable="@drawable/ic_tab_unselected_download" />
+</selector>
+
diff --git a/res/drawable/ic_tab_running.xml b/res/drawable/ic_tab_running.xml
new file mode 100644
index 0000000..1044acc
--- /dev/null
+++ b/res/drawable/ic_tab_running.xml
@@ -0,0 +1,21 @@
+<?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_selected="true" android:state_pressed="false" android:drawable="@drawable/ic_tab_selected_running" />
+ <item android:drawable="@drawable/ic_tab_unselected_running" />
+</selector>
+
diff --git a/res/drawable/ic_tab_sdcard.xml b/res/drawable/ic_tab_sdcard.xml
new file mode 100644
index 0000000..2088f93
--- /dev/null
+++ b/res/drawable/ic_tab_sdcard.xml
@@ -0,0 +1,21 @@
+<?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_selected="true" android:state_pressed="false" android:drawable="@drawable/ic_tab_selected_sdcard" />
+ <item android:drawable="@drawable/ic_tab_unselected_sdcard" />
+</selector>
+
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 423e3c1..3243672 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -29,53 +29,27 @@
android:paddingBottom="5dip"
android:orientation="vertical">
- <!-- App snippet -->
- <RelativeLayout
+ <!-- App snippet with buttons -->
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical">
+ android:layout_gravity="center_vertical"
+ android:orientation="vertical"
+ android:paddingRight="6dip"
+ android:paddingLeft="6dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip" >
- <LinearLayout
- android:orientation="vertical"
- android:layout_alignParentLeft="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="6dip"
- android:paddingBottom="6dip"
- android:paddingRight="6dip"
- android:paddingLeft="6dip" >
- <!-- application name -->
- <TextView android:id="@+id/app_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textStyle="bold"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:layout_marginBottom="2dip" />
- <!-- application version -->
- <TextView android:id="@+id/app_version"
- android:layout_marginTop="-4dip"
- android:layout_gravity="center_vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall" />
- </LinearLayout>
+ <!-- Application snippet label, version and icon -->
+ <include
+ layout="@layout/manage_applications_item"
+ android:id="@+id/app_snippet"/>
- <!-- application icon -->
- <ImageView android:id="@+id/app_icon"
- android:layout_width="@android:dimen/app_icon_size"
- android:layout_height="@android:dimen/app_icon_size"
- android:layout_alignParentRight="true"
- android:paddingTop="6dip"
- android:paddingBottom="6dip"
- android:paddingRight="6dip"
- android:scaleType="fitCenter" />
- </RelativeLayout>
<!-- Force stop and uninstall buttons -->
<include
layout="@layout/two_buttons_panel"
android:id="@+id/control_buttons_panel"/>
+ </LinearLayout>
<TextView
style="?android:attr/listSeparatorTextViewStyle"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49231d1..2c42797 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1033,6 +1033,12 @@
<string name="dock_not_found_title">Dock not found</string>
<!-- Dock not found dialog text -->
<string name="dock_not_found_text">The phone must be docked to configure dock audio</string>
+ <!-- Dock settings screen, dock events SFX setting check box label -->
+ <string name="dock_sounds_enable_title">Dock insertion sound</string>
+ <!-- Dock settings screen, setting option summary text when check box is selected -->
+ <string name="dock_sounds_enable_summary_on">Play sound when inserting or removing phone from dock</string>
+ <!-- Sound settings screen, setting option summary text when check box is clear -->
+ <string name="dock_sounds_enable_summary_off">Don\'t play sound when inserting or removing phone from dock</string>
<!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
<string name="sync_settings">Accounts &amp; sync</string>
@@ -1346,10 +1352,6 @@
<!-- Title of the screen for adjusting tethering settings -->
<string name="tether_screen_title">Tethering settings</string>
- <!-- Tethering notification toggle - controls whether a notification will appear when a tetherable connection becomes available -->
- <string name="enable_tether_notice_checkbox">Notifications</string>
- <!-- Tethering notification summary explains the notification toggle -->
- <string name="enable_tether_notice_checkbox_summary">Show a notification when USB tethering is available</string>
<!-- USB Tethering options -->
<string name="usb_tethering_button_text">USB tethering</string>
<!-- USB available subtext - shown when USB is connected but not currently being tethered -->
diff --git a/res/xml/dock_settings.xml b/res/xml/dock_settings.xml
index 43e9fa5..d3d6e43 100644
--- a/res/xml/dock_settings.xml
+++ b/res/xml/dock_settings.xml
@@ -26,4 +26,11 @@
android:summary="@string/dock_settings_summary"
android:widgetLayout="@*android:layout/preference_dialog" />
-</PreferenceScreen> \ No newline at end of file
+ <CheckBoxPreference
+ android:key="dock_sounds"
+ android:title="@string/dock_sounds_enable_title"
+ android:summaryOn="@string/dock_sounds_enable_summary_on"
+ android:summaryOff="@string/dock_sounds_enable_summary_off"
+ android:defaultValue="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 321129f..b903eaf 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -27,9 +27,4 @@
android:targetClass="com.android.internal.app.TetherActivity" />
</PreferenceScreen>
- <CheckBoxPreference
- android:key="enable_tether_notice"
- android:title="@string/enable_tether_notice_checkbox"
- android:summary="@string/enable_tether_notice_checkbox_summary"/>
-
</PreferenceScreen>