r4sas
/
lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
Browse Source

Complete Material Design for Settings

master
Anthony Restaino 10 years ago
parent
42de0b3ae7
commit
9853804fd8
17 changed files with 267 additions and 261 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      res/drawable/toolbar_elevate.xml
  2. 28
      res/layout/about_settings.xml
  3. 46
      res/layout/advanced_settings.xml
  4. 26
      res/layout/bookmark_settings.xml
  5. 52
      res/layout/display_settings.xml
  6. 50
      res/layout/general_settings.xml
  7. 41
      res/layout/license_activity.xml
  8. 76
      res/layout/privacy_settings.xml
  9. 129
      res/layout/settings.xml
  10. 2
      res/layout/toolbar.xml
  11. 4
      res/layout/toolbar_settings.xml
  12. 1
      res/values-v21/styles.xml
  13. 1
      res/values/attr.xml
  14. 1
      res/values/styles.xml
  15. 2
      src/acr/browser/lightning/BookmarkActivity.java
  16. 11
      src/acr/browser/lightning/LicenseActivity.java
  17. 39
      src/acr/browser/lightning/SettingsActivity.java

19
res/drawable/toolbar_elevate.xml
Unescape View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape
android:shape="rectangle" >
<solid android:color="@color/secondary_color_settings" />
</shape>
</item>
<item android:bottom="1dp">
<shape
android:shape="rectangle" >
<solid android:color="@color/primary_color" />
</shape>
</item>
</layer-list>

28
res/layout/about_settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/layoutSource" android:id="@+id/layoutSource"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -36,7 +36,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/action_follow_me" android:text="@string/action_follow_me"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -44,7 +44,7 @@
android:id="@+id/isImportAvailable" android:id="@+id/isImportAvailable"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/url_twitter" android:text="@string/url_twitter"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -54,15 +54,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutLicense" android:id="@+id/layoutLicense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -78,7 +78,7 @@
android:id="@+id/textView12" android:id="@+id/textView12"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/licenses" android:text="@string/licenses"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
@ -87,15 +87,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutVersion" android:id="@+id/layoutVersion"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -110,7 +110,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/version" android:text="@string/version"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -118,7 +118,7 @@
android:id="@+id/versionCode" android:id="@+id/versionCode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -128,8 +128,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

46
res/layout/advanced_settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/rAllowPopups" android:id="@+id/rAllowPopups"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -37,7 +37,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/window" android:text="@string/window"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -45,7 +45,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -63,15 +63,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rAllowCookies" android:id="@+id/rAllowCookies"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -88,7 +88,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/cookies" android:text="@string/cookies"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -96,7 +96,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -114,15 +114,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rAllowIncognitoCookies" android:id="@+id/rAllowIncognitoCookies"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -138,7 +138,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/incognito_cookies" android:text="@string/incognito_cookies"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -155,15 +155,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rRestoreTabs" android:id="@+id/rRestoreTabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -174,7 +174,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/restore" android:text="@string/restore"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -190,15 +190,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/layoutRendering" android:id="@+id/layoutRendering"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
@ -207,7 +207,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/rendering_mode" android:text="@string/rendering_mode"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -215,7 +215,7 @@
android:id="@+id/renderText" android:id="@+id/renderText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -224,8 +224,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

26
res/layout/bookmark_activity.xml → res/layout/bookmark_settings.xml
Unescape View File

@ -10,7 +10,7 @@
android:id="@+id/exportBackup" android:id="@+id/exportBackup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
@ -20,7 +20,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/export_bookmarks" android:text="@string/export_bookmarks"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
@ -28,15 +28,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/importBackup" android:id="@+id/importBackup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
@ -46,7 +46,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/import_backup" android:text="@string/import_backup"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
@ -54,22 +54,22 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/importFromBrowser" android:id="@+id/importFromBrowser"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/importbookmarks" android:text="@string/importbookmarks"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -77,7 +77,7 @@
android:id="@+id/isImportBrowserAvailable" android:id="@+id/isImportBrowserAvailable"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -86,8 +86,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>

