TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 23:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #440 from veeti/styles

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-12-02 12:57:32 -08:00
commit 504ec976c0
9 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/change_passphrase_activity.xml
View File

@ -60,8 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="30dip"> android:layout_marginTop="30dip">
<Button style="@android:style/Widget.Button" <Button android:id="@+id/cancel_button"
android:id="@+id/cancel_button"
android:text="@android:string/cancel" android:text="@android:string/cancel"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
@ -69,8 +68,7 @@
android:layout_marginRight="7dip" android:layout_marginRight="7dip"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<Button style="@android:style/Widget.Button" <Button android:id="@+id/ok_button"
android:id="@+id/ok_button"
android:text="@android:string/ok" android:text="@android:string/ok"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"

3
res/layout/create_passphrase_activity.xml
View File

@ -50,8 +50,7 @@
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true"/> android:singleLine="true"/>
<Button style="@android:style/Widget.Button" <Button android:id="@+id/ok_button"
android:id="@+id/ok_button"
android:text="@string/create_passphrase_activity__continue" android:text="@string/create_passphrase_activity__continue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
res/layout/database_migration_activity.xml
View File

@ -43,8 +43,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dip"> android:layout_marginTop="20dip">
<Button style="@android:style/Widget.Button" <Button android:id="@+id/skip_button"
android:id="@+id/skip_button"
android:text="@string/database_migration_activity__skip" android:text="@string/database_migration_activity__skip"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
@ -52,8 +51,7 @@
android:layout_marginRight="7dip" android:layout_marginRight="7dip"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<Button style="@android:style/Widget.Button" <Button android:id="@+id/import_button"
android:id="@+id/import_button"
android:text="@string/database_migration_activity__import" android:text="@string/database_migration_activity__import"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
@ -112,7 +110,7 @@
<ProgressBar <ProgressBar
android:id="@+id/import_progress" android:id="@+id/import_progress"
style="@android:style/Widget.ProgressBar.Horizontal" style="@style/Widget.ProgressBar.Horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14.0dip" android:layout_marginBottom="14.0dip"

6
res/layout/prompt_apn_activity.xml
View File

@ -38,8 +38,7 @@
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:layout_marginBottom="20dip"> android:layout_marginBottom="20dip">
<Button style="@android:style/Widget.Button" <Button android:id="@+id/cancel_button"
android:id="@+id/cancel_button"
android:text="@android:string/cancel" android:text="@android:string/cancel"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
@ -47,8 +46,7 @@
android:layout_marginRight="7dip" android:layout_marginRight="7dip"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<Button style="@android:style/Widget.Button" <Button android:id="@+id/ok_button"
android:id="@+id/ok_button"
android:text="@android:string/ok" android:text="@android:string/ok"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"

3
res/layout/prompt_passphrase_activity.xml
View File

@ -45,8 +45,7 @@
android:layout_marginTop="20dip" android:layout_marginTop="20dip"
android:layout_marginRight="20dip"> android:layout_marginRight="20dip">
<Button style="@android:style/Widget.Button" <Button android:id="@+id/ok_button"
android:id="@+id/ok_button"
android:text="@string/prompt_passphrase_activity__unlock" android:text="@string/prompt_passphrase_activity__unlock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
res/layout/registration_activity.xml
View File

@ -69,8 +69,7 @@
</LinearLayout> </LinearLayout>
<Button style="@android:style/Widget.Button" <Button android:id="@+id/registerButton"
android:id="@+id/registerButton"
android:text="Register" android:text="Register"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout/registration_progress_activity.xml
View File

@ -536,7 +536,7 @@
<ProgressBar <ProgressBar
android:id="@+id/registration_progress" android:id="@+id/registration_progress"
style="@android:style/Widget.ProgressBar.Horizontal" style="@style/Widget.ProgressBar.Horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14.0dip" android:layout_marginBottom="14.0dip"

7
res/values-v11/styles.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
</style>
</resources>

3
res/values/styles.xml
View File

@ -85,4 +85,7 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
</style>
</resources> </resources>