X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fedit_bookmark_folder_databaseview_dialog.xml;h=49d3d7d5b9b9f53551f1ded2802086b768fe6105;hb=771125363f79df7b3a6b85321a08c7c201b54661;hp=72acc7ef92891fd6a97fe6d64a5aa1d8933769f9;hpb=eb9bc527c37223964f7c00592df982b47ff2f81c;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
index 72acc7ef..49d3d7d5 100644
--- a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -20,12 +20,12 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent" >
 
     <!-- Setting `android:focusable` and `android:focusableInTouchMode` prevent `edit_bookmark_display_order_edittext` from being autoselected. -->
     <LinearLayout
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:orientation="vertical"
@@ -46,7 +46,7 @@
                 android:layout_width="wrap_content"
                 android:text="@string/database_id"
                 android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:layout_marginEnd="8dp" />
 
             <TextView
@@ -114,7 +114,7 @@
                     android:layout_marginBottom="4dp"
                     android:text="@string/current_bookmark_icon"
                     android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
 
                 <RadioButton
                     android:id="@+id/edit_folder_default_icon_radiobutton"
@@ -124,7 +124,7 @@
                     android:layout_marginBottom="4dp"
                     android:text="@string/default_folder_icon"
                     android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
 
                 <RadioButton
                     android:id="@+id/edit_folder_webpage_favorite_icon_radiobutton"
@@ -133,12 +133,12 @@
                     android:layout_marginTop="5dp"
                     android:text="@string/web_page_favorite_icon"
                     android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
             </RadioGroup>
         </LinearLayout>
 
-        <!-- Folder name.  `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
-        <android.support.design.widget.TextInputLayout
+        <!-- Folder name.  The `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_marginTop="12dp"
@@ -147,7 +147,7 @@
             android:layout_marginEnd="4dp" >
 
             <!-- `android:imeOptions="actionGo"` sets the keyboard to have a `go` key instead of a `new line` key.  `android:inputType="textUri"` disables spell check in the `EditText`. -->
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_folder_name_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -155,7 +155,7 @@
                 android:imeOptions="actionGo"
                 android:inputType="textUri"
                 android:selectAllOnFocus="true" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <!-- Folder. -->
         <LinearLayout
@@ -171,7 +171,7 @@
                 android:layout_width="wrap_content"
                 android:text="@string/parent_folder"
                 android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector" />
+                android:textColor="?android:textColorPrimary" />
 
             <Spinner
                 android:id="@+id/edit_folder_parent_folder_spinner"
@@ -193,7 +193,7 @@
                 android:layout_width="wrap_content"
                 android:text="@string/display_order"
                 android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:layout_marginEnd="6dp"
                 android:labelFor="@+id/edit_folder_display_order_edittext"/>
 
@@ -203,7 +203,9 @@
                 android:layout_width="match_parent"
                 android:imeOptions="actionGo"
                 android:inputType="number"
-                android:selectAllOnFocus="true" />
+                android:selectAllOnFocus="true"
+                android:importantForAutofill="no"
+                tools:targetApi="26" />
         </LinearLayout>
 
         <TextView