diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 05ffe51..fa98d88 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -33,7 +33,7 @@
         android:background="?android:attr/selectableItemBackground">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="true"
@@ -41,7 +41,7 @@
             android:textAppearance="?android:attr/textAppearanceListItem" />
 
         <TextView
-            android:id="@+android:id/summary"
+            android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
diff --git a/res/layout/headerless_preference_category.xml b/res/layout/headerless_preference_category.xml
index 5fdc1a0..cddc445 100644
--- a/res/layout/headerless_preference_category.xml
+++ b/res/layout/headerless_preference_category.xml
@@ -17,7 +17,7 @@
 <!-- Style for a preference category without a header title.
      Based on tall_preference_category, but invisible and with some 0dp attributes. -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/title"
+    android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_marginBottom="0dip"
diff --git a/res/layout/location_list_no_item.xml b/res/layout/location_list_no_item.xml
index 5489a50..c0465cf 100644
--- a/res/layout/location_list_no_item.xml
+++ b/res/layout/location_list_no_item.xml
@@ -32,7 +32,7 @@
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
 
-        <TextView android:id="@+android:id/title"
+        <TextView android:id="@android:id/title"
             android:gravity="center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index bfe5da4..cf85e5d 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -31,7 +31,7 @@
         android:paddingBottom="16dip">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
index d571b5f..4bb6fe2 100644
--- a/res/layout/preference_app_restrictions.xml
+++ b/res/layout/preference_app_restrictions.xml
@@ -38,7 +38,7 @@
             android:minWidth="@*android:dimen/preference_icon_minWidth"
             android:orientation="horizontal">
             <ImageView
-                android:id="@+android:id/icon"
+                android:id="@android:id/icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
@@ -55,7 +55,7 @@
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
             <TextView
-                android:id="@+android:id/title"
+                android:id="@android:id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
diff --git a/res/layout/preference_bt_icon.xml b/res/layout/preference_bt_icon.xml
index 2c05cfe..8f8b532 100644
--- a/res/layout/preference_bt_icon.xml
+++ b/res/layout/preference_bt_icon.xml
@@ -24,7 +24,7 @@
     android:background="?android:attr/selectableItemBackground">
 
     <ImageView
-        android:id="@+android:id/icon"
+        android:id="@android:id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dip"
@@ -41,7 +41,7 @@
         android:paddingBottom="16dip">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
index 172ec59..194c314 100644
--- a/res/layout/preference_empty_list.xml
+++ b/res/layout/preference_empty_list.xml
@@ -21,7 +21,7 @@
     android:background="@android:color/transparent">
 
     <TextView
-        android:id="@+android:id/title"
+        android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center" />
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml
index 9415752..5c74aa8 100644
--- a/res/layout/preference_home_app.xml
+++ b/res/layout/preference_home_app.xml
@@ -43,7 +43,7 @@
                 android:focusable="false" />
 
             <ImageView
-                android:id="@+android:id/icon"
+                android:id="@android:id/icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
@@ -61,7 +61,7 @@
                 android:orientation="vertical">
 
                     <TextView
-                        android:id="@+android:id/title"
+                        android:id="@android:id/title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:singleLine="true"
@@ -69,7 +69,7 @@
                         android:ellipsize="end" />
 
                     <TextView
-                        android:id="@+android:id/summary"
+                        android:id="@android:id/summary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 8e62508..590a05a 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -18,7 +18,7 @@
      Preference is able to place a specific widget for its particular
      type in the "widget_frame" layout. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/widget_frame"
+    android:id="@android:id/widget_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="56dp"
@@ -43,7 +43,7 @@
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
 
-        <TextView android:id="@+android:id/title"
+        <TextView android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
@@ -51,7 +51,7 @@
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 
-        <TextView android:id="@+android:id/summary"
+        <TextView android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
diff --git a/res/layout/preference_multiline_title.xml b/res/layout/preference_multiline_title.xml
index f4e26fc..16c25d5 100644
--- a/res/layout/preference_multiline_title.xml
+++ b/res/layout/preference_multiline_title.xml
@@ -31,7 +31,7 @@
         android:paddingBottom="16dip">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@android:style/TextAppearance.Material.Subhead"
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 1776fec..6ed6df3 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -29,7 +29,7 @@
         android:textAppearance="@android:style/TextAppearance.Material.Body2"
         android:textColor="?android:attr/colorAccent"
         android:background="@null"
