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

Merge pull request #168 from DF1E/dev 

material design for erveryone..
master
Anthony Restaino 10 years ago
parent
b4714a17c8 a292c6c776
commit
a201f88906
20 changed files with 1512 additions and 1590 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. 16
      AndroidManifest.xml
  2. 217
      res/layout/about_settings.xml
  3. 21
      res/layout/activity_main.xml
  4. 369
      res/layout/advanced_settings.xml
  5. 2
      res/layout/bookmark_activity.xml
  6. 413
      res/layout/display_settings.xml
  7. 391
      res/layout/general_settings.xml
  8. 55
      res/layout/license_activity.xml
  9. 569
      res/layout/privacy_settings.xml
  10. 637
      res/layout/settings.xml
  11. 30
      res/layout/toolbar.xml
  12. 70
      res/values-v21/styles.xml
  13. 197
      res/values/styles.xml
  14. 16
      src/acr/browser/lightning/AboutSettingsActivity.java
  15. 15
      src/acr/browser/lightning/AdvancedSettingsActivity.java
  16. 17
      src/acr/browser/lightning/BookmarkActivity.java
  17. 16
      src/acr/browser/lightning/DisplaySettingsActivity.java
  18. 16
      src/acr/browser/lightning/GeneralSettingsActivity.java
  19. 16
      src/acr/browser/lightning/PrivacySettingsActivity.java
  20. 19
      src/acr/browser/lightning/SettingsActivity.java

16
AndroidManifest.xml
Unescape View File

@ -105,7 +105,7 @@
android:name="acr.browser.lightning.SettingsActivity" android:name="acr.browser.lightning.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings" android:label="@string/settings"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SETTINGS" /> <action android:name="android.intent.action.SETTINGS" />
@ -116,7 +116,7 @@
android:name="acr.browser.lightning.GeneralSettingsActivity" android:name="acr.browser.lightning.GeneralSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_general" android:label="@string/settings_general"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.GENERAL_SETTINGS" /> <action android:name="android.intent.action.GENERAL_SETTINGS" />
@ -127,7 +127,7 @@
android:name="acr.browser.lightning.DisplaySettingsActivity" android:name="acr.browser.lightning.DisplaySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_display" android:label="@string/settings_display"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.DISPLAY_SETTINGS" /> <action android:name="android.intent.action.DISPLAY_SETTINGS" />
@ -138,7 +138,7 @@
android:name="acr.browser.lightning.PrivacySettingsActivity" android:name="acr.browser.lightning.PrivacySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_privacy" android:label="@string/settings_privacy"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PRIVACY_SETTINGS" /> <action android:name="android.intent.action.PRIVACY_SETTINGS" />
@ -149,7 +149,7 @@
android:name="acr.browser.lightning.AdvancedSettingsActivity" android:name="acr.browser.lightning.AdvancedSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_advanced" android:label="@string/settings_advanced"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.ADVANCED_SETTINGS" /> <action android:name="android.intent.action.ADVANCED_SETTINGS" />
@ -160,7 +160,7 @@
android:name="acr.browser.lightning.AboutSettingsActivity" android:name="acr.browser.lightning.AboutSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_about" android:label="@string/settings_about"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.ABOUT_SETTINGS" /> <action android:name="android.intent.action.ABOUT_SETTINGS" />
@ -185,7 +185,7 @@
android:name="acr.browser.lightning.LicenseActivity" android:name="acr.browser.lightning.LicenseActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/licenses" android:label="@string/licenses"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.LICENSE" /> <action android:name="android.intent.action.LICENSE" />
@ -196,7 +196,7 @@
android:name="acr.browser.lightning.BookmarkActivity" android:name="acr.browser.lightning.BookmarkActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/bookmark_settings" android:label="@string/bookmark_settings"
android:theme="@style/Theme.SettingsTheme" > android:theme="@style/Theme.LightTheme" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOKMARK" /> <action android:name="android.intent.action.BOOKMARK" />

217
res/layout/about_settings.xml
Unescape View File

