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

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

Merge "Print settings polish" into klp-dev

parents 80c2b9b0 74648ac8

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1132,6 +1132,22 @@ 
                android:resource="@id/development_settings" />

        </activity>



        <activity android:name="Settings$PrintSettingsActivity"

                android:label="@string/print_settings"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

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

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

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.print.PrintSettingsFragment" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/print_settings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="DevelopmentSettings"

                  android:exported="true"

res/menu/print_service_settings.xml

+8 −5
Original line number Diff line number Diff line
@@ -15,6 +15,14 @@ 
-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/print_menu_item_search"

        android:title="@string/print_menu_item_search"

        android:icon="@*android:drawable/ic_menu_search_holo_dark"

        android:actionViewClass="android.widget.SearchView"

        android:showAsAction="ifRoom"

        android:imeOptions="actionSearch">

    </item>

    <item

        android:id="@+id/print_menu_item_add_printer"

        android:title="@string/print_menu_item_add_printer"
@@ -25,9 +33,4 @@ 
        android:title="@string/print_menu_item_settings"

        android:showAsAction="ifRoom">

    </item>

    <item

        android:id="@+id/print_menu_item_uninstall"

        android:title="@string/print_menu_item_uninstall"

        android:showAsAction="never">

    </item>

</menu>

res/menu/print_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/print_menu_item_download_print_service"

        android:title="@string/print_menu_item_download_print_service"

        android:id="@+id/print_menu_item_add_service"

        android:title="@string/print_menu_item_add_service"

        android:showAsAction="ifRoom">

    </item>

</menu>

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -3420,13 +3420,13 @@ 
    <string name="print_feature_state_off">Off</string>



    <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->

    <string name="print_menu_item_download_print_service">I don\'t see mine</string>

    <string name="print_menu_item_add_service">Add service</string>



    <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->

    <string name="print_menu_item_add_printer">Add printer</string>



    <!-- Title of the action bar button uninstall a print service. [CHAR LIMIT=25] -->

    <string name="print_menu_item_uninstall">Uninstall</string>

    <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->

    <string name="print_menu_item_search">Search</string>



    <!-- Title for the printer categoty showing a list of available printers. [CHAR LIMIT=25] -->

    <string name="category_printers">Printers</string>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -962,4 +962,5 @@ public class Settings extends PreferenceActivity 
    public static class UsbSettingsActivity extends Settings { /* empty */ }

    public static class TrustedCredentialsSettingsActivity extends Settings { /* empty */ }

    public static class PaymentSettingsActivity extends Settings { /* empty */ }

    public static class PrintSettingsActivity extends Settings { /* empty */ }

}