AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-10 16:31:51 +05:30
parent c9a7aeed86
commit 05c199dddd
9 changed files with 748 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/custom.xml
+51 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent">
<ProgressBar
<!--<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
@@ -25,6 +25,54 @@
android:layout_height="wrap_content"
android:layout_below="@+id/progressBar1"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true" />
android:layout_centerHorizontal="true" />-->
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
android:text="Uploading Data"
android:textSize="@dimen/text_size_small" />
<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_title"
android:paddingLeft="5dp"
android:paddingRight="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/progressBar1"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:id="@+id/percentage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:paddingBottom="10dp"
android:paddingLeft="5dp" />
<TextView
android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:gravity="right"
android:paddingBottom="10dp"
android:paddingRight="5dp" />
</LinearLayout>
</RelativeLayout>