@ -1,130 +1,137 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
<ScrollView
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:orientation="vertical" >
<RelativeLayout <LinearLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/layoutSource"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/action_follow_me"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:text="@string/url_twitter" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceSmall" android:orientation="vertical" >
android:textColor="@color/light" />
</LinearLayout> <TextView
</RelativeLayout> android:id="@+id/textView1"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="1dp" android:text="@string/action_follow_me"
android:layout_marginLeft="5dp" android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_marginRight="5dp"
android:background="#cdcdcd" /> <TextView
android:id="@+id/isImportAvailable"
<RelativeLayout android:layout_width="wrap_content"
android:id="@+id/layoutLicense" android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="wrap_content" android:text="@string/url_twitter"
android:background="?android:attr/listChoiceBackgroundIndicator" android:textAppearance="?android:attr/textAppearanceSmall"
android:minHeight="60dp" android:textColor="@color/light" />
android:paddingBottom="10dp" </LinearLayout>
android:paddingTop="10dp" > </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutLicense"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:text="@string/licenses" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="vertical" >
</LinearLayout>
</RelativeLayout> <TextView
android:id="@+id/textView12"
<LinearLayout android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="1dp" android:paddingLeft="10dp"
android:layout_marginLeft="5dp" android:text="@string/licenses"
android:layout_marginRight="5dp" android:textAppearance="?android:attr/textAppearanceMedium" />
android:background="#cdcdcd" /> </LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layoutVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentLeft="true"
android:text="@string/version" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/version"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/versionCode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
</RelativeLayout>
<TextView <LinearLayout
android:id="@+id/versionCode" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:paddingLeft="10dp" android:layout_marginRight="5dp"
android:text="Small Text" android:background="#cdcdcd" />
android:textAppearance="?android:attr/textAppearanceSmall" </LinearLayout>
android:textColor="@color/light" /> </ScrollView>
</LinearLayout>
</RelativeLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>

21
res/layout/activity_main.xml
Unescape View File

@ -1,6 +1,6 @@
<!-- Copyright 2014 ACR Development --> <!-- Copyright 2014 ACR Development -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:custom="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -19,7 +19,24 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<include layout="@layout/toolbar" /> <LinearLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:elevation="2dp"
android:orientation="vertical" >
<include layout="@layout/toolbar" />
<acr.browser.lightning.AnimatedProgressBar
android:id="@+id/progress_view"
android:layout_width="match_parent"
android:layout_height="2dp"
custom:backgroundColor="?progressBackgroundColor"
custom:bidirectionalAnimate="false"
custom:progressColor="?colorAccent" />
</LinearLayout>
<include layout="@layout/browser_content" /> <include layout="@layout/browser_content" />

369
res/layout/advanced_settings.xml
Unescape View File

@ -1,226 +1,233 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
<ScrollView
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:orientation="vertical" >
<RelativeLayout <LinearLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rAllowPopups"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:paddingRight="30dp" android:layout_centerVertical="true"
android:text="@string/window" android:orientation="vertical" >
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
<TextView android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/window"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbAllowPopups"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/recommended" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox <LinearLayout
android:id="@+id/cbAllowPopups" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rAllowCookies"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:orientation="vertical" >
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/cookies"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbAllowCookies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/rAllowCookies" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_marginRight="5dp"
android:minHeight="60dp" android:background="#cdcdcd" />
android:paddingBottom="10dp"
android:paddingRight="10dp" <RelativeLayout
android:paddingTop="10dp" > android:id="@+id/rAllowIncognitoCookies"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:orientation="vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/incognito_cookies"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<CheckBox
android:id="@+id/cbAllowIncognitoCookies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rRestoreTabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <TextView
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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/cookies" android:text="@string/restore"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <CheckBox
android:id="@+id/cbRestoreTabs"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/recommended" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbAllowCookies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rAllowIncognitoCookies"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:id="@+id/layoutRendering"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<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="10dp"
android:paddingRight="30dp" android:text="@string/rendering_mode"
android:text="@string/incognito_cookies"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<CheckBox
android:id="@+id/cbAllowIncognitoCookies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/renderText"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:paddingLeft="10dp"
android:background="#cdcdcd" /> android:text="Small Text"
android:textAppearance="?android:attr/textAppearanceSmall"
<RelativeLayout android:textColor="@color/light" />
android:id="@+id/rRestoreTabs" </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/restore"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbRestoreTabs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<LinearLayout
android:id="@+id/layoutRendering"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/rendering_mode"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <LinearLayout
android:id="@+id/renderText" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:paddingLeft="10dp" android:layout_marginRight="5dp"
android:text="Small Text" android:background="#cdcdcd" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout> </LinearLayout>
</ScrollView>
<LinearLayout </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>

2
res/layout/bookmark_activity.xml
Unescape View File

@ -3,6 +3,8 @@
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" />
<LinearLayout <LinearLayout
android:id="@+id/exportBackup" android:id="@+id/exportBackup"

413
res/layout/display_settings.xml
Unescape View File

