android:descendantFocusability="beforeDescendants" >
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_margin="12dp"
android:tint="?attr/domainSettingsIconTintColor"
tools:ignore="contentDescription" />
- <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
- <android.support.design.widget.TextInputLayout
+ <!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+ <com.google.android.material.textfield.TextInputLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="6dp" >
<!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
- <android.support.design.widget.TextInputEditText
+ <com.google.android.material.textfield.TextInputEditText
android:id="@+id/domain_settings_name_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/domain_name"
android:inputType="textUri" />
- </android.support.design.widget.TextInputLayout>
+ </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<TextView
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_javascript_imageview"
+ android:id="@+id/javascript_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_javascript_switch"
+ android:id="@+id/javascript_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_first_party_cookies_imageview"
+ android:id="@+id/first_party_cookies_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_first_party_cookies_switch"
+ android:id="@+id/first_party_cookies_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
<!-- Third-Party Cookies. -->
<LinearLayout
- android:id="@+id/domain_settings_third_party_cookies_linearlayout"
+ android:id="@+id/third_party_cookies_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_third_party_cookies_imageview"
+ android:id="@+id/third_party_cookies_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_third_party_cookies_switch"
+ android:id="@+id/third_party_cookies_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_dom_storage_imageview"
+ android:id="@+id/dom_storage_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_dom_storage_switch"
+ android:id="@+id/dom_storage_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_form_data_imageview"
+ android:id="@+id/form_data_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_form_data_switch"
+ android:id="@+id/form_data_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_easylist_imageview"
+ android:id="@+id/easylist_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_easylist_switch"
+ android:id="@+id/easylist_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_easyprivacy_imageview"
+ android:id="@+id/easyprivacy_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_easyprivacy_switch"
+ android:id="@+id/easyprivacy_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_fanboys_annoyance_list_imageview"
+ android:id="@+id/fanboys_annoyance_list_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_fanboys_annoyance_list_switch"
+ android:id="@+id/fanboys_annoyance_list_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_fanboys_social_blocking_list_imageview"
+ android:id="@+id/fanboys_social_blocking_list_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_fanboys_social_blocking_list_switch"
+ android:id="@+id/fanboys_social_blocking_list_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_ultraprivacy_imageview"
+ android:id="@+id/ultraprivacy_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_ultraprivacy_switch"
+ android:id="@+id/ultraprivacy_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_block_all_third_party_requests_imageview"
+ android:id="@+id/block_all_third_party_requests_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_block_all_third_party_requests_switch"
+ android:id="@+id/block_all_third_party_requests_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
android:contentDescription="@string/user_agent" />
<Spinner
- android:id="@+id/domain_settings_user_agent_spinner"
+ android:id="@+id/user_agent_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_user_agent_textview"
+ android:id="@+id/user_agent_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:textSize="13sp" />
<EditText
- android:id="@+id/domain_settings_custom_user_agent_edittext"
+ android:id="@+id/custom_user_agent_edittext"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="40dp"
android:contentDescription="@string/font_size" />
<Spinner
- android:id="@+id/domain_settings_font_size_spinner"
+ android:id="@+id/font_size_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_font_size_textview"
+ android:id="@+id/font_size_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_swipe_to_refresh_imageview"
+ android:id="@+id/swipe_to_refresh_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
android:contentDescription="@string/swipe_to_refresh" />
<Spinner
- android:id="@+id/domain_settings_swipe_to_refresh_spinner"
+ android:id="@+id/swipe_to_refresh_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_swipe_to_refresh_textview"
+ android:id="@+id/swipe_to_refresh_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_night_mode_imageview"
+ android:id="@+id/night_mode_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
android:contentDescription="@string/night_mode" />
<Spinner
- android:id="@+id/domain_settings_night_mode_spinner"
+ android:id="@+id/night_mode_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_night_mode_textview"
+ android:id="@+id/night_mode_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_display_webpage_images_imageview"
+ android:id="@+id/display_webpage_images_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
android:contentDescription="@string/display_webpage_images" />
<Spinner
- android:id="@+id/domain_settings_display_webpage_images_spinner"
+ android:id="@+id/display_webpage_images_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_display_webpage_images_textview"
+ android:id="@+id/display_webpage_images_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_marginTop="18dp"
- android:layout_marginBottom="32dp" >
+ android:layout_marginBottom="18dp" >
<!-- Switch -->
<LinearLayout
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_pinned_ssl_certificate_imageview"
+ android:id="@+id/pinned_ssl_certificate_imageview"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="1dp"
tools:ignore="contentDescription" />
<Switch
- android:id="@+id/domain_settings_pinned_ssl_certificate_switch"
+ android:id="@+id/pinned_ssl_certificate_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="8dp"
</LinearLayout>
<!-- Saved Certificate -->
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/saved_ssl_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="10dp"
- android:layout_marginBottom="5dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" >
android:layout_width="match_parent" />
</LinearLayout>
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
<!-- Current Website Certificate -->
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/current_website_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="10dp"
- android:layout_marginStart="10dp"
- android:layout_marginEnd="10dp" >
+ android:layout_margin="10dp" >
<LinearLayout
android:id="@+id/current_website_certificate_linearlayout"
android:layout_width="match_parent" />
</LinearLayout>
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
<!-- Load An Encrypted Website Instructions. -->
<TextView
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:gravity="center_horizontal"
android:text="@string/load_an_encrypted_website" />
</LinearLayout>
+
+ <!-- Pinned IP Addresses -->
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_marginTop="18dp"
+ android:layout_marginBottom="18dp" >
+
+ <!-- Switch -->
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:id="@+id/pinned_ip_addresses_imageview"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="1dp"
+ android:layout_marginEnd="10dp"
+ android:layout_gravity="center_vertical"
+ tools:ignore="contentDescription" />
+
+ <Switch
+ android:id="@+id/pinned_ip_addresses_switch"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="8dp"
+ android:text="@string/pinned_ip_addresses"
+ android:textColor="?android:textColorPrimary"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+ <!-- Saved IP Addresses -->
+ <androidx.cardview.widget.CardView
+ android:id="@+id/saved_ip_addresses_cardview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="10dp"
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp" >
+
+ <LinearLayout
+ android:id="@+id/saved_ip_addresses_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <RadioButton
+ android:id="@+id/saved_ip_addresses_radiobutton"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/saved_ip_addresses"
+ android:textSize="17sp"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?android:textColorPrimary" />
+
+ <TextView
+ android:id="@+id/saved_ip_addresses_textview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="32dp"
+ android:textColor="?attr/aboutText" />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/current_ip_addresses_cardview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_margin="10dp">
+
+ <LinearLayout
+ android:id="@+id/current_ip_addresses_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <RadioButton
+ android:id="@+id/current_ip_addresses_radiobutton"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/current_ip_addresses"
+ android:textSize="17sp"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?android:textColorPrimary" />
+
+ <TextView
+ android:id="@+id/current_ip_addresses_textview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="32dp"
+ android:textColor="?attr/aboutText" />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+ </LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file