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

Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-10 16:13:48 +05:30
parent a95bf5cddd
commit 5c3b06496f
9 changed files with 377 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginTop="10dp"
android:layout_weight="10"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:weightSum="25">
<TextView
@@ -115,9 +115,9 @@
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_weight="10"
android:background="@color/grey_background"
android:layout_marginLeft="30dp"
android:text="Delete" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
-10
View File
@@ -10,16 +10,6 @@
<include layout="@layout/contentadditionalvisibility" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save"
app:backgroundTint="@color/colorPrimary"
android:visibility="gone"
/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+10
View File
@@ -21,6 +21,8 @@
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -60,11 +62,13 @@
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5" />
</LinearLayout>
<LinearLayout
android:id="@+id/tv_brandlayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="30"
@@ -92,6 +96,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/tv_displaylayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="30"
@@ -120,6 +125,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/tv_cameralayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="15"
@@ -176,6 +182,7 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/tv_skulayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8"
@@ -210,7 +217,10 @@
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="10dp"