@ -1,247 +1,254 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rHideStatusBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/fullScreenOption"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbHideStatusBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout <ScrollView
android:id="@+id/rFullScreen" android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/fullscreen"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbFullScreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rHideStatusBar"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <TextView
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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/wideViewPort" android:text="@string/fullScreenOption"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <CheckBox
android:id="@+id/cbHideStatusBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/recommended" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbWideViewPort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rOverView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rFullScreen"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <TextView
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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/overViewMode" android:text="@string/fullscreen"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <CheckBox
android:id="@+id/cbFullScreen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/recommended" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> <LinearLayout
</LinearLayout> android:layout_width="match_parent"
android:layout_height="1dp"
<CheckBox android:layout_marginLeft="5dp"
android:id="@+id/cbOverView" android:layout_marginRight="5dp"
android:layout_width="wrap_content" android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rWideViewPort"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/wideViewPort"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbWideViewPort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/rTextReflow" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_marginRight="5dp"
android:minHeight="60dp" android:background="#cdcdcd" />
android:paddingBottom="10dp"
android:paddingRight="10dp" <RelativeLayout
android:paddingTop="10dp" > android:id="@+id/rOverView"
android:layout_width="match_parent"
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:paddingLeft="10dp" android:minHeight="60dp"
android:paddingRight="30dp" android:paddingBottom="10dp"
android:text="@string/reflow" android:paddingRight="10dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:paddingTop="10dp" >
<CheckBox <LinearLayout
android:id="@+id/cbTextReflow" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:orientation="vertical" >
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/overViewMode"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbOverView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rTextReflow"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/textView3"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/reflow"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/rTextSize" android:id="@+id/cbTextReflow"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" />
android:paddingBottom="10dp" </RelativeLayout>
android:paddingTop="10dp" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rTextSize"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/size" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/size"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
</ScrollView> <LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>
</LinearLayout>

391
res/layout/general_settings.xml
Unescape View File

@ -1,231 +1,238 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
<ScrollView
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:orientation="vertical" >
<RelativeLayout <LinearLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/layoutUserAgent"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/agent"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:text="Small Text" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceSmall" android:orientation="vertical" >
android:textColor="@color/light" />
</LinearLayout> <TextView
</RelativeLayout> android:id="@+id/textView4"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="1dp" android:text="@string/agent"
android:layout_marginLeft="5dp" android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_marginRight="5dp"
android:background="#cdcdcd" /> <TextView
android:id="@+id/agentText"
<RelativeLayout android:layout_width="wrap_content"
android:id="@+id/layoutDownload" android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="wrap_content" android:text="Small Text"
android:background="?android:attr/listChoiceBackgroundIndicator" android:textAppearance="?android:attr/textAppearanceSmall"
android:minHeight="60dp" android:textColor="@color/light" />
android:paddingBottom="10dp" </LinearLayout>
android:paddingTop="10dp" > </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutDownload"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:text="@string/download" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="vertical" >
<TextView <TextView
android:id="@+id/downloadText" 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="10dp"
android:text="Small Text" android:text="@string/download"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceMedium" />
android:textColor="@color/light" />
</LinearLayout> <TextView
</RelativeLayout> android:id="@+id/downloadText"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="1dp" android:text="Small Text"
android:layout_marginLeft="5dp" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginRight="5dp" android:textColor="@color/light" />
android:background="#cdcdcd" /> </LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layoutHomepage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutHomepage"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
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:layout_alignParentLeft="true"
android:text="@string/home" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="vertical" >
<TextView <TextView
android:id="@+id/homepageText" 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="10dp"
android:text="Small Text" android:text="@string/home"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceMedium" />
android:textColor="@color/light" />
</LinearLayout> <TextView
</RelativeLayout> android:id="@+id/homepageText"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingLeft="10dp"
android:layout_height="1dp" android:text="Small Text"
android:layout_marginLeft="5dp" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginRight="5dp" android:textColor="@color/light" />
android:background="#cdcdcd" /> </LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layoutSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentLeft="true"
android:text="@string/search" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="vertical" >
<TextView <TextView
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="10dp" android:text="@string/search"
android:text="Small Text" android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> <TextView
</LinearLayout> android:id="@+id/searchText"
</RelativeLayout> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout android:paddingLeft="10dp"
android:layout_width="match_parent" android:text="Small Text"
android:layout_height="1dp" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginLeft="5dp" android:textColor="@color/light" />
android:layout_marginRight="5dp" </LinearLayout>
android:background="#cdcdcd" /> </RelativeLayout>
<RelativeLayout
android:id="@+id/rGoogleSuggestions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rGoogleSuggestions"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentLeft="true"
android:paddingRight="30dp" android:layout_centerVertical="true"
android:text="@string/google_suggestions" android:orientation="vertical" >
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/google_suggestions"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/powered_by_google"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbGoogleSuggestions"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/powered_by_google" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbGoogleSuggestions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout> <LinearLayout
android:layout_width="match_parent"
</ScrollView> android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>
</LinearLayout>

