mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
9df179cae9
Bug 718848 - Part 7: More link styling, pin display styling, alignment per UI feedback. Bug 718848 - Part 6: Fixed regression of progressbar layout. Bug 718848 - Part 5: Indentation alignment. Bug 718848 - Part 4: Fixes for links, icon blurriness, PIN display. Bug 718848 - Part 3: Whitespace changes. Bug 718848 - Part 2: Setting theme on start of Sync setup. Bug 718848 - Part 1: Theme and layout changes, per UI meeting. Bug 717075 - make classic setup hint text visible. Added basic SyncTheme. Bug 717691 - Part 1: fall back to supported cipher suites for older Android releases. Bug 717691 - Part 0: Specify HTTP 1.1 in HTTP requests. Bug 718848 - Part 2: fixed string revision: "computer" not "desktop". r=rnewman Bug 719669 - Part 1: throw IncorrectZkpException when g^x^q % p = 1 in J-PAKE. Bug 719669 - Part 0: code reformatting and string tidying. Bug 718149 - go somewhere useful after Firefox Sync set up, on launch.
87 lines
2.7 KiB
XML
87 lines
2.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
style="@style/SyncLayout" >
|
|
|
|
<LinearLayout
|
|
android:id="@+id/setup_top"
|
|
style="@style/SyncTop" >
|
|
<ImageView
|
|
style="@style/SyncTopIcon" />
|
|
<TextView
|
|
android:id="@+id/setup_title"
|
|
style="@style/SyncTextTitle"
|
|
android:text="@string/sync_title_connect" />
|
|
</LinearLayout>
|
|
|
|
<ScrollView
|
|
style="@style/SyncLayout"
|
|
android:fillViewport="true"
|
|
android:layout_below="@id/setup_top"
|
|
android:layout_above="@+id/setup_bottom" >
|
|
|
|
<RelativeLayout
|
|
style="@style/SyncLayout.Vertical"
|
|
android:layout_height="fill_parent"
|
|
android:padding="15dp" >
|
|
|
|
<TextView
|
|
android:id="@+id/setup_header"
|
|
style="@style/SyncTextItem"
|
|
android:gravity="left"
|
|
android:layout_marginTop="15dp"
|
|
android:text="@string/sync_subtitle_header"
|
|
android:textStyle="bold" />
|
|
<TextView
|
|
android:id="@+id/setup_subtitle"
|
|
style="@style/SyncTextItem"
|
|
android:layout_below="@id/setup_header"
|
|
android:gravity="left"
|
|
android:layout_marginTop="2dp"
|
|
android:text="@string/sync_subtitle_connect" />
|
|
|
|
<TextView
|
|
android:id="@+id/setup_showme"
|
|
style="@style/SyncLinkItem"
|
|
android:layout_below="@id/setup_subtitle"
|
|
android:layout_marginTop="2dp"
|
|
android:onClick="showClickHandler"
|
|
android:text="@string/sync_link_show" />
|
|
|
|
<LinearLayout
|
|
style="@style/SyncLayout"
|
|
android:layout_below="@id/setup_showme"
|
|
android:paddingTop="30dp"
|
|
android:paddingLeft="-15dp"
|
|
android:orientation="vertical" >
|
|
<TextView
|
|
android:id="@+id/text_pin1"
|
|
style="@style/SyncPinText" />
|
|
<TextView
|
|
android:id="@+id/text_pin2"
|
|
style="@style/SyncPinText" />
|
|
<TextView
|
|
android:id="@+id/text_pin3"
|
|
style="@style/SyncPinText" />
|
|
</LinearLayout>
|
|
|
|
<TextView
|
|
android:id="@+id/link_nodevice"
|
|
style="@style/SyncLinkItem"
|
|
android:layout_alignParentBottom="true"
|
|
android:gravity="center"
|
|
android:paddingBottom="5dp"
|
|
android:onClick="manualClickHandler"
|
|
android:text="@string/sync_link_advancedsetup" />
|
|
</RelativeLayout>
|
|
</ScrollView>
|
|
<LinearLayout
|
|
android:id="@id/setup_bottom"
|
|
style="@style/SyncBottom"
|
|
android:orientation="horizontal" >
|
|
<Button
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:onClick="cancelClickHandler"
|
|
android:text="@string/sync_button_cancel" />
|
|
</LinearLayout>
|
|
</RelativeLayout> |