52
res/layout/display_settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/rHideStatusBar" android:id="@+id/rHideStatusBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -31,7 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/fullScreenOption" android:text="@string/fullScreenOption"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -47,15 +47,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rFullScreen" android:id="@+id/rFullScreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -66,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/fullscreen" android:text="@string/fullscreen"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -82,15 +82,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rWideViewPort" android:id="@+id/rWideViewPort"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -107,7 +107,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/wideViewPort" android:text="@string/wideViewPort"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -115,7 +115,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -133,15 +133,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rOverView" android:id="@+id/rOverView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -158,7 +158,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/overViewMode" android:text="@string/overViewMode"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -166,7 +166,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -184,15 +184,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rTextReflow" android:id="@+id/rTextReflow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -203,7 +203,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/reflow" android:text="@string/reflow"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -219,15 +219,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rTextSize" android:id="@+id/rTextSize"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -237,7 +237,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/size" android:text="@string/size"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -245,8 +245,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

50
res/layout/general_settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/layoutUserAgent" android:id="@+id/layoutUserAgent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -36,7 +36,7 @@
android:id="@+id/textView4" android:id="@+id/textView4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/agent" android:text="@string/agent"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -44,7 +44,7 @@
android:id="@+id/agentText" android:id="@+id/agentText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -54,15 +54,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutDownload" android:id="@+id/layoutDownload"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -78,7 +78,7 @@
android:id="@+id/textView5" android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/download" android:text="@string/download"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -86,7 +86,7 @@
android:id="@+id/downloadText" android:id="@+id/downloadText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -96,15 +96,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutHomepage" android:id="@+id/layoutHomepage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -120,7 +120,7 @@
android:id="@+id/textView6" android:id="@+id/textView6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/home" android:text="@string/home"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -128,7 +128,7 @@
android:id="@+id/homepageText" android:id="@+id/homepageText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -138,15 +138,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutSearch" android:id="@+id/layoutSearch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -161,7 +161,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/search" android:text="@string/search"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -169,7 +169,7 @@
android:id="@+id/searchText" android:id="@+id/searchText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="Small Text" android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -179,15 +179,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rGoogleSuggestions" android:id="@+id/rGoogleSuggestions"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -203,7 +203,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/google_suggestions" android:text="@string/google_suggestions"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -211,7 +211,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/powered_by_google" android:text="@string/powered_by_google"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -229,8 +229,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

41
res/layout/license_activity.xml
Unescape View File

@ -3,14 +3,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<include layout="@layout/toolbar_settings" /> <include layout="@layout/toolbar_settings" />
<LinearLayout <LinearLayout
android:id="@+id/browserLicense" android:id="@+id/browserLicense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -19,7 +18,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -27,7 +26,7 @@
android:id="@+id/isImportAvailable1" android:id="@+id/isImportAvailable1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/mpl_license" android:text="@string/mpl_license"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -36,15 +35,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/licenseAOSP" android:id="@+id/licenseAOSP"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -53,7 +52,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/android_open_source_project" android:text="@string/android_open_source_project"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -61,7 +60,7 @@
android:id="@+id/isImportAvailable2" android:id="@+id/isImportAvailable2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/apache" android:text="@string/apache"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -70,15 +69,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/licenseHosts" android:id="@+id/licenseHosts"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -87,7 +86,7 @@
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/hphosts_ad_server_list" android:text="@string/hphosts_ad_server_list"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -95,7 +94,7 @@
android:id="@+id/isImportAvailable3" android:id="@+id/isImportAvailable3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/freeware" android:text="@string/freeware"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -104,15 +103,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<LinearLayout <LinearLayout
android:id="@+id/licenseOrbot" android:id="@+id/licenseOrbot"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -121,7 +120,7 @@
android:id="@+id/textView4" android:id="@+id/textView4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/library_netcipher" android:text="@string/library_netcipher"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -129,7 +128,7 @@
android:id="@+id/isImportAvailable4" android:id="@+id/isImportAvailable4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/license_gnu" android:text="@string/license_gnu"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -138,8 +137,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>

