Skip to content
Permalink
Browse files

fod: Fix merge derp

  • Loading branch information...
AndroPlus-org committed May 19, 2019
1 parent 0f72a6e commit 2300e89dca1cf6d1fdedaec2ff36b3069cba9b09
@@ -64,9 +64,9 @@


private final WindowManager mWM; private final WindowManager mWM;


private final int mCircleX = 444; private final int mCircleX = 584;
private final int mCircleY = 1966; private final int mCircleY = 2592;
private final int mCircleSize = 190; private final int mCircleSize = 272;


private boolean mIsDreaming; private boolean mIsDreaming;
private boolean mIsPulsing; private boolean mIsPulsing;
@@ -85,7 +85,7 @@ public void onDreamingStateChanged(boolean dreaming) {
mIsDreaming = dreaming; mIsDreaming = dreaming;
mInsideCircle = false; mInsideCircle = false;
mChange = true; mChange = true;
setCustomIcon(); setImageResource(R.drawable.fod_icon_default);
} }


@Override @Override
@@ -94,7 +94,7 @@ public void onPulsing(boolean pulsing) {
mIsPulsing = pulsing; mIsPulsing = pulsing;
mInsideCircle = false; mInsideCircle = false;
mChange = true; mChange = true;
setCustomIcon(); setImageResource(R.drawable.fod_icon_default);
} }


@Override @Override
@@ -102,7 +102,7 @@
private static final int MSG_TOGGLE_PIE_ORIENTATION = 52 << MSG_SHIFT; private static final int MSG_TOGGLE_PIE_ORIENTATION = 52 << MSG_SHIFT;
private static final int MSG_SET_AUTOROTATE_STATUS = 53 << MSG_SHIFT; private static final int MSG_SET_AUTOROTATE_STATUS = 53 << MSG_SHIFT;
private static final int MSG_TOGGLE_SETTINGS_PANEL = 100 << MSG_SHIFT; private static final int MSG_TOGGLE_SETTINGS_PANEL = 100 << MSG_SHIFT;
private static final int MSG_IN_DISPLAY_FINGERPRINT = 48 << MSG_SHIFT; private static final int MSG_IN_DISPLAY_FINGERPRINT = 54 << MSG_SHIFT;


public static final int FLAG_EXCLUDE_NONE = 0; public static final int FLAG_EXCLUDE_NONE = 0;
public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0; public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;

0 comments on commit 2300e89

Please sign in to comment.
You can’t perform that action at this time.