Merge branch 'master' into lp-design
This commit is contained in:
commit
0e90182702
@ -30,7 +30,7 @@ THE SOFTWARE.
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_gravity="top"
|
||||
android:background="#a000"
|
||||
android:background="@color/overlay_color"
|
||||
android:orientation="horizontal">
|
||||
<TextView
|
||||
android:id="@+id/elapsed"
|
||||
@ -61,7 +61,7 @@ THE SOFTWARE.
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_gravity="bottom|left"
|
||||
android:layout_margin="0dip"
|
||||
android:background="#a000"
|
||||
android:background="@color/overlay_color"
|
||||
android:orientation="horizontal">
|
||||
<include layout="@layout/controls" />
|
||||
</LinearLayout>
|
||||
|
@ -33,7 +33,7 @@ THE SOFTWARE.
|
||||
android:collapseColumns="0"
|
||||
android:stretchColumns="1"
|
||||
android:shrinkColumns="1"
|
||||
android:background="#a000"
|
||||
android:background="@color/overlay_color"
|
||||
android:paddingLeft="5dip"
|
||||
android:paddingRight="5dip">
|
||||
<TableRow>
|
||||
@ -134,7 +134,7 @@ THE SOFTWARE.
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_gravity="bottom|left"
|
||||
android:layout_margin="0dip"
|
||||
android:background="#a000"
|
||||
android:background="@color/overlay_color"
|
||||
android:orientation="horizontal">
|
||||
<include layout="@layout/controls" />
|
||||
</LinearLayout>
|
||||
|
@ -23,6 +23,7 @@ THE SOFTWARE.
|
||||
<resources>
|
||||
<!-- Color used in LibraryActivity list dividers -->
|
||||
<color name="divider_color">#f444</color>
|
||||
<color name="overlay_color">#a000</color>
|
||||
|
||||
<!-- styles -->
|
||||
<style name="Dialog" parent="android:Theme.Holo.Dialog" />
|
||||
|
@ -211,8 +211,6 @@ public final class CoverView extends View implements Handler.Callback {
|
||||
int x = 0;
|
||||
int scrollX = mScrollX;
|
||||
|
||||
canvas.drawColor(Color.BLACK);
|
||||
|
||||
for (Bitmap bitmap : mActiveBitmaps) {
|
||||
if (bitmap != null && scrollX + width > x && scrollX < x + width) {
|
||||
int xOffset = (width - bitmap.getWidth()) / 2;
|
||||
|
Loading…
x
Reference in New Issue
Block a user