76
res/layout/privacy_settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/rLocation" android:id="@+id/rLocation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -32,7 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/location" android:text="@string/location"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -48,15 +48,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rSavePasswords" android:id="@+id/rSavePasswords"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -73,7 +73,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/password" android:text="@string/password"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -82,7 +82,7 @@
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/recommended" android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@ -100,15 +100,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearCacheExit" android:id="@+id/rClearCacheExit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -120,7 +120,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/cache" android:text="@string/cache"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -136,15 +136,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearHistoryExit" android:id="@+id/rClearHistoryExit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -155,7 +155,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/clear_history_exit" android:text="@string/clear_history_exit"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -171,15 +171,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearCookiesExit" android:id="@+id/rClearCookiesExit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -190,7 +190,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/clear_cookies_exit" android:text="@string/clear_cookies_exit"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -206,15 +206,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rBrowserHistory" android:id="@+id/rBrowserHistory"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -230,7 +230,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/sync_history" android:text="@string/sync_history"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -239,7 +239,7 @@
android:id="@+id/isBrowserAvailable" android:id="@+id/isBrowserAvailable"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="text" android:text="text"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -256,15 +256,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearCache" android:id="@+id/rClearCache"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -274,7 +274,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/clear_cache" android:text="@string/clear_cache"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -282,15 +282,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearHistory" android:id="@+id/rClearHistory"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -300,7 +300,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/history" android:text="@string/history"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -308,15 +308,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearCookies" android:id="@+id/rClearCookies"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -326,7 +326,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/clear_cookies" android:text="@string/clear_cookies"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -334,8 +334,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

129
res/layout/settings.xml
Unescape View File

@ -20,7 +20,7 @@
android:id="@+id/layoutFlash" android:id="@+id/layoutFlash"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -32,32 +32,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="60dp" android:paddingRight="60dp"
android:text="@string/flash" android:text="@string/flash"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/setR1" android:id="@+id/cbFlash"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" > android:layout_centerVertical="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutAdBlock" android:id="@+id/layoutAdBlock"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -68,32 +67,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="60dp" android:paddingRight="60dp"
android:text="@string/block_ads" android:text="@string/block_ads"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/setR2" android:id="@+id/cbAdblock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" > android:layout_centerVertical="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutImages" android:id="@+id/layoutImages"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -105,32 +103,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="60dp" android:paddingRight="60dp"
android:text="@string/block" android:text="@string/block"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/setR3" android:id="@+id/cbImageBlock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" > android:layout_centerVertical="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutEnableJS" android:id="@+id/layoutEnableJS"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -142,32 +139,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="60dp" android:paddingRight="60dp"
android:text="@string/java" android:text="@string/java"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/setR4" android:id="@+id/cbJavascript"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" > android:layout_centerVertical="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutUseOrbot" android:id="@+id/layoutUseOrbot"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -178,32 +174,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="60dp" android:paddingRight="60dp"
android:text="@string/enable_orbot" android:text="@string/enable_orbot"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/setR5" android:id="@+id/cbOrbot"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" > android:layout_centerVertical="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutGeneral" android:id="@+id/layoutGeneral"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -214,7 +209,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_general" android:text="@string/settings_general"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -222,15 +217,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutBookmarks" android:id="@+id/layoutBookmarks"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -240,7 +235,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/bookmark_settings" android:text="@string/bookmark_settings"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -248,15 +243,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutDisplay" android:id="@+id/layoutDisplay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -267,7 +262,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_display" android:text="@string/settings_display"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -275,15 +270,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutPrivacy" android:id="@+id/layoutPrivacy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -294,7 +289,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_privacy" android:text="@string/settings_privacy"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
@ -302,15 +297,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutAdvanced" android:id="@+id/layoutAdvanced"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -321,23 +316,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_advanced" android:text="@string/settings_advanced"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutAbout" android:id="@+id/layoutAbout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:background="?attr/listChoiceBackgroundIndicator"
android:minHeight="60dp" android:minHeight="60dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" > android:paddingTop="10dp" >
@ -353,7 +348,7 @@
android:id="@+id/textView11" android:id="@+id/textView11"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_about" android:text="@string/settings_about"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -361,7 +356,7 @@
android:id="@+id/isImportAvailable" android:id="@+id/isImportAvailable"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:text="@string/settings_about_explain" android:text="@string/settings_about_explain"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
@ -371,8 +366,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="10dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
res/layout/toolbar.xml
Unescape View File

