ADHOC/replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Fix definition of live display tile, as its now dynamic.

Browse Source 
Change-Id: I468e42b91996aad348fa0a1c85e0bc66597cf440
This commit is contained in:
Adnan Begovic 2016-04-18 12:27:15 -07:00
parent 380d31c00c
commit 18aa2f52eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java
View File

@ -283,7 +283,7 @@ public class LiveDisplayService extends SystemService {
.setOnClickIntent(getCustomTileNextModePendingIntent()) .setOnClickIntent(getCustomTileNextModePendingIntent())
.shouldCollapsePanel(false) .shouldCollapsePanel(false)
.build(); .build();
statusBarManager.publishTileAsUser(QSConstants.TILE_LIVE_DISPLAY, statusBarManager.publishTileAsUser(QSConstants.DYNAMIC_TILE_LIVE_DISPLAY,
LiveDisplayService.class.hashCode(), tile, user); LiveDisplayService.class.hashCode(), tile, user);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
@ -296,7 +296,7 @@ public class LiveDisplayService extends SystemService {
long token = Binder.clearCallingIdentity(); long token = Binder.clearCallingIdentity();
try { try {
CMStatusBarManager statusBarManager = CMStatusBarManager.getInstance(mContext); CMStatusBarManager statusBarManager = CMStatusBarManager.getInstance(mContext);
statusBarManager.removeTileAsUser(QSConstants.TILE_LIVE_DISPLAY, statusBarManager.removeTileAsUser(QSConstants.DYNAMIC_TILE_LIVE_DISPLAY,
LiveDisplayService.class.hashCode(), new UserHandle(userId)); LiveDisplayService.class.hashCode(), new UserHandle(userId));
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);

4
sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
View File

@ -46,7 +46,6 @@ public class QSConstants {
public static final String TILE_VISUALIZER = "visualizer"; public static final String TILE_VISUALIZER = "visualizer";
public static final String TILE_VOLUME = "volume_panel"; public static final String TILE_VOLUME = "volume_panel";
public static final String TILE_SCREEN_TIMEOUT = "screen_timeout"; public static final String TILE_SCREEN_TIMEOUT = "screen_timeout";
public static final String TILE_LIVE_DISPLAY = "live_display";
public static final String TILE_USB_TETHER = "usb_tether"; public static final String TILE_USB_TETHER = "usb_tether";
public static final String TILE_HEADS_UP = "heads_up"; public static final String TILE_HEADS_UP = "heads_up";
public static final String TILE_AMBIENT_DISPLAY = "ambient_display"; public static final String TILE_AMBIENT_DISPLAY = "ambient_display";
@ -60,6 +59,7 @@ public class QSConstants {
public static final String DYNAMIC_TILE_IME_SELECTOR = "ime_selector"; public static final String DYNAMIC_TILE_IME_SELECTOR = "ime_selector";
public static final String DYNAMIC_TILE_SU = "su"; public static final String DYNAMIC_TILE_SU = "su";
public static final String DYNAMIC_TILE_ADB = "adb"; public static final String DYNAMIC_TILE_ADB = "adb";
public static final String DYNAMIC_TILE_LIVE_DISPLAY = "live_display";
protected static final ArrayList<String> STATIC_TILES_AVAILABLE = new ArrayList<String>(); protected static final ArrayList<String> STATIC_TILES_AVAILABLE = new ArrayList<String>();
protected static final ArrayList<String> DYNAMIC_TILES_AVAILBLE = new ArrayList<String>(); protected static final ArrayList<String> DYNAMIC_TILES_AVAILBLE = new ArrayList<String>();
@ -93,7 +93,6 @@ public class QSConstants {
// STATIC_TILES_AVAILABLE.add(TILE_VISUALIZER); // STATIC_TILES_AVAILABLE.add(TILE_VISUALIZER);
STATIC_TILES_AVAILABLE.add(TILE_VOLUME); STATIC_TILES_AVAILABLE.add(TILE_VOLUME);
STATIC_TILES_AVAILABLE.add(TILE_SCREEN_TIMEOUT); STATIC_TILES_AVAILABLE.add(TILE_SCREEN_TIMEOUT);
STATIC_TILES_AVAILABLE.add(TILE_LIVE_DISPLAY);
STATIC_TILES_AVAILABLE.add(TILE_USB_TETHER); STATIC_TILES_AVAILABLE.add(TILE_USB_TETHER);
STATIC_TILES_AVAILABLE.add(TILE_HEADS_UP); STATIC_TILES_AVAILABLE.add(TILE_HEADS_UP);
STATIC_TILES_AVAILABLE.add(TILE_AMBIENT_DISPLAY); STATIC_TILES_AVAILABLE.add(TILE_AMBIENT_DISPLAY);
@ -107,5 +106,6 @@ public class QSConstants {
DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_IME_SELECTOR); DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_IME_SELECTOR);
DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_NEXT_ALARM); DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_NEXT_ALARM);
DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_SU); DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_SU);
DYNAMIC_TILES_AVAILBLE.add(DYNAMIC_TILE_LIVE_DISPLAY);
} }
} }