浏览代码

Merge pull request #2127 from nextcloud/bugfix/noid/ignore-using-private-resources-globally

Disable lint check 'PrivateResource'
Tim Krüger 3 年之前
父节点
当前提交
3cc4a444f2
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      app/build.gradle
  2. 4 4
      app/src/main/res/values/strings.xml

+ 1 - 1
app/build.gradle

@@ -138,7 +138,7 @@ android {
 
     lint {
         abortOnError false
-        disable 'MissingTranslation'
+        disable 'MissingTranslation','PrivateResource'
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
         htmlReport true
     }

+ 4 - 4
app/src/main/res/values/strings.xml

@@ -20,7 +20,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Common -->
     <string name="nc_yes">Yes</string>
     <string name="nc_no">No</string>
@@ -328,9 +328,9 @@
     <string name="nc_message_failed_to_send">Failed to send message:</string>
     <string name="nc_remote_audio_off">Remote audio off</string>
     <string name="nc_add_attachment">Add attachment</string>
-    <string name="emoji_category_recent" tools:ignore="PrivateResource">Recent</string>
-    <string name="emoji_backspace" tools:ignore="PrivateResource">Backspace</string>
-    <string name="emoji_search" tools:ignore="PrivateResource">Search emoji</string>
+    <string name="emoji_category_recent">Recent</string>
+    <string name="emoji_backspace">Backspace</string>
+    <string name="emoji_search">Search emoji</string>
 
     <!-- Content descriptions -->
     <string name="nc_description_send_message_button">Send message</string>