55
res/layout/license_activity.xml
Unescape View File

@ -3,6 +3,8 @@
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" />
<LinearLayout <LinearLayout
android:id="@+id/browserLicense" android:id="@+id/browserLicense"
@ -30,14 +32,14 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
</LinearLayout> </LinearLayout>
<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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
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"
@ -64,13 +66,14 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
</LinearLayout> </LinearLayout>
<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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
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"
@ -97,12 +100,14 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
</LinearLayout> </LinearLayout>
<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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
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"
@ -129,10 +134,12 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" /> android:textColor="@color/light" />
</LinearLayout> </LinearLayout>
<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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout>
</LinearLayout>

569
res/layout/privacy_settings.xml
Unescape View File

@ -1,336 +1,343 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<RelativeLayout <ScrollView
android:id="@+id/rLocation" android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/location"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rLocation"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <TextView
android:id="@+id/textView2" 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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/password" android:text="@string/location"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <CheckBox
android:id="@+id/textView3" android:id="@+id/cbLocation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:paddingRight="30dp" android:layout_centerVertical="true" />
android:text="@string/recommended" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbSavePasswords"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/rClearCacheExit" android:id="@+id/rSavePasswords"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/cache"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbClearCacheExit"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:orientation="vertical" >
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/password"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/recommended"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbSavePasswords"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/rClearHistoryExit" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_marginRight="5dp"
android:minHeight="60dp" android:background="#cdcdcd" />
android:paddingBottom="10dp"
android:paddingRight="10dp" <RelativeLayout
android:paddingTop="10dp" > android:id="@+id/rClearCacheExit"
android:layout_width="match_parent"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/clear_history_exit"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbClearHistoryExit"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/textView4"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_alignParentLeft="true"
android:background="#cdcdcd" /> android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/cache"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/rClearCookiesExit" android:id="@+id/cbClearCacheExit"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" />
android:paddingBottom="10dp" </RelativeLayout>
android:paddingRight="10dp"
android:paddingTop="10dp" > <LinearLayout
android:layout_width="match_parent"
<TextView android:layout_height="1dp"
android:layout_width="wrap_content" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_marginRight="5dp"
android:layout_alignParentLeft="true" android:background="#cdcdcd" />
android:layout_centerVertical="true"
android:paddingLeft="10dp" <RelativeLayout
android:paddingRight="30dp" android:id="@+id/rClearHistoryExit"
android:text="@string/clear_cookies_exit" android:layout_width="match_parent"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/cbClearCookiesExit"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" /> android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/clear_history_exit"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <CheckBox
android:id="@+id/rBrowserHistory" android:id="@+id/cbClearHistoryExit"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" />
android:paddingBottom="10dp" </RelativeLayout>
android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rClearCookiesExit"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:text="@string/sync_history" android:text="@string/clear_cookies_exit"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <CheckBox
android:id="@+id/isBrowserAvailable" android:id="@+id/cbClearCookiesExit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:layout_alignParentRight="true"
android:text="text" android:layout_centerVertical="true" />
android:textAppearance="?android:attr/textAppearanceSmall" </RelativeLayout>
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbBrowserHistory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rBrowserHistory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<RelativeLayout <LinearLayout
android:id="@+id/rClearCache" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_centerVertical="true"
android:minHeight="60dp" android:orientation="vertical" >
android:paddingBottom="10dp"
android:paddingTop="10dp" > <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="30dp"
android:text="@string/sync_history"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/isBrowserAvailable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="text"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
<CheckBox
android:id="@+id/cbBrowserHistory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rClearCache"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/clear_cache" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout <TextView
android:id="@+id/rClearHistory" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_centerVertical="true"
android:minHeight="60dp" android:paddingLeft="10dp"
android:paddingBottom="10dp" android:text="@string/clear_cache"
android:paddingTop="10dp" > android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rClearHistory"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/history" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:paddingLeft="10dp"
android:text="@string/history"
<RelativeLayout android:textAppearance="?android:attr/textAppearanceMedium" />
android:id="@+id/rClearCookies" </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/rClearCookies"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/clear_cookies" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/clear_cookies"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
</ScrollView> <LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>
</LinearLayout>

