diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
commit | 03973cf7f9b0f8635b6835c548b192eb53a2be35 (patch) | |
tree | 6af11a281ce9fd4c8e70863d10093d910751bf66 /app/src/main/res/layout/fragment_user_session.xml | |
parent | ff679b7f20700cec2c08cb8026c585b47df3612f (diff) | |
parent | 4560bda1f5c6e5974973f0f3f815e7d6fcf9afb2 (diff) |
Merge branch 'feature/simplify-user-session-layout-and-update-dependencies' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863
Diffstat (limited to 'app/src/main/res/layout/fragment_user_session.xml')
-rw-r--r-- | app/src/main/res/layout/fragment_user_session.xml | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml deleted file mode 100644 index 5194e495..00000000 --- a/app/src/main/res/layout/fragment_user_session.xml +++ /dev/null @@ -1,52 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginLeft="20dp" - android:layout_marginStart="20dp" - tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment"> - - <TextView - android:id="@+id/user.status.username" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="10dp" - android:layout_marginRight="20dp" - android:layout_marginEnd="20dp" - android:textSize="20sp" - android:text="@string/default_username" - android:textAppearance="?android:attr/textAppearanceMedium"/> - - <LinearLayout - android:id="@+id/user.status.buttonAndIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - - <Button - android:id="@+id/user.status.button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - /> - - <view - android:id="@+id/user.status.icon" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_marginLeft="9dp" - android:layout_marginStart="9dp" - android:background="@android:color/transparent" - android:color="@android:color/holo_blue_dark" - class="mbanje.kurt.fabbutton.FabButton" - android:layout_gravity="center" - android:visibility="visible" - android:indeterminate="true" - android:max="100" - fbb_autoStart="true" - fbb_progressColor="#ff170aff" - fbb_progressWidthRatio="0.1" - /> - - </LinearLayout> -</LinearLayout> |