-        android:id="@+android:id/title"
+        android:id="@android:id/title"
         android:paddingStart="0dp"
         android:paddingTop="6dp"
         android:layout_width="0dp"
diff --git a/res/layout/preference_wallpaper_type b/res/layout/preference_wallpaper_type
index ee1fd30..a35a24e 100644
--- a/res/layout/preference_wallpaper_type
+++ b/res/layout/preference_wallpaper_type
@@ -23,7 +23,7 @@
               android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
 
     <ImageView
-            android:id="@+android:id/icon"
+            android:id="@android:id/icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center"
@@ -31,7 +31,7 @@
             android:layout_marginEnd="16dip"
             android:contentDescription="@null" />
 
-    <TextView android:id="@+android:id/title"
+    <TextView android:id="@android:id/title"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:singleLine="true"
diff --git a/res/layout/preference_widget_radiobutton.xml b/res/layout/preference_widget_radiobutton.xml
index 7f4ee95..b3ec43d 100644
--- a/res/layout/preference_widget_radiobutton.xml
+++ b/res/layout/preference_widget_radiobutton.xml
@@ -17,7 +17,7 @@
 <!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
      inside android.R.layout.preference. -->
 <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/checkbox"
+    android:id="@android:id/checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
diff --git a/res/layout/print_job_summary.xml b/res/layout/print_job_summary.xml
index d755de2..5e29a9c 100644
--- a/res/layout/print_job_summary.xml
+++ b/res/layout/print_job_summary.xml
@@ -31,7 +31,7 @@
         android:background="?android:attr/listDivider">
     </View>
 
-    <TextView android:id="@+android:id/summary"
+    <TextView android:id="@android:id/summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dip"
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 2da5494..636a4c2 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -32,7 +32,7 @@
         android:orientation="horizontal">
 
       <TextView
-          android:id="@+android:id/title"
+          android:id="@android:id/title"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 7bc51df..7cd5b06 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -27,7 +27,7 @@
     android:background="?android:attr/selectableItemBackground">
 
     <TextView
-        android:id="@+android:id/title"
+        android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
diff --git a/res/layout/tall_preference_category.xml b/res/layout/tall_preference_category.xml
index 7a5dd77..f0630f8 100644
--- a/res/layout/tall_preference_category.xml
+++ b/res/layout/tall_preference_category.xml
@@ -17,7 +17,7 @@
 <!-- Based on frameworks/base/core/res/res/layout/preference_category_material.xml.
      except has paddingBottom set.-->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/title"
+    android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dip"
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 82d8629..9ccebe7 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -30,7 +30,7 @@
                   android:layout_marginBottom="6dip"
                   android:layout_weight="1">
 
-    <TextView android:id="@+android:id/text1"
+    <TextView android:id="@android:id/text1"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:singleLine="true"
@@ -38,7 +38,7 @@
               android:ellipsize="marquee"
               android:fadingEdge="horizontal" />
 
-    <TextView android:id="@+android:id/text2"
+    <TextView android:id="@android:id/text2"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_below="@android:id/text1"
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index d6ab6d2..583c847 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -41,7 +41,7 @@
             android:minWidth="@*android:dimen/preference_icon_minWidth"
             android:orientation="horizontal">
             <ImageView
-                android:id="@+android:id/icon"
+                android:id="@android:id/icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
@@ -58,7 +58,7 @@
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
             <TextView
-                android:id="@+android:id/title"
+                android:id="@android:id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
diff --git a/res/layout/wifi_advance_layout.xml b/res/layout/wifi_advance_layout.xml
index b4a257a..85f7a5f 100644
--- a/res/layout/wifi_advance_layout.xml
+++ b/res/layout/wifi_advance_layout.xml
@@ -29,7 +29,7 @@
         android:paddingBottom="6dip">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="16dip"