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

Commit 20d8dc09 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Change print setting from a dynamic tile to static pref"

parents 4f6d667a 2edbaa70

AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -1984,11 +1984,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

            <intent-filter android:priority="2">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                android:value="com.android.settings.category.ia.device" />

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

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

        </activity>

PREUPLOAD.cfg

+0 −2
Original line number Diff line number Diff line 
[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw src/com/android/settings/print/

checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .

res/xml/connected_devices_advanced.xml

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ 
        settings:controller="com.android.settings.connecteddevice.BluetoothOnWhileDrivingPreferenceController"

        android:order="-2"/>



    <Preference

        android:key="connected_device_printing"

        android:title="@string/print_settings"

        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_settings_print"

        android:fragment="com.android.settings.print.PrintSettingsFragment"

        android:order="-1"/>



    <Preference

        android:key="bt_received_files"

        android:icon="@drawable/ic_folder_vd_theme_24"

res/xml/print_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="print_settings_screen"

    android:title="@string/print_settings_title"

    android:title="@string/print_settings"

    settings:keywords="@string/keywords_printing">



    <PreferenceCategory

src/com/android/settings/SettingsActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -802,11 +802,6 @@ public class SettingsActivity extends SettingsDrawerActivity 
                !UserManager.isDeviceInDemoMode(this), isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.PrintSettingsActivity.class.getName()),

                pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin)

                || somethingChanged;



        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)

                && !Utils.isMonkeyRunning();