Side by Side Diff: res/layout/preferences.xml
Issue 9643003:
Improve manual proxy configuration (Closed)
Patch Set:
Created March 6, 2013, 2:13 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
res/layout/proxyconfiguration.xml » ('j')
|
res/values/strings.xml » ('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="fill_parent" | 3 android:layout_width="fill_parent" |
| 4 android:layout_height="fill_parent" | 4 android:layout_height="fill_parent" |
| 5 android:orientation="vertical" > | 5 android:orientation="vertical" > |
| 6 | 6 |
| 7 <LinearLayout | 7 <LinearLayout |
| 8 android:id="@+id/grp_configuration" | 8 android:id="@+id/grp_configuration" |
| 9 style="@style/MessageText" | 9 style="@style/MessageText" |
| 10 android:layout_width="fill_parent" | 10 android:layout_width="fill_parent" |
| 11 android:layout_height="wrap_content" | 11 android:layout_height="wrap_content" |
| 12 android:orientation="horizontal" | 12 android:orientation="horizontal" |
| 13 android:visibility="gone" > | 13 android:visibility="gone" > |
| 14 | 14 |
| 15 <TextView | 15 <TextView |
| 16 android:id="@+id/txt_configuration" | 16 android:id="@+id/txt_configuration" |
| 17 android:layout_width="fill_parent" | 17 android:layout_width="fill_parent" |
| 18 android:layout_height="wrap_content" | 18 android:layout_height="wrap_content" |
| 19 android:layout_weight="1" /> | 19 android:layout_weight="1" /> |
| 20 | 20 |
| 21 <Button | 21 <Button |
| 22 android:id="@+id/btn_configuration" | 22 android:id="@+id/btn_configuration" |
| 23 android:layout_width="wrap_content" | 23 android:layout_width="wrap_content" |
| 24 android:layout_height="wrap_content" | 24 android:layout_height="wrap_content" |
| 25 android:layout_gravity="center_vertical|right" | 25 android:layout_gravity="center_vertical|right" |
| 26 android:layout_weight="0" | 26 android:layout_weight="0" |
| 27 android:onClick="showProxySettings" | 27 android:onClick="showProxySettings" |
| 28 android:text="@string/showme" /> | 28 android:text="@string/configure" /> |
| 29 </LinearLayout> | 29 </LinearLayout> |
| 30 | 30 |
| 31 <ListView | 31 <ListView |
| 32 android:id="@android:id/list" | 32 android:id="@android:id/list" |
| 33 android:layout_width="fill_parent" | 33 android:layout_width="fill_parent" |
| 34 android:layout_height="fill_parent" | 34 android:layout_height="fill_parent" |
| 35 android:drawSelectorOnTop="false" | 35 android:drawSelectorOnTop="false" |
| 36 android:scrollbarAlwaysDrawVerticalTrack="true" /> | 36 android:scrollbarAlwaysDrawVerticalTrack="true" /> |
| 37 | 37 |
| 38 </LinearLayout> | 38 </LinearLayout> |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
res/layout/proxyconfiguration.xml » ('j')
|
res/values/strings.xml » ('J')
