From b62883a0da600b4af12d894bf600708d6a0b88f6 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Tue, 12 Jun 2018 10:25:19 -0700
Subject: Rename keep.xml in spam.

Test: manual check resource are still kept
PiperOrigin-RevId: 200237775
Change-Id: Ie6530b5317c898a85e601c4c5fb23cd9f67f5873
---
 java/com/android/incallui/spam/res/raw/keep.xml    | 66 ----------------------
 .../android/incallui/spam/res/raw/keep_spam.xml    | 66 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 java/com/android/incallui/spam/res/raw/keep.xml
 create mode 100644 java/com/android/incallui/spam/res/raw/keep_spam.xml

(limited to 'java/com/android/incallui')

diff --git a/java/com/android/incallui/spam/res/raw/keep.xml b/java/com/android/incallui/spam/res/raw/keep.xml
deleted file mode 100644
index 0361e5131..000000000
--- a/java/com/android/incallui/spam/res/raw/keep.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources xmlns:tools="http://schemas.android.com/tools"
-    tools:keep="
-    @string/spam_notification_title,
-    @string/spam_notification_title_230151,
-    @string/spam_notification_title_230152,
-    @string/spam_notification_title_230153,
-    @string/spam_notification_title_230154,
-    @string/spam_notification_title_230155,
-    @string/spam_notification_block_report_toast_text,
-    @string/spam_notification_block_report_toast_text_230151,
-    @string/spam_notification_block_report_toast_text_230152,
-    @string/spam_notification_block_report_toast_text_230153,
-    @string/spam_notification_block_report_toast_text_230154,
-    @string/spam_notification_block_report_toast_text_230155,
-    @string/spam_notification_not_spam_toast_text,
-    @string/spam_notification_not_spam_toast_text_230151,
-    @string/spam_notification_not_spam_toast_text_230152,
-    @string/spam_notification_not_spam_toast_text_230153,
-    @string/spam_notification_not_spam_toast_text_230154,
-    @string/spam_notification_not_spam_toast_text_230155,
-    @string/spam_notification_non_spam_call_collapsed_text,
-    @string/spam_notification_non_spam_call_collapsed_text_230151,
-    @string/spam_notification_non_spam_call_collapsed_text_230152,
-    @string/spam_notification_non_spam_call_collapsed_text_230153,
-    @string/spam_notification_non_spam_call_collapsed_text_230154,
-    @string/spam_notification_non_spam_call_collapsed_text_230155,
-    @string/spam_notification_non_spam_call_expanded_text,
-    @string/spam_notification_non_spam_call_expanded_text_230151,
-    @string/spam_notification_non_spam_call_expanded_text_230152,
-    @string/spam_notification_non_spam_call_expanded_text_230153,
-    @string/spam_notification_non_spam_call_expanded_text_230154,
-    @string/spam_notification_non_spam_call_expanded_text_230155,
-    @string/spam_notification_spam_call_collapsed_text,
-    @string/spam_notification_spam_call_collapsed_text_230151,
-    @string/spam_notification_spam_call_collapsed_text_230152,
-    @string/spam_notification_spam_call_collapsed_text_230153,
-    @string/spam_notification_spam_call_collapsed_text_230154,
-    @string/spam_notification_spam_call_collapsed_text_230155,
-    @string/spam_notification_dialog_block_report_spam_action_text,
-    @string/spam_notification_dialog_block_report_spam_action_text_230151,
-    @string/spam_notification_dialog_block_report_spam_action_text_230152,
-    @string/spam_notification_dialog_block_report_spam_action_text_230153,
-    @string/spam_notification_dialog_block_report_spam_action_text_230154,
-    @string/spam_notification_dialog_block_report_spam_action_text_230155,
-    @string/spam_notification_was_not_spam_action_text,
-    @string/spam_notification_was_not_spam_action_text_230151,
-    @string/spam_notification_was_not_spam_action_text_230152,
-    @string/spam_notification_was_not_spam_action_text_230153,
-    @string/spam_notification_was_not_spam_action_text_230154,
-    @string/spam_notification_was_not_spam_action_text_230155"/>
\ No newline at end of file
diff --git a/java/com/android/incallui/spam/res/raw/keep_spam.xml b/java/com/android/incallui/spam/res/raw/keep_spam.xml
new file mode 100644
index 000000000..0361e5131
--- /dev/null
+++ b/java/com/android/incallui/spam/res/raw/keep_spam.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="
+    @string/spam_notification_title,
+    @string/spam_notification_title_230151,
+    @string/spam_notification_title_230152,
+    @string/spam_notification_title_230153,
+    @string/spam_notification_title_230154,
+    @string/spam_notification_title_230155,
+    @string/spam_notification_block_report_toast_text,
+    @string/spam_notification_block_report_toast_text_230151,
+    @string/spam_notification_block_report_toast_text_230152,
+    @string/spam_notification_block_report_toast_text_230153,
+    @string/spam_notification_block_report_toast_text_230154,
+    @string/spam_notification_block_report_toast_text_230155,
+    @string/spam_notification_not_spam_toast_text,
+    @string/spam_notification_not_spam_toast_text_230151,
+    @string/spam_notification_not_spam_toast_text_230152,
+    @string/spam_notification_not_spam_toast_text_230153,
+    @string/spam_notification_not_spam_toast_text_230154,
+    @string/spam_notification_not_spam_toast_text_230155,
+    @string/spam_notification_non_spam_call_collapsed_text,
+    @string/spam_notification_non_spam_call_collapsed_text_230151,
+    @string/spam_notification_non_spam_call_collapsed_text_230152,
+    @string/spam_notification_non_spam_call_collapsed_text_230153,
+    @string/spam_notification_non_spam_call_collapsed_text_230154,
+    @string/spam_notification_non_spam_call_collapsed_text_230155,
+    @string/spam_notification_non_spam_call_expanded_text,
+    @string/spam_notification_non_spam_call_expanded_text_230151,
+    @string/spam_notification_non_spam_call_expanded_text_230152,
+    @string/spam_notification_non_spam_call_expanded_text_230153,
+    @string/spam_notification_non_spam_call_expanded_text_230154,
+    @string/spam_notification_non_spam_call_expanded_text_230155,
+    @string/spam_notification_spam_call_collapsed_text,
+    @string/spam_notification_spam_call_collapsed_text_230151,
+    @string/spam_notification_spam_call_collapsed_text_230152,
+    @string/spam_notification_spam_call_collapsed_text_230153,
+    @string/spam_notification_spam_call_collapsed_text_230154,
+    @string/spam_notification_spam_call_collapsed_text_230155,
+    @string/spam_notification_dialog_block_report_spam_action_text,
+    @string/spam_notification_dialog_block_report_spam_action_text_230151,
+    @string/spam_notification_dialog_block_report_spam_action_text_230152,
+    @string/spam_notification_dialog_block_report_spam_action_text_230153,
+    @string/spam_notification_dialog_block_report_spam_action_text_230154,
+    @string/spam_notification_dialog_block_report_spam_action_text_230155,
+    @string/spam_notification_was_not_spam_action_text,
+    @string/spam_notification_was_not_spam_action_text_230151,
+    @string/spam_notification_was_not_spam_action_text_230152,
+    @string/spam_notification_was_not_spam_action_text_230153,
+    @string/spam_notification_was_not_spam_action_text_230154,
+    @string/spam_notification_was_not_spam_action_text_230155"/>
\ No newline at end of file
-- 
cgit v1.2.3