Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: Application/src/main/res/layout/main.xml

Issue 2963793002: Enable scrolling of main content in CCT client app. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Application/src/main/res/layout/main.xml
diff --git a/Application/src/main/res/layout/main.xml b/Application/src/main/res/layout/main.xml
index 93806f53314e07d42c95450f3e5010fd9e355ae6..83721daf4e982479afde4e03ffe793646e89bec9 100644
--- a/Application/src/main/res/layout/main.xml
+++ b/Application/src/main/res/layout/main.xml
@@ -13,88 +13,96 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:padding="5dp"
- android:orientation="vertical" >
-
- <EditText
- android:id="@+id/edit"
- android:padding="5dp"
- android:layout_margin="5dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/url_hint"
- android:inputType="textNoSuggestions"
- android:text="https://www.google.com" />
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+
<LinearLayout
+ android:layout_height="match_parent"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
+ android:padding="5dp"
+ android:orientation="vertical" >
+
+ <EditText
+ android:id="@+id/edit"
+ android:padding="5dp"
+ android:layout_margin="5dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/url_hint"
+ android:inputType="textNoSuggestions"
+ android:text="https://www.google.com" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
- android:text="Package:"/>
-
- <Spinner
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:text="Package:"/>
+
+ <Spinner
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/spinner"
+ android:layout_margin="3dp"
+ android:layout_gravity="center_horizontal" />
+ </LinearLayout>
+
+ <Space
android:layout_width="match_parent"
+ android:layout_height="5dp" />
+
+ <Button
+ android:id="@+id/connect_button"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/spinner"
android:layout_margin="3dp"
- android:layout_gravity="center_horizontal" />
+ android:textAllCaps="false"
+ android:text="@string/connect_button_text"
+ android:enabled="true" />
+
+ <Button
+ android:id="@+id/warmup_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:textAllCaps="false"
+ android:text="@string/warmup_button_text"
+ android:enabled="false" />
+
+ <Button
+ android:id="@+id/may_launch_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:textAllCaps="false"
+ android:text="@string/may_launch_button_text"
+ android:enabled="false" />
+
+ <Button
+ android:id="@+id/launch_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:textAllCaps="false"
+ android:text="@string/launch_button_text"
+ android:enabled="false" />
+
+ <Button
+ android:id="@+id/launch_browser_actions_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:textAllCaps="false"
+ android:text="@string/launch_browser_actions_button_text" />
+
</LinearLayout>
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="5dp" />
-
- <Button
- android:id="@+id/connect_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:textAllCaps="false"
- android:text="@string/connect_button_text"
- android:enabled="true" />
-
- <Button
- android:id="@+id/warmup_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:textAllCaps="false"
- android:text="@string/warmup_button_text"
- android:enabled="false" />
-
- <Button
- android:id="@+id/may_launch_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:textAllCaps="false"
- android:text="@string/may_launch_button_text"
- android:enabled="false" />
-
- <Button
- android:id="@+id/launch_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:textAllCaps="false"
- android:text="@string/launch_button_text"
- android:enabled="false" />
-
- <Button
- android:id="@+id/launch_browser_actions_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="3dp"
- android:textAllCaps="false"
- android:text="@string/launch_browser_actions_button_text" />
-
-</LinearLayout>
+
+</ScrollView>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698