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

Commit e709e243 authored by Jim Miller's avatar Jim Miller Committed by The Android Open Source Project
Browse files

Automated import from //branches/cupcake/...@142825,142825

parent f2abab79

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,10 @@ 
    <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />

    <!-- About phone settings screen, setting option name to see terms and conditions -->

    <string name="terms_title">Terms and conditions</string>

    <!-- About phone settings screen, running the System Tutorial -->

    <string name="system_tutorial_list_item_title">System Tutorial</string>

    <!-- About phone settings screen, summary of what System Tutorial does -->

    <string name="system_tutorial_list_item_summary">Learn how to use your phone</string>



    <!-- Title for actual Settings license activity. --> <skip />

    <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->

res/xml/device_info_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ 
            <intent android:action="android.settings.TEAM" />

        </PreferenceScreen>

        

        <!-- System Tutorial - launches activity -->

        <PreferenceScreen android:key="system_tutorial"

                android:title="@string/system_tutorial_list_item_title" 

                android:summary="@string/system_tutorial_list_item_summary">

            <intent android:action="android.intent.action.SYSTEM_TUTORIAL" />

        </PreferenceScreen>

        

        <!-- Device hardware model -->

        <Preference android:key="device_model" 

                style="?android:preferenceInformationStyle"