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

Commit 77ec6de1 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev

parents 6c269982 7dee75c4
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,22 @@
                android:resource="@id/wireless_settings" />
        </activity>

        <activity android:name="Settings$DreamSettingsActivity"
                android:label="@string/screensaver_settings_title"
                android:taskAffinity=""
                android:excludeFromRecents="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.settings.DREAM_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.DreamSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
        </activity>

        <receiver android:name=".widget.SettingsAppWidgetProvider"
                android:label="@string/gadget_title"
                android:exported="true"
+1 −0
Original line number Diff line number Diff line
@@ -837,4 +837,5 @@ public class Settings extends PreferenceActivity
    public static class TextToSpeechSettingsActivity extends Settings { /* empty */ }
    public static class AndroidBeamSettingsActivity extends Settings { /* empty */ }
    public static class WifiDisplaySettingsActivity extends Settings { /* empty */ }
    public static class DreamSettingsActivity extends Settings { /* empty */ }
}