Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev

Browse Source
This commit is contained in:
Justin Klaassen
2016-07-22 21:55:58 +00:00
committed by Android (Google) Code Review
parent b417eb176f 06c0cb7acd
commit c8c60f5930
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/provider/Settings.java
View File

@@ -439,6 +439,22 @@ public final class Settings {
public static final String ACTION_DISPLAY_SETTINGS =
"android.settings.DISPLAY_SETTINGS";
/**
* Activity Action: Show settings to allow configuration of Night display.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
* safeguard against this.
* <p>
* Input: Nothing.
* <p>
* Output: Nothing.
*
* @hide
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_NIGHT_DISPLAY_SETTINGS =
"android.settings.NIGHT_DISPLAY_SETTINGS";
/**
* Activity Action: Show settings to allow configuration of locale.
* <p>

2
packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
View File

@@ -74,7 +74,7 @@ public class NightDisplayTile extends QSTile<QSTile.BooleanState>
@Override
public Intent getLongClickIntent() {
return new Intent(Settings.ACTION_DISPLAY_SETTINGS);
return new Intent(Settings.ACTION_NIGHT_DISPLAY_SETTINGS);
}
@Override