Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63641368 authored by Hugo Hudson's avatar Hugo Hudson Committed by Android (Google) Code Review
Browse files

Merge "Add the ActionBar trash and share icons."

parents 6ecb732e c2f09c3c
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -2,6 +2,13 @@
  public <init>(...);
}

# Xml files containing onClick (menus and layouts) require that proguard not
# remove their handlers.
-keepclassmembers class * extends android.app.Activity {
  public void *(android.view.View);
  public void *(android.view.MenuItem);
}

# TODO: Instead of keeping the following two functions we could as well just remove them completely
# as they are only used in test code

+1.52 KiB
Loading image diff...
+1.11 KiB
Loading image diff...
+2.28 KiB
Loading image diff...
+0 −12
Original line number Diff line number Diff line
@@ -40,18 +40,6 @@
                android:src="@drawable/ic_hold_pause_holo_dark"
                android:layout_weight="1"
            />
            <ImageButton
                android:id="@+id/playback_trash"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:padding="5px"
                android:layout_marginTop="4dip"
                android:layout_marginLeft="4dip"
                android:layout_marginRight="4dip"
                android:background="@drawable/dialpad_background"
                android:src="@drawable/ic_trash_holo_dark"
                android:layout_weight="1"
            />
        </LinearLayout>
        <SeekBar
            android:id="@+id/playback_seek"
Loading