Ubuntu One Android Files

Merge lp:~cmiller/ubuntuone-android-files/authproxy-layout-scrollable into lp:ubuntuone-android-files

  1. authproxy-layout-scrollable
  2. Merge into trunk-2011
Proposed by Chad Miller
Status: Merged
Merged at revision: 297
Proposed branch: lp:~cmiller/ubuntuone-android-files/authproxy-layout-scrollable
Merge into: lp:ubuntuone-android-files
Diff against target: 159 lines (+78/-72)
1 file modified
res/layout/activity_authproxy.xml (+78/-72)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-files/authproxy-layout-scrollable
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+90506@code.launchpad.net

Commit message

Wrap authproxy layout in a scrollview so small screens can see it all.

Description of the change

$ bzr diff --diff-options=--ignore-space-change -r-2 res/layout/activity_authproxy.xml
=== modified file 'res/layout/activity_authproxy.xml'
--- res/layout/activity_authproxy.xml 2012-01-02 20:23:39 +0000
+++ res/layout/activity_authproxy.xml 2012-01-27 18:54:00 +0000
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fillViewport="true">
+
+ <LinearLayout
  android:orientation="vertical"
  android:layout_width="fill_parent"
  android:layout_height="fill_parent" >
@@ -74,4 +79,5 @@
    android:text="@string/authproxy.deny" />
  </LinearLayout>

-</LinearLayout>
+ </LinearLayout>
+</ScrollView>

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

I have no way to approve this since i can't test, but it looks good to me based on the extensive googling it. :)

Revision history for this message
Michał Karnicki (karni) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'res/layout/activity_authproxy.xml'
2--- res/layout/activity_authproxy.xml 2012-01-02 20:23:39 +0000
3+++ res/layout/activity_authproxy.xml 2012-01-27 19:00:34 +0000
4@@ -1,77 +1,83 @@
5 <?xml version="1.0" encoding="utf-8"?>
6-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
7- android:orientation="vertical"
8+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
9 android:layout_width="fill_parent"
10- android:layout_height="fill_parent" >
11-
12- <TextView
13- android:layout_width="fill_parent"
14- android:layout_height="wrap_content"
15- android:minHeight="20dip"
16- android:gravity="center"
17- android:background="@color/sso.orange"
18- android:textSize="@dimen/text_size_medium"
19- android:textStyle="bold"
20- android:textColor="@android:color/white"
21- android:text="@string/authproxy.authorize_access" />
22-
23- <TextView
24- android:layout_width="fill_parent"
25- android:layout_height="wrap_content"
26- android:layout_margin="10dip"
27- android:gravity="left"
28- android:textSize="@dimen/text_size_medium"
29- android:text="@string/authproxy.description" />
30-
31- <TextView
32- android:id="@+id/app_name"
33- android:layout_width="fill_parent"
34- android:layout_height="wrap_content"
35- android:layout_margin="10dip"
36- android:minHeight="40dip"
37- android:gravity="left|center_vertical"
38- android:textSize="@dimen/text_size_medium"
39- android:textStyle="bold"
40- android:hint="@string/undefined" />
41-
42- <TextView
43- android:layout_width="fill_parent"
44- android:layout_height="wrap_content"
45- android:layout_margin="10dip"
46- android:gravity="left"
47- android:textSize="@dimen/text_size_small"
48- android:text="@string/authproxy.learn_more" />
49-
50- <TextView
51- android:layout_width="fill_parent"
52- android:layout_height="0dp"
53- android:layout_weight="1"
54- android:layout_margin="10dip"
55- android:gravity="left"
56- android:textSize="@dimen/text_size_small"
57- android:textStyle="bold"
58- android:text="@string/authproxy.question" />
59-
60+ android:layout_height="fill_parent"
61+ android:fillViewport="true">
62+
63 <LinearLayout
64- android:orientation="horizontal"
65+ android:orientation="vertical"
66 android:layout_width="fill_parent"
67- android:layout_height="wrap_content"
68- android:weightSum="5" >
69- <Button
70- android:id="@+id/accept_button"
71- android:layout_width="wrap_content"
72- android:layout_height="fill_parent"
73- android:layout_weight="2"
74- android:textColor="@color/sso.orange"
75- android:textStyle="bold"
76- android:text="@string/authproxy.allow" />
77- <Button
78- android:id="@+id/deny_button"
79- android:layout_width="wrap_content"
80- android:layout_height="fill_parent"
81- android:layout_weight="3"
82- android:textStyle="bold"
83- android:text="@string/authproxy.deny" />
84+ android:layout_height="fill_parent" >
85+
86+ <TextView
87+ android:layout_width="fill_parent"
88+ android:layout_height="wrap_content"
89+ android:minHeight="20dip"
90+ android:gravity="center"
91+ android:background="@color/sso.orange"
92+ android:textSize="@dimen/text_size_medium"
93+ android:textStyle="bold"
94+ android:textColor="@android:color/white"
95+ android:text="@string/authproxy.authorize_access" />
96+
97+ <TextView
98+ android:layout_width="fill_parent"
99+ android:layout_height="wrap_content"
100+ android:layout_margin="10dip"
101+ android:gravity="left"
102+ android:textSize="@dimen/text_size_medium"
103+ android:text="@string/authproxy.description" />
104+
105+ <TextView
106+ android:id="@+id/app_name"
107+ android:layout_width="fill_parent"
108+ android:layout_height="wrap_content"
109+ android:layout_margin="10dip"
110+ android:minHeight="40dip"
111+ android:gravity="left|center_vertical"
112+ android:textSize="@dimen/text_size_medium"
113+ android:textStyle="bold"
114+ android:hint="@string/undefined" />
115+
116+ <TextView
117+ android:layout_width="fill_parent"
118+ android:layout_height="wrap_content"
119+ android:layout_margin="10dip"
120+ android:gravity="left"
121+ android:textSize="@dimen/text_size_small"
122+ android:text="@string/authproxy.learn_more" />
123+
124+ <TextView
125+ android:layout_width="fill_parent"
126+ android:layout_height="0dp"
127+ android:layout_weight="1"
128+ android:layout_margin="10dip"
129+ android:gravity="left"
130+ android:textSize="@dimen/text_size_small"
131+ android:textStyle="bold"
132+ android:text="@string/authproxy.question" />
133+
134+ <LinearLayout
135+ android:orientation="horizontal"
136+ android:layout_width="fill_parent"
137+ android:layout_height="wrap_content"
138+ android:weightSum="5" >
139+ <Button
140+ android:id="@+id/accept_button"
141+ android:layout_width="wrap_content"
142+ android:layout_height="fill_parent"
143+ android:layout_weight="2"
144+ android:textColor="@color/sso.orange"
145+ android:textStyle="bold"
146+ android:text="@string/authproxy.allow" />
147+ <Button
148+ android:id="@+id/deny_button"
149+ android:layout_width="wrap_content"
150+ android:layout_height="fill_parent"
151+ android:layout_weight="3"
152+ android:textStyle="bold"
153+ android:text="@string/authproxy.deny" />
154+ </LinearLayout>
155+
156 </LinearLayout>
157-
158-</LinearLayout>
159+</ScrollView>

Subscribers

People subscribed via source and target branches

to status/vote changes: