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

Commit c735941a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Allow system apps to add to settings dashboard"

parents ae194b74 2ebc8a01

res/layout/user_preference.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ 
        android:id="@android:id/widget_frame"

        android:id="@android:id/widget_frame"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="@dimen/user_spinner_item_height"

        android:layout_height="@dimen/user_spinner_item_height"

        android:paddingStart="@dimen/user_spinner_padding_sides"

        android:paddingEnd="@dimen/user_spinner_padding_sides"

        android:orientation="horizontal" >

        android:orientation="horizontal" >





    <ImageView

    <ImageView

res/values/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ 
    <!-- User spinner -->

    <!-- User spinner -->

    <dimen name="user_spinner_height">72dp</dimen>

    <dimen name="user_spinner_height">72dp</dimen>

    <dimen name="user_spinner_padding">4dp</dimen>

    <dimen name="user_spinner_padding">4dp</dimen>

    <dimen name="user_spinner_padding_sides">20dp</dimen>

    <dimen name="user_spinner_item_height">56dp</dimen>

    <dimen name="user_spinner_item_height">56dp</dimen>





    <!-- CheckBoxPreference -->

    <!-- CheckBoxPreference -->

res/values/donottranslate.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -33,4 +33,8 @@ 
        <item>@string/input_method_selector_always_show_value</item>

        <item>@string/input_method_selector_always_show_value</item>

        <item>@string/input_method_selector_always_hide_value</item>

        <item>@string/input_method_selector_always_hide_value</item>

    </string-array>

    </string-array>

    <string name="category_key_wireless">com.android.settings.category.wireless</string>

    <string name="category_key_device">com.android.settings.category.device</string>

    <string name="category_key_personal">com.android.settings.category.personal</string>

    <string name="category_key_system">com.android.settings.category.system</string>

</resources>
 
</resources>

res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -6132,4 +6132,7 @@ 
   <!-- Warning toast shown when data usage screen can't find specified app -->

   <!-- Warning toast shown when data usage screen can't find specified app -->

   <string name="unknown_app">Unknown app</string>

   <string name="unknown_app">Unknown app</string>





   <!-- Title for profile selection dialog [CHAR LIMIT=30] -->

   <string name="choose_profile">Choose Profile</string>



</resources>
 
</resources>

res/xml/dashboard_categories.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
    <!-- WIRELESS and NETWORKS -->

    <!-- WIRELESS and NETWORKS -->

    <dashboard-category

    <dashboard-category

            android:id="@+id/wireless_section"

            android:id="@+id/wireless_section"

            android:key="@string/category_key_wireless"

            android:title="@string/header_category_wireless_networks" >

            android:title="@string/header_category_wireless_networks" >





        <!-- Wifi -->

        <!-- Wifi -->
@@ -74,6 +75,7 @@ 
    <!-- DEVICE -->

    <!-- DEVICE -->

    <dashboard-category

    <dashboard-category

            android:id="@+id/device_section"

            android:id="@+id/device_section"

            android:key="@string/category_key_device"

            android:title="@string/header_category_device" >

            android:title="@string/header_category_device" >





        <!-- Home -->

        <!-- Home -->
@@ -152,6 +154,7 @@ 
    <!-- PERSONAL -->

    <!-- PERSONAL -->

    <dashboard-category

    <dashboard-category

            android:id="@+id/personal_section"

            android:id="@+id/personal_section"

            android:key="@string/category_key_personal"

            android:title="@string/header_category_personal" >

            android:title="@string/header_category_personal" >





        <!-- Location -->

        <!-- Location -->
@@ -178,6 +181,9 @@ 
                android:icon="@drawable/ic_settings_accounts"

                android:icon="@drawable/ic_settings_accounts"

                />

                />





        <!-- Marker for where to place external tiles in this category -->

        <external-tiles />



        <!-- Language -->

        <!-- Language -->

        <dashboard-tile

        <dashboard-tile

                android:id="@+id/language_settings"

                android:id="@+id/language_settings"
@@ -199,6 +205,7 @@ 
    <!-- SYSTEM -->

    <!-- SYSTEM -->

    <dashboard-category

    <dashboard-category

        android:id="@+id/system_section"

        android:id="@+id/system_section"

        android:key="@string/category_key_system"

        android:title="@string/header_category_system" >

        android:title="@string/header_category_system" >





        <!-- Date & Time -->

        <!-- Date & Time -->