Merge "Make DozeParams available to Plugins" into qt-r1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
1f55123ee7
@@ -16,12 +16,13 @@ package com.android.systemui.plugins;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.systemui.plugins.annotations.ProvidesInterface;
|
||||
import com.android.systemui.plugins.statusbar.DozeParameters;
|
||||
|
||||
@ProvidesInterface(action = OverlayPlugin.ACTION, version = OverlayPlugin.VERSION)
|
||||
public interface OverlayPlugin extends Plugin {
|
||||
|
||||
String ACTION = "com.android.systemui.action.PLUGIN_OVERLAY";
|
||||
int VERSION = 3;
|
||||
int VERSION = 4;
|
||||
|
||||
/**
|
||||
* Setup overlay plugin
|
||||
@@ -29,9 +30,10 @@ public interface OverlayPlugin extends Plugin {
|
||||
void setup(View statusBar, View navBar);
|
||||
|
||||
/**
|
||||
* Setup overlay plugin with callback
|
||||
* Setup overlay plugin with callback and DozeParameters
|
||||
*/
|
||||
default void setup(View statusBar, View navBar, Callback callback) {
|
||||
default void setup(View statusBar, View navBar, Callback callback,
|
||||
DozeParameters dozeParameters) {
|
||||
setup(statusBar, navBar);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.systemui.plugins.statusbar;
|
||||
|
||||
import com.android.systemui.plugins.annotations.ProvidesInterface;
|
||||
|
||||
/**
|
||||
* Retrieve doze information
|
||||
*/
|
||||
@ProvidesInterface(version = DozeParameters.VERSION)
|
||||
public interface DozeParameters {
|
||||
int VERSION = 1;
|
||||
|
||||
/**
|
||||
* Whether to doze when the screen turns off
|
||||
*/
|
||||
boolean shouldControlScreenOff();
|
||||
}
|
||||
@@ -37,6 +37,7 @@ import android.util.TimingsTraceLog;
|
||||
import com.android.systemui.plugins.OverlayPlugin;
|
||||
import com.android.systemui.plugins.PluginListener;
|
||||
import com.android.systemui.shared.plugins.PluginManager;
|
||||
import com.android.systemui.statusbar.phone.DozeParameters;
|
||||
import com.android.systemui.statusbar.phone.StatusBar;
|
||||
import com.android.systemui.statusbar.phone.StatusBarWindowController;
|
||||
import com.android.systemui.util.NotificationChannels;
|
||||
@@ -215,7 +216,8 @@ public class SystemUIApplication extends Application implements SysUiServiceProv
|
||||
StatusBar statusBar = getComponent(StatusBar.class);
|
||||
if (statusBar != null) {
|
||||
plugin.setup(statusBar.getStatusBarWindow(),
|
||||
statusBar.getNavigationBarView(), new Callback(plugin));
|
||||
statusBar.getNavigationBarView(), new Callback(plugin),
|
||||
DozeParameters.getInstance(getBaseContext()));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -35,7 +35,11 @@ import com.android.systemui.tuner.TunerService;
|
||||
|
||||
import java.io.PrintWriter;
|
||||
|
||||
public class DozeParameters implements TunerService.Tunable {
|
||||
/**
|
||||
* Retrieve doze information
|
||||
*/
|
||||
public class DozeParameters implements TunerService.Tunable,
|
||||
com.android.systemui.plugins.statusbar.DozeParameters {
|
||||
private static final int MAX_DURATION = 60 * 1000;
|
||||
public static final String DOZE_SENSORS_WAKE_UP_FULLY = "doze_sensors_wake_up_fully";
|
||||
public static final boolean FORCE_NO_BLANKING =
|
||||
|
||||
Reference in New Issue
Block a user