Skip to content

Commit

Permalink
HALO cleanup
Browse files Browse the repository at this point in the history
hdpi and mdpi drawables were inconsistent, if you plan to use HALO on
lower res devices you must reproduce them.

Change-Id: I2746837bacd60c3079ace4c7523a68b8cd415f5f
  • Loading branch information
drcmda committed Jun 11, 2013
1 parent d45e4c5 commit 4f4dd8d
Show file tree
Hide file tree
Showing 33 changed files with 254 additions and 279 deletions.
11 changes: 0 additions & 11 deletions core/java/com/android/internal/widget/ActionBarView.java
Expand Up @@ -903,19 +903,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
mIsCollapsed = false;

int widthMode = MeasureSpec.getMode(widthMeasureSpec);
if (widthMode != MeasureSpec.EXACTLY) {
//throw new IllegalStateException(getClass().getSimpleName() + " can only be used " +
// "with android:layout_width=\"match_parent\" (or fill_parent)");
}

int heightMode = MeasureSpec.getMode(heightMeasureSpec);
if (heightMode != MeasureSpec.AT_MOST) {
//throw new IllegalStateException(getClass().getSimpleName() + " can only be used " +
// "with android:layout_height=\"wrap_content\"");
}

int contentWidth = MeasureSpec.getSize(widthMeasureSpec);

int maxHeight = mContentHeight >= 0 ?
mContentHeight : MeasureSpec.getSize(heightMeasureSpec);

Expand Down
Binary file removed core/res/res/drawable-nodpi/floating_frame.9.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_bg.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_bigred.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_black_x.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_dismiss.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_pulse1.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-hdpi/halo_x.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_bg.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_bigred.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_black_x.png
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_dismiss.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_pulse1.png
Diff not rendered.
Binary file removed packages/SystemUI/res/drawable-mdpi/halo_x.png
Diff not rendered.
Binary file removed packages/SystemUI/res/drawable-nodpi/bubble_l.9.png
Diff not rendered.
Binary file removed packages/SystemUI/res/drawable-nodpi/bubble_r.9.png
Diff not rendered.
Binary file removed packages/SystemUI/res/drawable-xhdpi/halo_x.png
Diff not rendered.
520 changes: 253 additions & 267 deletions packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java

Large diffs are not rendered by default.

Expand Up @@ -302,7 +302,7 @@ public void run() {

private void scheduleAdvance() {
mHandler.postDelayed(mAdvanceTicker, TICKER_SEGMENT_DELAY);
}
}

public abstract void tickerStarting();
public abstract void tickerDone();
Expand Down

0 comments on commit 4f4dd8d

Please sign in to comment.