Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc16237d authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev

parents ee7589c0 a9ca6572

AndroidManifest.xml

+0 −12
Original line number Diff line number Diff line
@@ -1227,18 +1227,6 @@ 
                android:value="com.android.settings.nfc.AndroidBeam" />

        </activity>



        <!-- Accessibility tutorial -->

        <activity android:name="AccessibilityTutorialActivity"

                android:label="@string/accessibility_tutorial_title"

                android:configChanges="orientation"

                android:immersive="true"

                android:theme="@style/Theme.AccessibilityTutorialActivity">

            <intent-filter>

                <action android:name="android.settings.ACCESSIBILITY_TUTORIAL" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

res/layout-sw600dp/accessibility_tutorial_container.xml

deleted100644 → 0
+0 −124
Original line number Diff line number Diff line 
<?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

res/layout/accessibility_tutorial_1.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?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

res/layout/accessibility_tutorial_2.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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

res/layout/accessibility_tutorial_app_icon.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?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