637
res/layout/settings.xml
Unescape View File

@ -1,375 +1,380 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout <include layout="@layout/toolbar" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/layoutFlash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/flash"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <ScrollView
android:id="@+id/setR1" android:id="@+id/scrollView1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:layout_alignParentRight="true"
android:layout_centerVertical="true" >
</RelativeLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
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:orientation="vertical" >
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/block_ads"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/setR2" android:id="@+id/layoutFlash"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" > android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
</RelativeLayout> android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/textView1"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_alignParentLeft="true"
android:background="#cdcdcd" /> android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/flash"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutImages" android:id="@+id/setR1"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" >
android:paddingBottom="10dp" </RelativeLayout>
android:paddingRight="10dp" </RelativeLayout>
android:paddingTop="10dp" >
<LinearLayout
<TextView android:layout_width="match_parent"
android:id="@+id/textView2" android:layout_height="1dp"
android:layout_width="wrap_content" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_marginRight="5dp"
android:layout_alignParentLeft="true" android:background="#cdcdcd" />
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/block"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/setR3" android:id="@+id/layoutAdBlock"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" > android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
</RelativeLayout> android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/block_ads"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutEnableJS" android:id="@+id/setR2"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" >
android:paddingBottom="10dp" </RelativeLayout>
android:paddingRight="10dp" </RelativeLayout>
android:paddingTop="10dp" >
<LinearLayout
<TextView android:layout_width="match_parent"
android:id="@+id/textView3" android:layout_height="1dp"
android:layout_width="wrap_content" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_marginRight="5dp"
android:layout_alignParentLeft="true" android:background="#cdcdcd" />
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/java"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/setR4" android:id="@+id/layoutImages"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" > android:minHeight="60dp"
</RelativeLayout> android:paddingBottom="10dp"
</RelativeLayout> android:paddingRight="10dp"
android:paddingTop="10dp" >
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/textView2"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_alignParentLeft="true"
android:background="#cdcdcd" /> android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/block"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutUseOrbot" android:id="@+id/setR3"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentRight="true"
android:minHeight="60dp" android:layout_centerVertical="true" >
android:paddingBottom="10dp" </RelativeLayout>
android:paddingRight="10dp" </RelativeLayout>
android:paddingTop="10dp" >
<LinearLayout
<TextView android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_alignParentLeft="true" android:layout_marginRight="5dp"
android:layout_centerVertical="true" android:background="#cdcdcd" />
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/enable_orbot"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
android:id="@+id/setR5" android:id="@+id/layoutEnableJS"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" > android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:paddingRight="60dp"
android:text="@string/java"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout
android:id="@+id/setR4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" >
</RelativeLayout>
</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="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutGeneral" android:id="@+id/layoutUseOrbot"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/settings_general" android:paddingRight="10dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:paddingTop="10dp" >
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout <TextView
android:id="@+id/layoutBookmarks" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_centerVertical="true"
android:minHeight="60dp" android:paddingLeft="10dp"
android:paddingBottom="10dp" android:paddingRight="60dp"
android:paddingTop="10dp" > android:text="@string/enable_orbot"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/setR5"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentLeft="true" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_alignParentRight="true"
android:paddingLeft="10dp" android:layout_centerVertical="true" >
android:text="@string/bookmark_settings" </RelativeLayout>
android:textAppearance="?android:attr/textAppearanceMedium" /> </RelativeLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="2dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
<RelativeLayout <RelativeLayout
android:id="@+id/layoutDisplay" android:id="@+id/layoutGeneral"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/settings_display" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/textView7"
android:layout_height="1dp" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_alignParentLeft="true"
android:background="#cdcdcd" /> android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/settings_general"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/layoutPrivacy" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_marginRight="5dp"
android:minHeight="60dp" android:background="#cdcdcd" />
android:paddingBottom="10dp"
android:paddingTop="10dp" > <RelativeLayout
android:id="@+id/layoutBookmarks"
<TextView android:layout_width="match_parent"
android:id="@+id/textView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:paddingLeft="10dp" android:paddingBottom="10dp"
android:text="@string/settings_privacy" android:paddingTop="10dp" >
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentLeft="true"
android:layout_marginRight="5dp" android:layout_centerVertical="true"
android:background="#cdcdcd" /> android:paddingLeft="10dp"
android:text="@string/bookmark_settings"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/layoutAdvanced" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_marginRight="5dp"
android:minHeight="60dp" android:background="#cdcdcd" />
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/settings_advanced"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:id="@+id/layoutDisplay"
android:layout_height="2dp" android:layout_width="match_parent"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:background="?android:attr/listChoiceBackgroundIndicator"
android:background="#cdcdcd" /> android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<RelativeLayout <TextView
android:id="@+id/layoutAbout" android:id="@+id/textView8"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator" android:layout_alignParentLeft="true"
android:minHeight="60dp" android:layout_centerVertical="true"
android:paddingBottom="10dp" android:paddingLeft="10dp"
android:paddingTop="10dp" > android:text="@string/settings_display"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutPrivacy"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:background="?android:attr/listChoiceBackgroundIndicator"
android:layout_centerVertical="true" android:minHeight="60dp"
android:orientation="vertical" > android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <TextView
android:id="@+id/textView11" android:id="@+id/textView9"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="@string/settings_about" android:text="@string/settings_privacy"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
<RelativeLayout
android:id="@+id/layoutAdvanced"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView <TextView
android:id="@+id/isImportAvailable" android:id="@+id/textView10"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="@string/settings_about_explain" android:text="@string/settings_advanced"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceMedium" />
android:textColor="@color/light" /> </RelativeLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="2dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="#cdcdcd" /> android:background="#cdcdcd" />
</LinearLayout> <RelativeLayout
android:id="@+id/layoutAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/listChoiceBackgroundIndicator"
android:minHeight="60dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
</ScrollView> <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:orientation="vertical" >
<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/settings_about"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/isImportAvailable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="@string/settings_about_explain"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/light" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="#cdcdcd" />
</LinearLayout>
</ScrollView>
</LinearLayout>

