diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp/accessibility_tutorial_container.xml | 124 | ||||
| -rw-r--r-- | res/layout/accessibility_tutorial_1.xml | 26 | ||||
| -rw-r--r-- | res/layout/accessibility_tutorial_2.xml | 21 | ||||
| -rw-r--r-- | res/layout/accessibility_tutorial_app_icon.xml | 20 | ||||
| -rw-r--r-- | res/layout/accessibility_tutorial_container.xml | 94 | ||||
| -rwxr-xr-x | res/values-sw600dp/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values-sw600dp/styles.xml | 19 | ||||
| -rw-r--r-- | res/values-sw600dp/themes.xml | 21 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 41 | ||||
| -rw-r--r-- | res/values/styles.xml | 34 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
12 files changed, 0 insertions, 405 deletions
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml deleted file mode 100644 index f5da706..0000000 --- a/res/layout-sw600dp/accessibility_tutorial_container.xml +++ /dev/null @@ -1,124 +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. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:orientation="vertical" - android:paddingTop="@dimen/screen_margin_top" - android:paddingLeft="@dimen/screen_margin_sides" - android:paddingRight="@dimen/screen_margin_sides" - android:paddingBottom="@dimen/screen_margin_bottom"> - - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="@dimen/title_height" - android:layout_marginLeft="@dimen/content_margin_left" - android:textAppearance="@style/AccessibilityTutorialTitle" - android:gravity="bottom" - android:clickable="false" /> - - <View - android:layout_marginTop="8dip" - android:layout_marginBottom="8dip" - android:layout_below="@id/title" - style="@style/AccessibilityTutorialDivider" /> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:orientation="vertical"> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - style="@style/AccessibilityTutorialDivider" /> - - <view - class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView" - android:id="@+id/instructions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/description_margin_top" - android:layout_marginLeft="@dimen/description_margin_sides" - android:layout_marginRight="@dimen/description_margin_sides" - android:layout_marginBottom="16dip" - android:lineSpacingExtra="5sp" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_marginBottom="16dip" - style="@style/AccessibilityTutorialDivider" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <Button - android:id="@+id/skip_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_skip" - android:visibility="gone" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="right"> - - <Button - android:id="@+id/back_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_back" - android:visibility="gone" /> - - <Button - android:id="@+id/next_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_next" - android:visibility="gone" /> - - <Button - android:id="@id/finish_button" - style="@style/AccessibilityTutorialButton" - android:text="@string/accessibility_tutorial_finish" - android:visibility="gone" /> - - </LinearLayout> - - </LinearLayout> - - </LinearLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_1.xml b/res/layout/accessibility_tutorial_1.xml deleted file mode 100644 index b2bb40d..0000000 --- a/res/layout/accessibility_tutorial_1.xml +++ /dev/null @@ -1,26 +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. ---> - -<GridView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/all_apps" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:columnWidth="96dip" - android:numColumns="auto_fit" - android:verticalSpacing="10dip" - android:horizontalSpacing="20dip" - android:stretchMode="columnWidth" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_2.xml b/res/layout/accessibility_tutorial_2.xml deleted file mode 100644 index 5f9c69d..0000000 --- a/res/layout/accessibility_tutorial_2.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. ---> - -<ListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/list_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_app_icon.xml b/res/layout/accessibility_tutorial_app_icon.xml deleted file mode 100644 index fe8399e..0000000 --- a/res/layout/accessibility_tutorial_app_icon.xml +++ /dev/null @@ -1,20 +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. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/app_icon" - style="@style/AccessibilityTutorialIcon" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml deleted file mode 100644 index 6566cff..0000000 --- a/res/layout/accessibility_tutorial_container.xml +++ /dev/null @@ -1,94 +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. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="fill_parent" - android:layout_width="fill_parent"> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_height="0dip" - android:layout_width="fill_parent" - android:layout_weight="1.0" - android:paddingLeft="15dip" - android:paddingRight="15dip"> - - </LinearLayout> - - <LinearLayout - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:paddingLeft="15dip" - android:paddingRight="15dip"> - - <View - android:layout_width="wrap_content" - android:layout_height="1dip" - android:layout_gravity="center" - android:background="@android:drawable/divider_horizontal_dark" - android:layout_marginBottom="8dip" - android:focusable="false" - android:clickable="false" /> - - <view - class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView" - android:id="@+id/instructions" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dip" - android:textAppearance="@style/AccessibilityTutorialBodyTextPrimary" /> - - </LinearLayout> - - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:background="@android:drawable/bottom_bar"> - - <Button - android:id="@+id/skip_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentLeft="true" - android:text="@string/accessibility_tutorial_skip" - android:visibility="gone" /> - - <Button - android:id="@+id/back_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentLeft="true" - android:text="@string/accessibility_tutorial_back" - android:visibility="gone" /> - - <Button - android:id="@+id/next_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentRight="true" - android:text="@string/accessibility_tutorial_next" - android:visibility="gone" /> - - <Button - android:id="@+id/finish_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentRight="true" - android:text="@string/accessibility_tutorial_finish" - android:visibility="gone" /> - - </RelativeLayout> -</LinearLayout>
\ No newline at end of file diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index aad21a0..e3c1bd2 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -21,7 +21,6 @@ <dimen name="app_icon_size">72dip</dimen> <dimen name="screen_margin_top">48dip</dimen> <dimen name="screen_margin_bottom">48dip</dimen> - <dimen name="title_height">48dip</dimen> <dimen name="content_margin_left">16dip</dimen> <dimen name="description_margin_top">26dip</dimen> <dimen name="crypt_clock_size">120sp</dimen> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 3403f3e..058afb9 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -57,23 +57,4 @@ <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> <item name="android:textSize">20sp</item> </style> - - <style name="AccessibilityTutorialTitle" parent="@android:style/TextAppearance.Large"> - <item name="android:textColor">@color/title_color</item> - </style> - - <style name="AccessibilityTutorialButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:minWidth">208dip</item> - <item name="android:layout_height">48dip</item> - <item name="android:paddingTop">0dip</item> - <item name="android:paddingLeft">0dip</item> - <item name="android:paddingRight">0dip</item> - <item name="android:paddingBottom">0dip</item> - <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> - <item name="android:textSize">20dip</item> - </style> - - <style name="AccessibilityTutorialBodyTextPrimary" parent="@android:style/TextAppearance.Medium"> - </style> </resources> diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml deleted file mode 100644 index 22cf17e..0000000 --- a/res/values-sw600dp/themes.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. ---> - -<resources> - - <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar"> - </style> -</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f0587c3..49474fa 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -23,7 +23,6 @@ <dimen name="screen_margin_sides">64dip</dimen> <dimen name="screen_margin_top">72dip</dimen> <dimen name="screen_margin_bottom">48dip</dimen> - <dimen name="title_height">48dip</dimen> <dimen name="content_margin_left">16dip</dimen> <dimen name="description_margin_top">26dip</dimen> <dimen name="description_margin_sides">40dip</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0a23581..3c46b48 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2890,8 +2890,6 @@ <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] --> <string name="accessibility_menu_item_settings">Settings</string> - <!-- Title for accessibility menu item to lauch a tutorial. [CHAR LIMIT=15] --> - <string name="accessibility_menu_item_tutorial">Tutorial</string> <!-- Summary for the enabled state of an accessiblity serivce. [CHAR LIMIT=10] --> <string name="accessibility_service_state_on">On</string> @@ -3921,45 +3919,6 @@ <!-- Alert dialog confirmation when removing a user CA certificate. --> <string name="trusted_credentials_remove_confirmation">Permanently remove the user CA certificate?</string> - <!-- Title for the touch exploration tutorial. [CHAR LIMIT=40] --> - <string name="accessibility_tutorial_title">Accessibility tutorial</string> - <!-- Button label to go to the next touch exploration tutorial lesson. [CHAR LIMIT=10] --> - <string name="accessibility_tutorial_next">Next</string> - <!-- Button label to go back to the previous touch explorationtutorial lesson. [CHAR LIMIT=10] --> - <string name="accessibility_tutorial_back">Back</string> - <!-- Button label to exit the touch explorationtutorial. [CHAR LIMIT=10] --> - <string name="accessibility_tutorial_finish">Finish</string> - <!-- Button label to skip the touch exploration tutorial. [CHAR LIMIT=10] --> - <string name="accessibility_tutorial_skip">Skip tutorial</string> - - <!-- Title for touch exploration tutorial lesson 1. --> - <string name="accessibility_tutorial_lesson_1_title">Lesson 1: Exploring the screen</string> - <!-- Instruction for touch exploration tutorial lesson 1. "Explore by touch" should match the string for "Title for accessibility preference to enable touch exploration mode." --> - <string name="accessibility_tutorial_lesson_1_text_1">When Explore by Touch is turned on, you can touch the screen to learn what\’s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around.</string> - <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches one icon. --> - <string name="accessibility_tutorial_lesson_1_text_2_more">Good. Keep sliding your finger around the screen until you find at least one more icon.</string> - <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches a second icon. --> - <string name="accessibility_tutorial_lesson_1_text_3">To activate something that you\’re touching, tap it. Slide your finger until you find the icon for the <xliff:g id="app_name" example="Browser">%s</xliff:g>. Then tap the icon once to activate it.</string> - <!-- Instruction for touch exploration tutorial lesson 1, displayed if the user touched the target area and stays inside it. --> - <string name="accessibility_tutorial_lesson_1_text_4">Your finger is touching the <xliff:g id="app_name" example="Browser">%s</xliff:g> icon. Tap once to activate the icon.</string> - <!-- Instruction for touch exploration tutorial lesson 1, displayed if the user touches inside the target area but moves outside. --> - <string name="accessibility_tutorial_lesson_1_text_4_exited">Your finger moved over the <xliff:g id="app_name" example="Browser">%s</xliff:g> icon, and then moved away. Slowly slide your finger around the screen until you find the Browser icon again.</string> - <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user has tapped the target icon. --> - <string name="accessibility_tutorial_lesson_1_text_5">Good. To move to the next lesson, find and activate the <xliff:g id="next" example="Next">%s</xliff:g> button, located near the bottom-right corner of the screen.</string> - - <!-- Title for touch exploration tutorial lesson 2. --> - <string name="accessibility_tutorial_lesson_2_title">Lesson 2: Scrolling using two fingers</string> - <!-- Instruction for touch exploration tutorial lesson 2. --> - <string name="accessibility_tutorial_lesson_2_text_1">To scroll through a list, you can slide two fingers along the screen. For example, the current screen contains a list of app names that can scroll up or down. First, try to identify a few items in the list by sliding one finger around.</string> - <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user touches one list item. --> - <string name="accessibility_tutorial_lesson_2_text_2_more">Good. Keep sliding your finger around to find at least one more item.</string> - <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user touches a second list item. --> - <string name="accessibility_tutorial_lesson_2_text_3">Now place two fingers on an item in the list and slide both fingers up. If you reach the top of the screen, lift your fingers, place them lower on the list, and continue sliding up.</string> - <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user scrolls a small amount. --> - <string name="accessibility_tutorial_lesson_2_text_3_more">Good. Keep sliding your fingers up to scroll some more.</string> - <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user has scrolled a large amount. --> - <string name="accessibility_tutorial_lesson_2_text_4">You have completed the tutorial. To exit, find and touch the <xliff:g id="finish" example="Finish">%s</xliff:g> button.</string> - <!-- Title for spell checker settings --> <string name="spellcheckers_settings_title">Spell checker</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2370683..9af6c9e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -182,40 +182,6 @@ <item name="android:widgetLayout">@layout/preference_inputmethod_widget</item> </style> - <style name="AccessibilityTutorialButton"> - <item name="android:layout_width">150dip</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_margin">5dip</item> - <item name="android:drawablePadding">3dip</item> - </style> - - <style name="AccessibilityTutorialDivider"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">2dip</item> - <item name="android:gravity">fill_horizontal</item> - <item name="android:background">@color/divider_color</item> - </style> - - <style name="AccessibilityTutorialTitle" parent="@android:style/TextAppearance.Large"> - <item name="android:textColor">@color/title_color</item> - </style> - - <style name="AccessibilityTutorialBodyTextPrimary" parent="@android:style/TextAppearance.Small"> - </style> - - <style name="AccessibilityTutorialIcon"> - <item name="android:layout_width">96dip</item> - <item name="android:layout_height">96dip</item> - <item name="android:layout_gravity">center</item> - <item name="android:gravity">center_horizontal</item> - <item name="android:singleLine">true</item> - <item name="android:ellipsize">marquee</item> - <item name="android:textSize">12dip</item> - <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:shadowRadius">2.0</item> - <item name="android:shadowColor">#B0000000</item> - </style> - <style name="TextAppearance.Switch" parent="@*android:style/TextAppearance.Holo.Widget.Switch"> <item name="android:textAllCaps">true</item> </style> diff --git a/res/values/themes.xml b/res/values/themes.xml index 2103de1..b5f8f64 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -19,7 +19,4 @@ <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert"> <item name="android:windowSoftInputMode">adjustResize</item> </style> - - <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo"> - </style> </resources> |