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

Commit 5335c4c4 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Changed hardcoded 50px dimension to 50dp. Should be themed, however.

parent 29fe4970

core/java/com/tmobile/widget/CarouselTabContentLayout.java

+4 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import com.tmobile.widget.Carousel.CarouselViewAdapter; 
import android.content.Context;

import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.View;

import android.widget.FrameLayout;
@@ -44,7 +45,9 @@ public class CarouselTabContentLayout extends FrameLayout { 
		LayoutParams layoutParams = generateDefaultLayoutParams();

		

		// The height of filmstrip is 50, hence set the y padding to 50

		setPadding(0, 50, 0, 0);

		int height = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50,

				getResources().getDisplayMetrics());

		setPadding(0, height, 0, 0);

		super.addView(mCarouselLayout, -1, layoutParams);

	}

core/java/com/tmobile/widget/CarouselWidget.java

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.graphics.Typeface; 
import android.graphics.drawable.Drawable;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.Gravity;

import android.view.KeyEvent;

import android.view.View;
@@ -296,7 +297,11 @@ class CarouselWidget extends RelativeLayout { 
		

		setOnItemSelectedListener(new CarouselWidgetOnItemSelectedListener());

		

		RelativeLayout.LayoutParams rowLayoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 50);

		int height = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50,

				getResources().getDisplayMetrics());

		

		RelativeLayout.LayoutParams rowLayoutParams = 

			new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, height);

		rowLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);

		this.setGravity(Gravity.LEFT);

		this.setLayoutParams(rowLayoutParams);