30
res/layout/toolbar.xml
Unescape View File

@ -1,26 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto" xmlns:custom="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_layout" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="?colorPrimary"
android:elevation="2dp" android:minHeight="?attr/actionBarSize"
android:orientation="vertical" > custom:contentInsetEnd="0dp"
custom:contentInsetStart="0dp" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
custom:contentInsetEnd="0dp"
custom:contentInsetStart="0dp" />
<acr.browser.lightning.AnimatedProgressBar
android:id="@+id/progress_view"
android:layout_width="match_parent"
android:layout_height="2dp"
custom:bidirectionalAnimate="false"
custom:backgroundColor="?attr/progressBackgroundColor"
custom:progressColor="?attr/colorAccent" />
</LinearLayout>

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

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.SettingsTheme" parent="android:Theme.Material.Light">
<!-- customize the color palette -->
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="android:colorPrimary">@color/primary_color</item>
<item name="android:colorPrimaryDark">@color/secondary_color_settings</item>
<item name="android:colorAccent">@color/accent_color</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="Theme.LightTheme" parent="Theme.AppCompat.Light">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="progressBackgroundColor">#00000000</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="android:actionBarStyle">@style/LightActionBar</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="Theme.DarkTheme" parent="Theme.AppCompat">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item>
<item name="android:windowNoTitle">true</item>
<item name="progressBackgroundColor">#00000000</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="android:actionBarStyle">@style/LightActionBar</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="overFlowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
<item name="android:minWidth">48dp</item>
<item name="android:padding">0dp</item>
</style>
</resources>

197
res/values/styles.xml
Unescape View File