@ -19,8 +19,8 @@
android:id="@+id/progress_view" android:id="@+id/progress_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:layout_height="2dp"
custom:bidirectionalAnimate="false"
custom:backgroundColor="?attr/progressBackgroundColor" custom:backgroundColor="?attr/progressBackgroundColor"
custom:bidirectionalAnimate="false"
custom:progressColor="?attr/colorAccent" /> custom:progressColor="?attr/colorAccent" />
</LinearLayout> </LinearLayout>

4
res/layout/toolbar_settings.xml
Unescape View File

@ -4,8 +4,8 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?colorPrimary" android:background="?toolbarSettingsBackground"
android:minHeight="?attr/actionBarSize"
android:elevation="2dp" android:elevation="2dp"
android:minHeight="?attr/actionBarSize"
custom:contentInsetEnd="0dp" custom:contentInsetEnd="0dp"
custom:contentInsetStart="0dp" /> custom:contentInsetStart="0dp" />

1
res/values-v21/styles.xml
Unescape View File

@ -4,6 +4,7 @@
<style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light"> <style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light">
<!-- customize the color palette --> <!-- customize the color palette -->
<item name="toolbarSettingsBackground">@color/primary_color</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">@drawable/list_bg</item>
<item name="colorPrimary">@color/primary_color</item> <item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color_settings</item> <item name="colorPrimaryDark">@color/secondary_color_settings</item>

1
res/values/attr.xml
Unescape View File

@ -9,6 +9,7 @@
<attr name="listBackground" format="reference|color" /> <attr name="listBackground" format="reference|color" />
<attr name="progressBackgroundColor" format="color" /> <attr name="progressBackgroundColor" format="color" />
<attr name="searchBackground" format="reference|color" /> <attr name="searchBackground" format="reference|color" />
<attr name="toolbarSettingsBackground" format="reference|color" />
<declare-styleable name="AnimatedProgressBar"> <declare-styleable name="AnimatedProgressBar">
<attr name="progressColor" format="color" /> <attr name="progressColor" format="color" />

1
res/values/styles.xml
Unescape View File

@ -4,6 +4,7 @@
<style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light"> <style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light">
<!-- customize the color palette --> <!-- customize the color palette -->
<item name="toolbarSettingsBackground">@drawable/toolbar_elevate</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">@drawable/list_bg</item>
<item name="colorPrimary">@color/primary_color</item> <item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color_settings</item> <item name="colorPrimaryDark">@color/secondary_color_settings</item>

2
src/acr/browser/lightning/BookmarkActivity.java
Unescape View File

@ -32,7 +32,7 @@ public class BookmarkActivity extends ActionBarActivity implements OnClickListen
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.bookmark_activity); setContentView(R.layout.bookmark_settings);
// set up ActionBar // set up ActionBar
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

11
src/acr/browser/lightning/LicenseActivity.java
Unescape View File

