diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-23 23:11:26 +0100 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-23 23:11:26 +0100 |
| commit | 42f4ac2555b2ccf5eea88e69f019b45a5c18bc3e (patch) | |
| tree | b490bb3d9f1b8617cfc9726fbce59db942423084 | |
| parent | acbe8691ea81279897d9392b299ad6ad32a9b8f8 (diff) | |
| parent | 9c4196e7325f396ba5eea7a90d1f542ef3e29e12 (diff) | |
Merge pull request #5793 from koying/splashrebrand
[rebrand] droid: splash layout and color
| -rw-r--r-- | tools/android/packaging/xbmc/res/drawable/progresscolor.xml | 8 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/res/layout/activity_splash.xml | 36 |
2 files changed, 22 insertions, 22 deletions
diff --git a/tools/android/packaging/xbmc/res/drawable/progresscolor.xml b/tools/android/packaging/xbmc/res/drawable/progresscolor.xml index 0293d4818c..4bca6f2cd7 100644 --- a/tools/android/packaging/xbmc/res/drawable/progresscolor.xml +++ b/tools/android/packaging/xbmc/res/drawable/progresscolor.xml @@ -7,8 +7,8 @@ <gradient android:angle="270" - android:endColor="#0e0e0e" - android:startColor="#7d7e7d" + android:endColor="#0E5A91" + android:startColor="#31afe1" /> </shape> </item> @@ -19,8 +19,8 @@ <gradient android:angle="270" - android:endColor="#7d7e7d" - android:startColor="#ffffff" /> + android:endColor="#31afe1" + android:startColor="#E5F7FF" /> </shape> </clip> </item> diff --git a/tools/android/packaging/xbmc/res/layout/activity_splash.xml b/tools/android/packaging/xbmc/res/layout/activity_splash.xml index f5d3a7a5ab..04d417e2dd 100644 --- a/tools/android/packaging/xbmc/res/layout/activity_splash.xml +++ b/tools/android/packaging/xbmc/res/layout/activity_splash.xml @@ -1,22 +1,22 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" > + <ImageView + android:id="@+id/imageView1" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:adjustViewBounds="true" + android:layout_alignParentTop="true" + android:scaleType="center" + android:src="@drawable/splash" /> + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" > - - <ImageView - android:id="@+id/imageView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:adjustViewBounds="true" - android:scaleType="fitXY" - android:src="@drawable/splash" /> + android:layout_gravity="center_horizontal|bottom" > <ProgressBar android:id="@+id/progressBar1" @@ -25,11 +25,11 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_below="@+id/imageView1" + android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="20dp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginTop="10dp" android:progress="50" android:progressDrawable="@drawable/progresscolor" /> @@ -37,11 +37,11 @@ android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/imageView1" + android:layout_above="@+id/progressBar1" android:layout_centerHorizontal="true" android:text="" android:textColor="@android:color/white" android:textSize="16dp" /> </RelativeLayout> -</RelativeLayout> +</FrameLayout> |