@ -1,129 +1,70 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="DefaultTheme" parent="android:Theme.Holo.Light"> <style name="Theme.LightTheme" parent="Theme.AppCompat.Light">
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item> <!-- customize the color palette -->
<item name="numberColor">@color/gray_dark</item> <item name="searchBackground">@drawable/card_bg</item>
<item name="autoCompleteTitleColor">@color/black</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item> <item name="colorPrimary">@color/primary_color</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item> <item name="colorPrimaryDark">@color/secondary_color</item>
<!-- <item name="colorAccent">@color/accent_color</item>
Theme customizations available in newer API levels can go in <item name="android:windowNoTitle">true</item>
res/values-vXX/styles.xml, while customizations related to <item name="windowActionBar">false</item>
backward-compatibility can go here. <item name="progressBackgroundColor">#00000000</item>
--> <item name="android:windowContentOverlay">@null</item>
</style> <item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<!-- Application theme. --> <item name="numberColor">@color/gray_dark</item>
<style name="LightTheme" parent="android:Theme.Holo.Light"> <item name="autoCompleteTitleColor">@color/black</item>
<item name="android:windowContentOverlay">@null</item> <item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="progressColor">@color/gray_medium</item> <item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item> <item name="android:actionBarStyle">@style/LightActionBar</item>
<item name="numberColor">@color/gray_dark</item> <item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="autoCompleteTitleColor">@color/black</item> </style>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item> <style name="Theme.DarkTheme" parent="Theme.AppCompat">
<item name="android:actionBarStyle">@style/LightActionBar</item>
<!-- <!-- customize the color palette -->
Theme customizations available in newer API levels can go in <item name="searchBackground">@drawable/card_bg</item>
res/values-vXX/styles.xml, while customizations related to <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
backward-compatibility can go here. <item name="colorPrimary">@color/primary_color_dark</item>
--> <item name="colorPrimaryDark">@color/secondary_color</item>
</style> <item name="colorAccent">@color/accent_color</item>
<item name="android:windowNoTitle">true</item>
<style name="DarkTheme" parent="android:Theme.Holo.Light.DarkActionBar"> <item name="progressBackgroundColor">#00000000</item>
<item name="android:windowContentOverlay">@null</item> <item name="windowActionBar">false</item>
<item name="progressColor">@color/gray_extra_dark</item> <item name="android:windowContentOverlay">@null</item>
<item name="numberColor">@color/gray_light</item> <item name="progressColor">@color/gray_medium</item>
<item name="autoCompleteTitleColor">@color/white</item> <item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="autoCompleteUrlColor">@color/gray_light</item> <item name="numberColor">@color/gray_dark</item>
<item name="arrowBackDrawable">@drawable/ic_action_back_dark</item> <item name="autoCompleteTitleColor">@color/black</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward_dark</item> <item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="android:actionBarStyle">@style/DarkActionBar</item> <item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
</style> <item name="android:actionBarStyle">@style/LightActionBar</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<style name="DarkActionBar" parent="android:Widget.Holo.Light.ActionBar.Solid.Inverse"> </style>
<item name="android:background">@color/gray_dark</item>
</style> <style name="overFlowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
<item name="android:minWidth">48dp</item>
<style name="LightActionBar" parent="android:Widget.Holo.Light.ActionBar.Solid"> <item name="android:padding">0dp</item>
<item name="android:background">@color/gray_light</item> </style>
</style>
<style name="boldText">
<style name="boldText"> <item name="android:textStyle">bold</item>
<item name="android:textStyle">bold</item> </style>
</style>
<style name="normalText">
<style name="normalText"> <item name="android:textStyle">normal</item>
<item name="android:textStyle">normal</item> <item name="android:fontFamily">sans-serif-light</item>
<item name="android:fontFamily">sans-serif-light</item> </style>
</style>
<style name="DarkActionBar" parent="android:Widget.Holo.Light.ActionBar.Solid.Inverse">
<style name="Theme.SettingsTheme" parent="android:Theme.Holo.Light"> <item name="android:background">@color/gray_dark</item>
</style>
<!-- customize the color palette -->
<style name="LightActionBar" parent="android:Widget.Holo.Light.ActionBar.Solid">
<item name="listBackground">@drawable/list_bg</item> <item name="android:background">@color/gray_light</item>
<item name="colorPrimary">@color/primary_color</item> </style>
<item name="colorPrimaryDark">@color/secondary_color_settings</item>
<item name="colorAccent">@color/accent_color</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="Theme.LightTheme" parent="Theme.AppCompat.Light">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="progressBackgroundColor">@color/secondary_color</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="android:actionBarStyle">@style/LightActionBar</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="Theme.DarkTheme" parent="Theme.AppCompat">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="progressBackgroundColor">@color/secondary_color</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="arrowBackDrawable">@drawable/ic_action_back</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
</style>
<style name="overFlowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
<item name="android:minWidth">48dp</item>
<item name="android:padding">0dp</item>
</style>
</resources> </resources>

16
src/acr/browser/lightning/AboutSettingsActivity.java
Unescape View File