@ -3,10 +3,11 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -15,14 +16,16 @@ import android.view.View;
*under which this code is licensed. Unless you plan on providing other attribution in the app to *under which this code is licensed. Unless you plan on providing other attribution in the app to
*the original source in another visible way, it is advised against the removal of this Activity. *the original source in another visible way, it is advised against the removal of this Activity.
*/ */
public class LicenseActivity extends Activity implements View.OnClickListener { public class LicenseActivity extends ActionBarActivity implements View.OnClickListener {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.license_activity); setContentView(R.layout.license_activity);
getActionBar().setHomeButtonEnabled(true); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
getActionBar().setDisplayHomeAsUpEnabled(true); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
findViewById(R.id.browserLicense).setOnClickListener(this); findViewById(R.id.browserLicense).setOnClickListener(this);
findViewById(R.id.licenseAOSP).setOnClickListener(this); findViewById(R.id.licenseAOSP).setOnClickListener(this);
findViewById(R.id.licenseHosts).setOnClickListener(this); findViewById(R.id.licenseHosts).setOnClickListener(this);

39
src/acr/browser/lightning/SettingsActivity.java
Unescape View File

@ -26,7 +26,6 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Switch;
import info.guardianproject.onionkit.ui.OrbotHelper; import info.guardianproject.onionkit.ui.OrbotHelper;
public class SettingsActivity extends ActionBarActivity { public class SettingsActivity extends ActionBarActivity {
@ -94,24 +93,12 @@ public class SettingsActivity extends ActionBarActivity {
boolean imagesBool = mPreferences.getBoolean(PreferenceConstants.BLOCK_IMAGES, false); boolean imagesBool = mPreferences.getBoolean(PreferenceConstants.BLOCK_IMAGES, false);
boolean enableJSBool = mPreferences.getBoolean(PreferenceConstants.JAVASCRIPT, true); boolean enableJSBool = mPreferences.getBoolean(PreferenceConstants.JAVASCRIPT, true);
RelativeLayout r1, r2, r3, r4, r5; CheckBox flash = (CheckBox) findViewById(R.id.cbFlash);
r1 = (RelativeLayout) findViewById(R.id.setR1); CheckBox adblock = (CheckBox) findViewById(R.id.cbAdblock);
r2 = (RelativeLayout) findViewById(R.id.setR2); CheckBox images = (CheckBox) findViewById(R.id.cbImageBlock);
r3 = (RelativeLayout) findViewById(R.id.setR3); CheckBox enablejs = (CheckBox) findViewById(R.id.cbJavascript);
r4 = (RelativeLayout) findViewById(R.id.setR4); CheckBox orbot = (CheckBox) findViewById(R.id.cbOrbot);
r5 = (RelativeLayout) findViewById(R.id.setR5);
Switch flash = new Switch(this);
Switch adblock = new Switch(this);
Switch images = new Switch(this);
Switch enablejs = new Switch(this);
Switch orbot = new Switch(this);
r1.addView(flash);
r2.addView(adblock);
r3.addView(images);
r4.addView(enablejs);
r5.addView(orbot);
images.setChecked(imagesBool); images.setChecked(imagesBool);
enablejs.setChecked(enableJSBool); enablejs.setChecked(enableJSBool);
if (flashNum > 0) { if (flashNum > 0) {
@ -122,8 +109,8 @@ public class SettingsActivity extends ActionBarActivity {
adblock.setChecked(mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS, false)); adblock.setChecked(mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS, false));
orbot.setChecked(mPreferences.getBoolean(PreferenceConstants.USE_PROXY, false)); orbot.setChecked(mPreferences.getBoolean(PreferenceConstants.USE_PROXY, false));
initSwitch(flash, adblock, images, enablejs, orbot); initCheckBox(flash, adblock, images, enablejs, orbot);
clickListenerForSwitches(layoutFlash, layoutBlockAds, layoutImages, layoutEnableJS, clickListenerForCheckBoxes(layoutFlash, layoutBlockAds, layoutImages, layoutEnableJS,
layoutOrbot, flash, adblock, images, enablejs, orbot); layoutOrbot, flash, adblock, images, enablejs, orbot);
RelativeLayout general = (RelativeLayout) findViewById(R.id.layoutGeneral); RelativeLayout general = (RelativeLayout) findViewById(R.id.layoutGeneral);
@ -139,10 +126,10 @@ public class SettingsActivity extends ActionBarActivity {
about(about); about(about);
} }
public void clickListenerForSwitches(RelativeLayout layoutFlash, RelativeLayout layoutBlockAds, public void clickListenerForCheckBoxes(RelativeLayout layoutFlash, RelativeLayout layoutBlockAds,
RelativeLayout layoutImages, RelativeLayout layoutEnableJS, RelativeLayout layoutOrbot, RelativeLayout layoutImages, RelativeLayout layoutEnableJS, RelativeLayout layoutOrbot,
final Switch flash, final Switch adblock, final Switch images, final Switch enablejs, final CheckBox flash, final CheckBox adblock, final CheckBox images, final CheckBox enablejs,
final Switch orbot) { final CheckBox orbot) {
layoutFlash.setOnClickListener(new OnClickListener() { layoutFlash.setOnClickListener(new OnClickListener() {
@Override @Override
@ -195,8 +182,8 @@ public class SettingsActivity extends ActionBarActivity {
}); });
} }
public void initSwitch(Switch flash, Switch adblock, Switch images, Switch enablejs, public void initCheckBox(CheckBox flash, CheckBox adblock, CheckBox images, CheckBox enablejs,
Switch orbot) { CheckBox orbot) {
flash.setEnabled(API < 19); flash.setEnabled(API < 19);
flash.setOnCheckedChangeListener(new OnCheckedChangeListener() { flash.setOnCheckedChangeListener(new OnCheckedChangeListener() {

Write Preview
Loading…
Cancel
Save