norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove unnecessary LinearLayout

Browse Source
This commit is contained in:
Christopher Eby 2012-02-25 21:20:52 -06:00
parent d30361fb8f
commit 411d0e99a8
2 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
res/layout/four_square_widget.xml
View File

@ -35,51 +35,43 @@ THE SOFTWARE.
android:layout_margin="5dip" android:layout_margin="5dip"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <TextView
android:id="@+id/text" android:id="@+id/title"
android:visibility="gone"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1" android:layout_weight="1"
android:layout_margin="5dip" android:gravity="center_horizontal|bottom"
android:orientation="vertical"> android:textColor="#fff"
<TextView android:textSize="18dip"
android:id="@+id/title" android:shadowColor="#f000"
android:visibility="gone" android:shadowDx="0"
android:layout_width="fill_parent" android:shadowDy="0"
android:layout_height="0px" android:shadowRadius="5"
android:layout_weight="1" android:textStyle="bold"
android:gravity="center_horizontal|bottom" android:ellipsize="marquee"
android:textColor="#fff" android:singleLine="true" />
android:textSize="18dip" <TextView
android:shadowColor="#f000" android:id="@+id/artist"
android:shadowDx="0" android:text="@string/app_name"
android:shadowDy="0" android:layout_width="fill_parent"
android:shadowRadius="5" android:layout_height="0px"
android:textStyle="bold" android:layout_weight="1"
android:ellipsize="marquee" android:gravity="center_horizontal|top"
android:singleLine="true" /> android:textColor="#fff"
<TextView android:shadowColor="#f000"
android:id="@+id/artist" android:shadowDx="0"
android:text="@string/app_name" android:shadowDy="0"
android:layout_width="fill_parent" android:shadowRadius="5"
android:layout_height="0px" android:textSize="15dip"
android:layout_weight="1" android:ellipsize="marquee"
android:gravity="center_horizontal|top" android:singleLine="true" />
android:textColor="#fff"
android:shadowColor="#f000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="5"
android:textSize="15dip"
android:ellipsize="marquee"
android:singleLine="true" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/buttons" android:id="@+id/buttons"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1"> android:layout_weight="2">
<ImageButton <ImageButton
android:id="@+id/play_pause" android:id="@+id/play_pause"
android:adjustViewBounds="true" android:adjustViewBounds="true"

5
src/org/kreed/vanilla/FourSquareWidget.java
View File

@ -98,7 +98,7 @@ public class FourSquareWidget extends AppWidgetProvider {
views.setViewVisibility(R.id.cover, View.GONE); views.setViewVisibility(R.id.cover, View.GONE);
} else if (song == null) { } else if (song == null) {
views.setViewVisibility(R.id.buttons, View.VISIBLE); views.setViewVisibility(R.id.buttons, View.VISIBLE);
views.setViewVisibility(R.id.title, View.GONE); views.setViewVisibility(R.id.title, View.INVISIBLE);
views.setInt(R.id.artist, "setText", R.string.app_name); views.setInt(R.id.artist, "setText", R.string.app_name);
views.setViewVisibility(R.id.cover, View.GONE); views.setViewVisibility(R.id.cover, View.GONE);
} else { } else {
@ -126,7 +126,8 @@ public class FourSquareWidget extends AppWidgetProvider {
intent = new Intent(context, LibraryActivity.class); intent = new Intent(context, LibraryActivity.class);
intent.setAction(Intent.ACTION_MAIN); intent.setAction(Intent.ACTION_MAIN);
pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
views.setOnClickPendingIntent(R.id.text, pendingIntent); views.setOnClickPendingIntent(R.id.title, pendingIntent);
views.setOnClickPendingIntent(R.id.artist, pendingIntent);
intent = new Intent(PlaybackService.ACTION_TOGGLE_PLAYBACK).setComponent(service); intent = new Intent(PlaybackService.ACTION_TOGGLE_PLAYBACK).setComponent(service);
pendingIntent = PendingIntent.getService(context, 0, intent, 0); pendingIntent = PendingIntent.getService(context, 0, intent, 0);