Side by Side Diff: mobile/android/base/resources/layout/abb_start_pane.xml
Issue 6296160390086656:
Issue 2491 - Fix design elements in onboarding slides (Closed)
Patch Set: Removed unsused import
Created May 21, 2015, 1:43 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/resources/drawable/abb_frp_button.xml ('k')
|
mobile/android/base/resources/layout/abb_start_pane_step_1.xml » ('j')
|
mobile/android/base/strings.xml.in » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 android:layout_width="match_parent" | 3 android:layout_width="match_parent" |
| 4 android:layout_height="match_parent" | 4 android:layout_height="match_parent" |
| 5 android:orientation="vertical" | 5 android:orientation="vertical" |
| 6 android:background="#c9d3dd" > | 6 android:background="#ffffff" |
| 7 <!-- Upper logo and title --> | 7 android:padding="10dp" > |
| 8 <LinearLayout android:layout_width="match_parent" | |
| 9 android:layout_height="wrap_content" | |
| 10 android:layout_marginTop="@dimen/abb_side_margin" | |
| 11 android:layout_marginLeft="@dimen/abb_side_margin" | |
| 12 android:layout_marginRight="@dimen/abb_side_margin" | |
| 13 android:padding="@dimen/abb_frp_padding" | |
| 14 android:orientation="vertical" | |
| 15 android:background="#ffffff" > | |
| 16 <ImageView android:layout_width="match_parent" | |
| 17 android:layout_height="wrap_content" | |
| 18 android:src="@drawable/icon" | |
| 19 android:scaleType="centerInside" /> | |
| 20 <TextView android:id="@+id/abb_app_title" | |
| 21 android:layout_width="match_parent" | |
| 22 android:layout_height="wrap_content" | |
| 23 android:gravity="center" | |
| 24 android:layout_marginTop="4dip" | |
| 25 android:textSize="20sp" /> | |
| 26 </LinearLayout> | |
| 27 <!-- Main content view, filled dynamically --> | 8 <!-- Main content view, filled dynamically --> |
| 28 <LinearLayout android:id="@+id/abb_main_content" | 9 <LinearLayout android:id="@+id/abb_main_content" |
| 29 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| 30 android:layout_height="0dip" | 11 android:layout_height="0dip" |
| 31 android:layout_weight="1" | 12 android:layout_weight="1" |
| 32 android:layout_margin="@dimen/abb_side_margin" | 13 android:paddingLeft="10dp" |
| 33 android:padding="@dimen/abb_frp_padding" | 14 android:paddingRight="10dp" |
| 15 android:layout_margin="0dp" | |
| 34 android:orientation="vertical" | 16 android:orientation="vertical" |
| 35 android:background="#ffffff" > | 17 android:background="#ffffff" > |
| 36 </LinearLayout> | 18 </LinearLayout> |
| 37 <!-- Confirmation button --> | 19 <!-- Confirmation button --> |
| 38 <RelativeLayout android:layout_width="match_parent" | 20 <Button android:id="@+id/abb_frp_button" |
| 39 android:layout_height="wrap_content" | 21 android:tag="ttf_opensans_semibold" |
| 40 android:layout_marginBottom="@dimen/abb_side_margin" | 22 android:layout_width="match_parent" |
| 41 android:layout_marginLeft="@dimen/abb_side_margin" | 23 android:layout_height="wrap_content" |
| 42 android:layout_marginRight="@dimen/abb_side_margin" | 24 android:gravity="center" |
| 43 android:background="#127ACA" > | 25 android:text="filler" |
| 44 <TextView android:layout_width="fill_parent" | 26 android:background="@drawable/abb_frp_button" |
|
Felix Dahlke
2015/05/22 11:50:57
"frp" is not a thing in the browser, is it? Should
René Jeschke
2015/05/22 12:04:44
You're right.
| |
| 45 android:layout_height="wrap_content" | 27 android:drawableRight="@drawable/abb_right_arrow" |
| 46 android:gravity="right" | 28 android:textColor="#f8f8f8" |
| 47 android:text="⇨ " | 29 android:textSize="24sp" |
| 48 android:background="@android:color/transparent" | 30 android:layout_centerInParent="true" /> |
| 49 android:textColor="#71afdf" | |
| 50 android:layout_centerInParent="true" | |
| 51 android:textSize="30sp" /> | |
| 52 <Button android:id="@+id/abb_frp_button" | |
| 53 android:layout_width="fill_parent" | |
| 54 android:layout_height="wrap_content" | |
| 55 android:layout_weight="1" | |
| 56 android:gravity="center" | |
| 57 android:text="filler" | |
| 58 android:background="@android:color/transparent" | |
| 59 android:textColor="#f8f8f8" | |
| 60 android:layout_centerInParent="true" /> | |
| 61 </RelativeLayout> | |
| 62 </LinearLayout> | 31 </LinearLayout> |
| 63 | 32 |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/drawable/abb_frp_button.xml ('k')
|
mobile/android/base/resources/layout/abb_start_pane_step_1.xml » ('j')
|
mobile/android/base/strings.xml.in » ('J')