@ -3,8 +3,6 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.ActionBar;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -12,6 +10,8 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -19,7 +19,7 @@ import android.view.WindowManager;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
public class AboutSettingsActivity extends Activity { public class AboutSettingsActivity extends ActionBarActivity {
// mPreferences variables // mPreferences variables
private SharedPreferences mPreferences; private SharedPreferences mPreferences;
@ -31,11 +31,11 @@ public class AboutSettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.about_settings); setContentView(R.layout.about_settings);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {

15
src/acr/browser/lightning/AdvancedSettingsActivity.java
Unescape View File

@ -3,13 +3,14 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -21,7 +22,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
public class AdvancedSettingsActivity extends Activity { public class AdvancedSettingsActivity extends ActionBarActivity {
// mPreferences variables // mPreferences variables
private static final int API = android.os.Build.VERSION.SDK_INT; private static final int API = android.os.Build.VERSION.SDK_INT;
@ -37,11 +38,11 @@ public class AdvancedSettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.advanced_settings); setContentView(R.layout.advanced_settings);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {

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

@ -4,8 +4,6 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.Dialog; import android.app.Dialog;
@ -13,13 +11,15 @@ import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
public class BookmarkActivity extends Activity implements OnClickListener { public class BookmarkActivity extends ActionBarActivity implements OnClickListener {
private BookmarkManager mBookmarkManager; private BookmarkManager mBookmarkManager;
private boolean mSystemBrowser; private boolean mSystemBrowser;
@ -32,14 +32,13 @@ public class BookmarkActivity extends Activity implements OnClickListener {
@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_activity);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
LinearLayout exportBackup = (LinearLayout) findViewById(R.id.exportBackup); LinearLayout exportBackup = (LinearLayout) findViewById(R.id.exportBackup);
LinearLayout importBackup = (LinearLayout) findViewById(R.id.importBackup); LinearLayout importBackup = (LinearLayout) findViewById(R.id.importBackup);

16
src/acr/browser/lightning/DisplaySettingsActivity.java
Unescape View File

@ -3,13 +3,13 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -19,7 +19,7 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
public class DisplaySettingsActivity extends Activity { public class DisplaySettingsActivity extends ActionBarActivity {
// mPreferences variables // mPreferences variables
private static final int API = android.os.Build.VERSION.SDK_INT; private static final int API = android.os.Build.VERSION.SDK_INT;
@ -33,11 +33,11 @@ public class DisplaySettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.display_settings); setContentView(R.layout.display_settings);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {

16
src/acr/browser/lightning/GeneralSettingsActivity.java
Unescape View File

@ -3,15 +3,15 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.MenuItem; import android.view.MenuItem;
@ -26,7 +26,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
public class GeneralSettingsActivity extends Activity { public class GeneralSettingsActivity extends ActionBarActivity {
// mPreferences variables // mPreferences variables
private static final int API = android.os.Build.VERSION.SDK_INT; private static final int API = android.os.Build.VERSION.SDK_INT;
@ -47,11 +47,11 @@ public class GeneralSettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.general_settings); setContentView(R.layout.general_settings);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {

16
src/acr/browser/lightning/PrivacySettingsActivity.java
Unescape View File

@ -3,8 +3,6 @@
*/ */
package acr.browser.lightning; package acr.browser.lightning;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -13,6 +11,8 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.provider.Browser; import android.provider.Browser;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -24,7 +24,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
public class PrivacySettingsActivity extends Activity { public class PrivacySettingsActivity extends ActionBarActivity {
// mPreferences variables // mPreferences variables
private static final int API = android.os.Build.VERSION.SDK_INT; private static final int API = android.os.Build.VERSION.SDK_INT;
@ -40,11 +40,11 @@ public class PrivacySettingsActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.privacy_settings); setContentView(R.layout.privacy_settings);
ActionBar actionBar = getActionBar(); // set up ActionBar
if (actionBar != null) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
actionBar.setHomeButtonEnabled(true); setSupportActionBar(toolbar);
actionBar.setDisplayHomeAsUpEnabled(true);
} getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {

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

@ -4,7 +4,6 @@
package acr.browser.lightning; package acr.browser.lightning;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
@ -16,6 +15,8 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
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;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -28,7 +29,7 @@ import android.widget.RelativeLayout;
import android.widget.Switch; import android.widget.Switch;
import info.guardianproject.onionkit.ui.OrbotHelper; import info.guardianproject.onionkit.ui.OrbotHelper;
public class SettingsActivity extends Activity { public class SettingsActivity extends ActionBarActivity {
private static int API = android.os.Build.VERSION.SDK_INT; private static int API = android.os.Build.VERSION.SDK_INT;
private SharedPreferences.Editor mEditPrefs; private SharedPreferences.Editor mEditPrefs;
@ -44,7 +45,7 @@ public class SettingsActivity extends Activity {
mActivity = this; mActivity = this;
init(); init();
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
finish(); finish();
@ -53,13 +54,13 @@ public class SettingsActivity extends Activity {
@SuppressLint("NewApi") @SuppressLint("NewApi")
public void init() { public void init() {
// mPreferences storage // set up ActionBar
ActionBar actionBar = getActionBar(); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
if (actionBar != null) { setSupportActionBar(toolbar);
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
}
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
// mPreferences storage
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,

Write Preview
Loading…
Cancel
Save