PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-11-30 10:58:03 -08:00
committed by Android (Google) Code Review
parent 6c269982f3 7dee75c424
commit 77ec6de156
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AndroidManifest.xml
View File

@@ -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
src/com/android/settings/Settings.java
View File

@@ -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 */ }
}