Snap for 8512216 from c8e4ab2b22cf6551c6c464df7f261ed4d3b659a6 to tm-frc-cellbroadcast-releaset_frc_cbr_330443000android13-frc-cellbroadcast-release

Change-Id: Ic4734c6704b928c9abfd406dfbcd4e6c60224146

172 files changed, 144 insertions, 205 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..fd0ed55
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,104 @@
+//  Copyright (C) 2015 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.
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+    ],
+}
+
+soong_config_module_type {
+    name: "messaging_java_defaults",
+    module_type: "java_defaults",
+    config_namespace: "messaging",
+    bool_variables: ["build_variant_eng"],
+    properties: ["optimize"],
+}
+
+messaging_java_defaults {
+    name: "messaging_defaults",
+    soong_config_variables: {
+        build_variant_eng: {
+            optimize: {
+                proguard_flags_files: [
+                    "proguard.flags",
+                    "proguard-test.flags",
+                ],
+            },
+            conditions_default: {
+                optimize: {
+                    proguard_flags_files: [
+                        "proguard.flags",
+                        "proguard-release.flags",
+                    ],
+                }
+            },
+        },
+    },
+}
+
+
+android_app {
+    name: "messaging",
+
+    srcs: ["src/**/*.java"],
+
+    defaults: ["messaging_defaults"],
+
+    static_libs: [
+        "androidx.appcompat_appcompat",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.fragment_fragment",
+        "androidx.media_media",
+        "androidx.legacy_legacy-support-core-utils",
+        "androidx.legacy_legacy-support-core-ui",
+        "androidx.palette_palette",
+        "androidx.recyclerview_recyclerview",
+        "androidx.viewpager_viewpager",
+        "androidx.legacy_legacy-support-v13",
+        "colorpicker",
+        "libchips",
+        "libphotoviewer",
+        "androidx.annotation_annotation",
+        "android-common",
+        "android-common-framesequence",
+        "com.android.vcard",
+        "guava",
+        "libphonenumber",
+    ],
+
+    aaptflags: [
+        "--version-name",
+        "1.0.001",
+        "--version-code",
+        "10001040",
+    ],
+    required: [
+        "libframesequence",
+        "libgiftranscode",
+    ],
+    optimize: {
+        obfuscate: true,
+        optimize: true,
+        enabled: true,
+    },
+
+    certificate: "platform",
+
+    sdk_version: "current",
+
+    product_specific: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b2cd0b9..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#  Copyright (C) 2015 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.
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_USE_AAPT2 := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.appcompat_appcompat \
-    androidx.collection_collection \
-    androidx.core_core \
-    androidx.fragment_fragment \
-    androidx.media_media \
-    androidx.legacy_legacy-support-core-utils \
-    androidx.legacy_legacy-support-core-ui \
-    androidx.palette_palette \
-    androidx.recyclerview_recyclerview \
-    androidx.viewpager_viewpager \
-    androidx.legacy_legacy-support-v13 \
-    colorpicker \
-    libchips \
-    libphotoviewer
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.annotation_annotation \
-    android-common \
-    android-common-framesequence \
-    com.android.vcard \
-    guava \
-    libphonenumber
-
-include $(LOCAL_PATH)/version.mk
-
-LOCAL_AAPT_FLAGS += --version-name "$(version_name_package)"
-LOCAL_AAPT_FLAGS += --version-code $(version_code_package)
-
-ifdef TARGET_BUILD_APPS
-    LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode
-else
-    LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
-endif
-
-LOCAL_PROGUARD_ENABLED := obfuscation optimization
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-ifeq (eng,$(TARGET_BUILD_VARIANT))
-    LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
-else
-    LOCAL_PROGUARD_FLAG_FILES += proguard-release.flags
-endif
-
-LOCAL_PACKAGE_NAME := messaging
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT
-LOCAL_LICENSE_CONDITIONS := notice
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_APPS)
-
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index e5f8942..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 11ef458..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index eb948c1..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index b90188e..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/cab_bg.9.png b/res/drawable-hdpi/cab_bg.9.png
deleted file mode 100644
index 1adfbc6..0000000
--- a/res/drawable-hdpi/cab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_add_gray.png b/res/drawable-hdpi/ic_add_gray.png
deleted file mode 100644
index dbbd78d..0000000
--- a/res/drawable-hdpi/ic_add_gray.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_archive_small_light.png b/res/drawable-hdpi/ic_archive_small_light.png
deleted file mode 100644
index 783126c..0000000
--- a/res/drawable-hdpi/ic_archive_small_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_archive_undo_small_light.png b/res/drawable-hdpi/ic_archive_undo_small_light.png
deleted file mode 100644
index 2c91e44..0000000
--- a/res/drawable-hdpi/ic_archive_undo_small_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_arrow_back_dark.png b/res/drawable-hdpi/ic_arrow_back_dark.png
deleted file mode 100644
index 4e5dc89..0000000
--- a/res/drawable-hdpi/ic_arrow_back_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_checkmark_small_blue.png b/res/drawable-hdpi/ic_checkmark_small_blue.png
deleted file mode 100644
index d84fd20..0000000
--- a/res/drawable-hdpi/ic_checkmark_small_blue.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_color_lens.png b/res/drawable-hdpi/ic_color_lens.png
deleted file mode 100644
index 69a4287..0000000
--- a/res/drawable-hdpi/ic_color_lens.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_crying_hero.png b/res/drawable-hdpi/ic_crying_hero.png
deleted file mode 100644
index 804b4e6..0000000
--- a/res/drawable-hdpi/ic_crying_hero.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_delete_small_light.png b/res/drawable-hdpi/ic_delete_small_light.png
deleted file mode 100644
index d2ed6d3..0000000
--- a/res/drawable-hdpi/ic_delete_small_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_dnd_on_light.png b/res/drawable-hdpi/ic_dnd_on_light.png
deleted file mode 100644
index cadf5b5..0000000
--- a/res/drawable-hdpi/ic_dnd_on_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_history_light.png b/res/drawable-hdpi/ic_history_light.png
deleted file mode 100644
index 4b512fe..0000000
--- a/res/drawable-hdpi/ic_history_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_ime_dark.png b/res/drawable-hdpi/ic_ime_dark.png
deleted file mode 100644
index a539d28..0000000
--- a/res/drawable-hdpi/ic_ime_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_keyboard_arrow_left_light.png b/res/drawable-hdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 50f280e..0000000
--- a/res/drawable-hdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_keyboard_arrow_right_light.png b/res/drawable-hdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 3e31c08..0000000
--- a/res/drawable-hdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_mp_camera_large_light.png b/res/drawable-hdpi/ic_mp_camera_large_light.png
deleted file mode 100644
index 721b760..0000000
--- a/res/drawable-hdpi/ic_mp_camera_large_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_open_in_new.png b/res/drawable-hdpi/ic_open_in_new.png
deleted file mode 100644
index 06e5f71..0000000
--- a/res/drawable-hdpi/ic_open_in_new.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_person_add_blue.png b/res/drawable-hdpi/ic_person_add_blue.png
deleted file mode 100644
index b7b85bd..0000000
--- a/res/drawable-hdpi/ic_person_add_blue.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_search_light.png b/res/drawable-hdpi/ic_search_light.png
deleted file mode 100644
index c35418e..0000000
--- a/res/drawable-hdpi/ic_search_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_sms_failed_light.png b/res/drawable-hdpi/ic_sms_failed_light.png
deleted file mode 100644
index 4973427..0000000
--- a/res/drawable-hdpi/ic_sms_failed_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_tooltip_arrow.png b/res/drawable-hdpi/ic_tooltip_arrow.png
deleted file mode 100644
index 870d502..0000000
--- a/res/drawable-hdpi/ic_tooltip_arrow.png
+++ /dev/null
diff --git a/res/drawable-hdpi/sym_keyboard_delete_holo.png b/res/drawable-hdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 9e74a64..0000000
--- a/res/drawable-hdpi/sym_keyboard_delete_holo.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_light.png b/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 3e31c08..0000000
--- a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_right_light.png b/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 50f280e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/sym_keyboard_delete_holo_dark.png b/res/drawable-ldrtl-hdpi/sym_keyboard_delete_holo_dark.png
deleted file mode 100644
index f0e1b08..0000000
--- a/res/drawable-ldrtl-hdpi/sym_keyboard_delete_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_left_light.png b/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 9bd625d..0000000
--- a/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_right_light.png b/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 6004f37..0000000
--- a/res/drawable-ldrtl-mdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/sym_keyboard_delete_holo_dark.png b/res/drawable-ldrtl-mdpi/sym_keyboard_delete_holo_dark.png
deleted file mode 100644
index 346e754..0000000
--- a/res/drawable-ldrtl-mdpi/sym_keyboard_delete_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 51a1903..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 464a0bc..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/sym_keyboard_delete_holo_dark.png b/res/drawable-ldrtl-xhdpi/sym_keyboard_delete_holo_dark.png
deleted file mode 100644
index a662fc2..0000000
--- a/res/drawable-ldrtl-xhdpi/sym_keyboard_delete_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 62ca382..0000000
--- a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 09536ed..0000000
--- a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxhdpi/sym_keyboard_delete_holo_dark.png b/res/drawable-ldrtl-xxhdpi/sym_keyboard_delete_holo_dark.png
deleted file mode 100644
index 273efd6..0000000
--- a/res/drawable-ldrtl-xxhdpi/sym_keyboard_delete_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 85d005b..0000000
--- a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 3737fec..0000000
--- a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xxxhdpi/sym_keyboard_delete_holo_dark.png b/res/drawable-ldrtl-xxxhdpi/sym_keyboard_delete_holo_dark.png
deleted file mode 100644
index 9203260..0000000
--- a/res/drawable-ldrtl-xxxhdpi/sym_keyboard_delete_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 577ab08..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index d8525e4..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 1b029e1..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index 4fa69f8..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/cab_bg.9.png b/res/drawable-mdpi/cab_bg.9.png
deleted file mode 100644
index f43a85b..0000000
--- a/res/drawable-mdpi/cab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_add_gray.png b/res/drawable-mdpi/ic_add_gray.png
deleted file mode 100644
index 806b6e1..0000000
--- a/res/drawable-mdpi/ic_add_gray.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_archive_small_light.png b/res/drawable-mdpi/ic_archive_small_light.png
deleted file mode 100644
index fa3ffa9..0000000
--- a/res/drawable-mdpi/ic_archive_small_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_archive_undo_small_light.png b/res/drawable-mdpi/ic_archive_undo_small_light.png
deleted file mode 100644
index 08b2332..0000000
--- a/res/drawable-mdpi/ic_archive_undo_small_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_arrow_back_dark.png b/res/drawable-mdpi/ic_arrow_back_dark.png
deleted file mode 100644
index 75ae1b1..0000000
--- a/res/drawable-mdpi/ic_arrow_back_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_checkmark_small_blue.png b/res/drawable-mdpi/ic_checkmark_small_blue.png
deleted file mode 100644
index df6ea14..0000000
--- a/res/drawable-mdpi/ic_checkmark_small_blue.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_color_lens.png b/res/drawable-mdpi/ic_color_lens.png
deleted file mode 100644
index b33c8b6..0000000
--- a/res/drawable-mdpi/ic_color_lens.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_crying_hero.png b/res/drawable-mdpi/ic_crying_hero.png
deleted file mode 100644
index d2f5eef..0000000
--- a/res/drawable-mdpi/ic_crying_hero.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_delete_small_light.png b/res/drawable-mdpi/ic_delete_small_light.png
deleted file mode 100644
index 641adc4..0000000
--- a/res/drawable-mdpi/ic_delete_small_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_dnd_on_light.png b/res/drawable-mdpi/ic_dnd_on_light.png
deleted file mode 100644
index 4936c2f..0000000
--- a/res/drawable-mdpi/ic_dnd_on_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_history_light.png b/res/drawable-mdpi/ic_history_light.png
deleted file mode 100644
index 234b2ce..0000000
--- a/res/drawable-mdpi/ic_history_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_ime_dark.png b/res/drawable-mdpi/ic_ime_dark.png
deleted file mode 100644
index 8c0a156..0000000
--- a/res/drawable-mdpi/ic_ime_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_left_light.png b/res/drawable-mdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 6004f37..0000000
--- a/res/drawable-mdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_right_light.png b/res/drawable-mdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 9bd625d..0000000
--- a/res/drawable-mdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_mp_camera_large_light.png b/res/drawable-mdpi/ic_mp_camera_large_light.png
deleted file mode 100644
index 3ec72f9..0000000
--- a/res/drawable-mdpi/ic_mp_camera_large_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_open_in_new.png b/res/drawable-mdpi/ic_open_in_new.png
deleted file mode 100644
index 44ef9d5..0000000
--- a/res/drawable-mdpi/ic_open_in_new.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_person_add_blue.png b/res/drawable-mdpi/ic_person_add_blue.png
deleted file mode 100644
index 0f63871..0000000
--- a/res/drawable-mdpi/ic_person_add_blue.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_search_light.png b/res/drawable-mdpi/ic_search_light.png
deleted file mode 100644
index b7e1de0..0000000
--- a/res/drawable-mdpi/ic_search_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_sms_failed_light.png b/res/drawable-mdpi/ic_sms_failed_light.png
deleted file mode 100644
index 9914e3f..0000000
--- a/res/drawable-mdpi/ic_sms_failed_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_tooltip_arrow.png b/res/drawable-mdpi/ic_tooltip_arrow.png
deleted file mode 100644
index 51824f5..0000000
--- a/res/drawable-mdpi/ic_tooltip_arrow.png
+++ /dev/null
diff --git a/res/drawable-mdpi/sym_keyboard_delete_holo.png b/res/drawable-mdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 7b3103b..0000000
--- a/res/drawable-mdpi/sym_keyboard_delete_holo.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 96eb10e..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 10986ee..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 12f9a82..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index e7590b0..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/cab_bg.9.png b/res/drawable-xhdpi/cab_bg.9.png
deleted file mode 100644
index ba8c446..0000000
--- a/res/drawable-xhdpi/cab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_add_gray.png b/res/drawable-xhdpi/ic_add_gray.png
deleted file mode 100644
index 8ce295d..0000000
--- a/res/drawable-xhdpi/ic_add_gray.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_archive_small_light.png b/res/drawable-xhdpi/ic_archive_small_light.png
deleted file mode 100644
index b3e628f..0000000
--- a/res/drawable-xhdpi/ic_archive_small_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_archive_undo_small_light.png b/res/drawable-xhdpi/ic_archive_undo_small_light.png
deleted file mode 100644
index b7038d8..0000000
--- a/res/drawable-xhdpi/ic_archive_undo_small_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_arrow_back_dark.png b/res/drawable-xhdpi/ic_arrow_back_dark.png
deleted file mode 100644
index c40b832..0000000
--- a/res/drawable-xhdpi/ic_arrow_back_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_checkmark_small_blue.png b/res/drawable-xhdpi/ic_checkmark_small_blue.png
deleted file mode 100644
index d6354df..0000000
--- a/res/drawable-xhdpi/ic_checkmark_small_blue.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_color_lens.png b/res/drawable-xhdpi/ic_color_lens.png
deleted file mode 100644
index 8887429..0000000
--- a/res/drawable-xhdpi/ic_color_lens.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_crying_hero.png b/res/drawable-xhdpi/ic_crying_hero.png
deleted file mode 100644
index ccc40ab..0000000
--- a/res/drawable-xhdpi/ic_crying_hero.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_delete_small_light.png b/res/drawable-xhdpi/ic_delete_small_light.png
deleted file mode 100644
index 7c45f70..0000000
--- a/res/drawable-xhdpi/ic_delete_small_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_dnd_on_light.png b/res/drawable-xhdpi/ic_dnd_on_light.png
deleted file mode 100644
index e0527f5..0000000
--- a/res/drawable-xhdpi/ic_dnd_on_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_history_light.png b/res/drawable-xhdpi/ic_history_light.png
deleted file mode 100644
index 23585a2..0000000
--- a/res/drawable-xhdpi/ic_history_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_ime_dark.png b/res/drawable-xhdpi/ic_ime_dark.png
deleted file mode 100644
index cd5c5c6..0000000
--- a/res/drawable-xhdpi/ic_ime_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-xhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 464a0bc..0000000
--- a/res/drawable-xhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-xhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 51a1903..0000000
--- a/res/drawable-xhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_mp_camera_large_light.png b/res/drawable-xhdpi/ic_mp_camera_large_light.png
deleted file mode 100644
index 5552d92..0000000
--- a/res/drawable-xhdpi/ic_mp_camera_large_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_open_in_new.png b/res/drawable-xhdpi/ic_open_in_new.png
deleted file mode 100644
index 363a35d..0000000
--- a/res/drawable-xhdpi/ic_open_in_new.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_person_add_blue.png b/res/drawable-xhdpi/ic_person_add_blue.png
deleted file mode 100644
index 0cdaeee..0000000
--- a/res/drawable-xhdpi/ic_person_add_blue.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_search_light.png b/res/drawable-xhdpi/ic_search_light.png
deleted file mode 100644
index b83d895..0000000
--- a/res/drawable-xhdpi/ic_search_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_sms_failed_light.png b/res/drawable-xhdpi/ic_sms_failed_light.png
deleted file mode 100644
index 90c899a..0000000
--- a/res/drawable-xhdpi/ic_sms_failed_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_tooltip_arrow.png b/res/drawable-xhdpi/ic_tooltip_arrow.png
deleted file mode 100644
index 4a59931..0000000
--- a/res/drawable-xhdpi/ic_tooltip_arrow.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/sym_keyboard_delete_holo.png b/res/drawable-xhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 16b58a0..0000000
--- a/res/drawable-xhdpi/sym_keyboard_delete_holo.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_selected.9.png b/res/drawable-xhdpi/tab_selected.9.png
deleted file mode 100644
index 95e5f43..0000000
--- a/res/drawable-xhdpi/tab_selected.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_selected_focused_holo.9.png b/res/drawable-xhdpi/tab_selected_focused_holo.9.png
deleted file mode 100644
index f98b4d9..0000000
--- a/res/drawable-xhdpi/tab_selected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index e8f2cb6..0000000
--- a/res/drawable-xhdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_selected_pressed_holo.9.png b/res/drawable-xhdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index 1882927..0000000
--- a/res/drawable-xhdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_unselected.9.png b/res/drawable-xhdpi/tab_unselected.9.png
deleted file mode 100644
index 8cede8d..0000000
--- a/res/drawable-xhdpi/tab_unselected.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_unselected_focused_holo.9.png b/res/drawable-xhdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 28a7ec5..0000000
--- a/res/drawable-xhdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-xhdpi/tab_unselected_pressed_focused_holo.9.png
deleted file mode 100644
index b9962b1..0000000
--- a/res/drawable-xhdpi/tab_unselected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png b/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index dadc471..0000000
--- a/res/drawable-xhdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index cc880c2..0000000
--- a/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 60ccf97..0000000
--- a/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 0358907..0000000
--- a/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index adcddc9..0000000
--- a/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/cab_bg.9.png b/res/drawable-xxhdpi/cab_bg.9.png
deleted file mode 100644
index b75401e..0000000
--- a/res/drawable-xxhdpi/cab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_add_gray.png b/res/drawable-xxhdpi/ic_add_gray.png
deleted file mode 100644
index 8273830..0000000
--- a/res/drawable-xxhdpi/ic_add_gray.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_archive_small_light.png b/res/drawable-xxhdpi/ic_archive_small_light.png
deleted file mode 100644
index 042ed27..0000000
--- a/res/drawable-xxhdpi/ic_archive_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_archive_undo_small_light.png b/res/drawable-xxhdpi/ic_archive_undo_small_light.png
deleted file mode 100644
index cd9d0d5..0000000
--- a/res/drawable-xxhdpi/ic_archive_undo_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_arrow_back_dark.png b/res/drawable-xxhdpi/ic_arrow_back_dark.png
deleted file mode 100644
index 1c71cb0..0000000
--- a/res/drawable-xxhdpi/ic_arrow_back_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_checkmark_small_blue.png b/res/drawable-xxhdpi/ic_checkmark_small_blue.png
deleted file mode 100644
index 154c66e..0000000
--- a/res/drawable-xxhdpi/ic_checkmark_small_blue.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_color_lens.png b/res/drawable-xxhdpi/ic_color_lens.png
deleted file mode 100644
index 6fd56fd..0000000
--- a/res/drawable-xxhdpi/ic_color_lens.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_crying_hero.png b/res/drawable-xxhdpi/ic_crying_hero.png
deleted file mode 100644
index 46538b5..0000000
--- a/res/drawable-xxhdpi/ic_crying_hero.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_delete_small_light.png b/res/drawable-xxhdpi/ic_delete_small_light.png
deleted file mode 100644
index b739ac9..0000000
--- a/res/drawable-xxhdpi/ic_delete_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_dnd_on_light.png b/res/drawable-xxhdpi/ic_dnd_on_light.png
deleted file mode 100644
index 3ddaa13..0000000
--- a/res/drawable-xxhdpi/ic_dnd_on_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_history_light.png b/res/drawable-xxhdpi/ic_history_light.png
deleted file mode 100644
index bd430f8..0000000
--- a/res/drawable-xxhdpi/ic_history_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_ime_dark.png b/res/drawable-xxhdpi/ic_ime_dark.png
deleted file mode 100644
index a32bd46..0000000
--- a/res/drawable-xxhdpi/ic_ime_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-xxhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 09536ed..0000000
--- a/res/drawable-xxhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-xxhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 62ca382..0000000
--- a/res/drawable-xxhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_mp_camera_large_light.png b/res/drawable-xxhdpi/ic_mp_camera_large_light.png
deleted file mode 100644
index 37fa935..0000000
--- a/res/drawable-xxhdpi/ic_mp_camera_large_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_open_in_new.png b/res/drawable-xxhdpi/ic_open_in_new.png
deleted file mode 100644
index 9109fa4..0000000
--- a/res/drawable-xxhdpi/ic_open_in_new.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_person_add_blue.png b/res/drawable-xxhdpi/ic_person_add_blue.png
deleted file mode 100644
index d9b6a77..0000000
--- a/res/drawable-xxhdpi/ic_person_add_blue.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_search_light.png b/res/drawable-xxhdpi/ic_search_light.png
deleted file mode 100644
index 97d77d6..0000000
--- a/res/drawable-xxhdpi/ic_search_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_sms_failed_light.png b/res/drawable-xxhdpi/ic_sms_failed_light.png
deleted file mode 100644
index 5da454b..0000000
--- a/res/drawable-xxhdpi/ic_sms_failed_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_tooltip_arrow.png b/res/drawable-xxhdpi/ic_tooltip_arrow.png
deleted file mode 100644
index 72f1c5b..0000000
--- a/res/drawable-xxhdpi/ic_tooltip_arrow.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/sym_keyboard_delete_holo.png b/res/drawable-xxhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index f2adbec..0000000
--- a/res/drawable-xxhdpi/sym_keyboard_delete_holo.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_selected.9.png b/res/drawable-xxhdpi/tab_selected.9.png
deleted file mode 100644
index e5efc58..0000000
--- a/res/drawable-xxhdpi/tab_selected.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_selected_focused_holo.9.png b/res/drawable-xxhdpi/tab_selected_focused_holo.9.png
deleted file mode 100644
index 8762b9e..0000000
--- a/res/drawable-xxhdpi/tab_selected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xxhdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index 8faa7ff..0000000
--- a/res/drawable-xxhdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_selected_pressed_holo.9.png b/res/drawable-xxhdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index c7a539b..0000000
--- a/res/drawable-xxhdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_unselected.9.png b/res/drawable-xxhdpi/tab_unselected.9.png
deleted file mode 100644
index 3891886..0000000
--- a/res/drawable-xxhdpi/tab_unselected.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_unselected_focused_holo.9.png b/res/drawable-xxhdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index 462ab15..0000000
--- a/res/drawable-xxhdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-xxhdpi/tab_unselected_pressed_focused_holo.9.png
deleted file mode 100644
index 58ddbe8..0000000
--- a/res/drawable-xxhdpi/tab_unselected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_holo.9.png b/res/drawable-xxhdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index de61933..0000000
--- a/res/drawable-xxhdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-xxxhdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 65cd55e..0000000
--- a/res/drawable-xxxhdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-xxxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index b6cac56..0000000
--- a/res/drawable-xxxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-xxxhdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index f017e03..0000000
--- a/res/drawable-xxxhdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-xxxhdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index 025e694..0000000
--- a/res/drawable-xxxhdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/cab_bg.9.png b/res/drawable-xxxhdpi/cab_bg.9.png
deleted file mode 100644
index 978cfad..0000000
--- a/res/drawable-xxxhdpi/cab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_archive_small_light.png b/res/drawable-xxxhdpi/ic_archive_small_light.png
deleted file mode 100644
index 59ffef9..0000000
--- a/res/drawable-xxxhdpi/ic_archive_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_archive_undo_small_light.png b/res/drawable-xxxhdpi/ic_archive_undo_small_light.png
deleted file mode 100644
index 46fd7d8..0000000
--- a/res/drawable-xxxhdpi/ic_archive_undo_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_arrow_back_dark.png b/res/drawable-xxxhdpi/ic_arrow_back_dark.png
deleted file mode 100644
index e7a9c81..0000000
--- a/res/drawable-xxxhdpi/ic_arrow_back_dark.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_checkmark_small_blue.png b/res/drawable-xxxhdpi/ic_checkmark_small_blue.png
deleted file mode 100644
index 855cfc5..0000000
--- a/res/drawable-xxxhdpi/ic_checkmark_small_blue.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_color_lens.png b/res/drawable-xxxhdpi/ic_color_lens.png
deleted file mode 100644
index 5c71071..0000000
--- a/res/drawable-xxxhdpi/ic_color_lens.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_crying_hero.png b/res/drawable-xxxhdpi/ic_crying_hero.png
deleted file mode 100644
index 0a428c9..0000000
--- a/res/drawable-xxxhdpi/ic_crying_hero.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_delete_small_light.png b/res/drawable-xxxhdpi/ic_delete_small_light.png
deleted file mode 100644
index d8a661f..0000000
--- a/res/drawable-xxxhdpi/ic_delete_small_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_dnd_on_light.png b/res/drawable-xxxhdpi/ic_dnd_on_light.png
deleted file mode 100644
index 7851985..0000000
--- a/res/drawable-xxxhdpi/ic_dnd_on_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_history_light.png b/res/drawable-xxxhdpi/ic_history_light.png
deleted file mode 100644
index 7ff42b7..0000000
--- a/res/drawable-xxxhdpi/ic_history_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_ime_dark.png b/res/drawable-xxxhdpi/ic_ime_dark.png
deleted file mode 100644
index 7c051df..0000000
--- a/res/drawable-xxxhdpi/ic_ime_dark.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_light.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_left_light.png
deleted file mode 100644
index 3737fec..0000000
--- a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_right_light.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_right_light.png
deleted file mode 100644
index 85d005b..0000000
--- a/res/drawable-xxxhdpi/ic_keyboard_arrow_right_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_mp_camera_large_light.png b/res/drawable-xxxhdpi/ic_mp_camera_large_light.png
deleted file mode 100644
index f915989..0000000
--- a/res/drawable-xxxhdpi/ic_mp_camera_large_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_open_in_new.png b/res/drawable-xxxhdpi/ic_open_in_new.png
deleted file mode 100644
index 6d6b59f..0000000
--- a/res/drawable-xxxhdpi/ic_open_in_new.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_person_add_blue.png b/res/drawable-xxxhdpi/ic_person_add_blue.png
deleted file mode 100644
index 13eb372..0000000
--- a/res/drawable-xxxhdpi/ic_person_add_blue.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_search_light.png b/res/drawable-xxxhdpi/ic_search_light.png
deleted file mode 100644
index b38785a..0000000
--- a/res/drawable-xxxhdpi/ic_search_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_sms_failed_light.png b/res/drawable-xxxhdpi/ic_sms_failed_light.png
deleted file mode 100644
index 2daf2ae..0000000
--- a/res/drawable-xxxhdpi/ic_sms_failed_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_tooltip_arrow.png b/res/drawable-xxxhdpi/ic_tooltip_arrow.png
deleted file mode 100644
index 84b03ad..0000000
--- a/res/drawable-xxxhdpi/ic_tooltip_arrow.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/sym_keyboard_delete_holo.png b/res/drawable-xxxhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 09af002..0000000
--- a/res/drawable-xxxhdpi/sym_keyboard_delete_holo.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_selected.9.png b/res/drawable-xxxhdpi/tab_selected.9.png
deleted file mode 100644
index 5c20d4d..0000000
--- a/res/drawable-xxxhdpi/tab_selected.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_selected_focused_holo.9.png b/res/drawable-xxxhdpi/tab_selected_focused_holo.9.png
deleted file mode 100644
index 33be972..0000000
--- a/res/drawable-xxxhdpi/tab_selected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xxxhdpi/tab_selected_pressed_focused_holo.9.png
deleted file mode 100644
index dc38a52..0000000
--- a/res/drawable-xxxhdpi/tab_selected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_selected_pressed_holo.9.png b/res/drawable-xxxhdpi/tab_selected_pressed_holo.9.png
deleted file mode 100644
index e4518a8..0000000
--- a/res/drawable-xxxhdpi/tab_selected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_unselected.9.png b/res/drawable-xxxhdpi/tab_unselected.9.png
deleted file mode 100644
index 9df735b..0000000
--- a/res/drawable-xxxhdpi/tab_unselected.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_unselected_focused_holo.9.png b/res/drawable-xxxhdpi/tab_unselected_focused_holo.9.png
deleted file mode 100644
index f01cfaf..0000000
--- a/res/drawable-xxxhdpi/tab_unselected_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-xxxhdpi/tab_unselected_pressed_focused_holo.9.png
deleted file mode 100644
index 7d85b20..0000000
--- a/res/drawable-xxxhdpi/tab_unselected_pressed_focused_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/tab_unselected_pressed_holo.9.png b/res/drawable-xxxhdpi/tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 0ace170..0000000
--- a/res/drawable-xxxhdpi/tab_unselected_pressed_holo.9.png
+++ /dev/null
diff --git a/res/drawable/exit_button_bg.xml b/res/drawable/exit_button_bg.xml
deleted file mode 100644
index 9fa0fb2..0000000
--- a/res/drawable/exit_button_bg.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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.
--->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@android:color/white">
-</ripple>
diff --git a/res/drawable/gallery_document_picker_item_background.xml b/res/drawable/gallery_document_picker_item_background.xml
deleted file mode 100644
index 4bbd7fe..0000000
--- a/res/drawable/gallery_document_picker_item_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:color="@color/gallery_image_default_background" android:width="1dp" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable/stat_notify_chat.png b/res/drawable/stat_notify_chat.png
deleted file mode 100644
index cc08e21..0000000
--- a/res/drawable/stat_notify_chat.png
+++ /dev/null
diff --git a/res/drawable/tab_indicator.xml b/res/drawable/tab_indicator.xml
deleted file mode 100644
index 28ecda3..0000000
--- a/res/drawable/tab_indicator.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item
-        android:state_focused="false"
-        android:state_selected="false"
-        android:state_pressed="false"
-        android:drawable="@drawable/tab_unselected" />
-    <item
-        android:state_focused="false"
-        android:state_selected="true"
-        android:state_pressed="false"
-        android:drawable="@drawable/tab_selected" />
-
-    <!-- Focused states -->
-    <item
-        android:state_focused="true"
-        android:state_selected="false"
-        android:state_pressed="false"
-        android:drawable="@drawable/tab_unselected_focused_holo" />
-    <item
-        android:state_focused="true"
-        android:state_selected="true"
-        android:state_pressed="false"
-        android:drawable="@drawable/tab_selected_focused_holo" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item
-        android:state_focused="false"
-        android:state_selected="false"
-        android:state_pressed="true"
-        android:drawable="@drawable/tab_unselected_pressed_holo" />
-    <item
-        android:state_focused="false"
-        android:state_selected="true"
-        android:state_pressed="true"
-        android:drawable="@drawable/tab_selected_pressed_holo" />
-
-    <!-- Focused states -->
-    <item
-        android:state_focused="true"
-        android:state_selected="false"
-        android:state_pressed="true"
-        android:drawable="@drawable/tab_unselected_pressed_focused_holo" />
-    <item
-        android:state_focused="true"
-        android:state_selected="true"
-        android:state_pressed="true"
-        android:drawable="@drawable/tab_selected_pressed_focused_holo" />
-</selector>
diff --git a/res/xml/apns.xml b/res/xml/apns.xml
index 57e1163..20de298 100644
--- a/res/xml/apns.xml
+++ b/res/xml/apns.xml
@@ -836,10 +836,10 @@
       <apn mcc="310" mnc="120" carrier="Sprint" apn="sprint" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" type="default,supl,mms,ims,cbs,dun" bearer="8"></apn>
       <apn mcc="310" mnc="120" carrier="Sprint CdmaNai" apn="CdmaNai" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" type="mms" authtype="0" protocol="IPV4V6" bearer="6" roaming_protocol="IPV4V6" carrier_enabled="FALSE"></apn>
       <apn mcc="310" mnc="120" carrier="Sprint CdmaNai" apn="CdmaNai" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" type="mms" authtype="0" protocol="IPV4V6" bearer="6" roaming_protocol="IPV4V6" carrier_enabled="TRUE"></apn>
-      <apn mcc="310" mnc="130" carrier="Carolina west" apn="VZWINTERNET" mmsc="http://mms.cwwmms.com/cww/mms.php" mmsproxy="204.117.091.161" mmsport="80" type="default,mms,dun,supl" mvno_match_data="carolinawest" mvno_type="spn" protocol="IPV4V6" bearer="13" roaming_protocol="IPV4V6"></apn>
-      <apn mcc="310" mnc="130" carrier="Carolina west" apn="VZWINTERNET" mmsc="http://mms.cwwmms.com/cww/mms.php" mmsproxy="204.117.091.161" mmsport="80" type="default,mms,dun,supl" mvno_match_data="carolinawest" mvno_type="spn" protocol="IPV4V6" bearer="14" roaming_protocol="IPV4V6"></apn>
-      <apn mcc="310" mnc="130" carrier="My Multi Media" apn="mms.c1.ama" mmsc="http://mms.iot1.com/amarillo/mms.php" type="mms" user="cell1mms" password="cell1"></apn>
-      <apn mcc="310" mnc="130" carrier="carolinawest" apn="CdmaNai" mmsc="http://mms.cwwmms.com/cww/mms.php" mmsproxy="204.117.091.161" mmsport="80" type="mms" mvno_match_data="carolinawest" mvno_type="spn" protocol="IPV4V6" bearer="6" roaming_protocol="IPV4V6" carrier_enabled="false"></apn>
+      <apn mcc="310" mnc="130" carrier="Carolina West Wireless" apn="home.cww.com" mmsc="" mmsproxy="" mmsport="" type="default,supl,fota"></apn>
+      <apn mcc="310" mnc="130" carrier="Carolina West Wireless IMS" apn="ims" mmsc="" mmsproxy="" mmsport="" type="ims"></apn>
+      <apn mcc="310" mnc="130" carrier="Carolina West Wireless MMS" apn="mms" mmsc="http://mms.cwwmms.com/cww/mms.php" mmsproxy="" mmsport="" type="mms"></apn>
+      <apn mcc="310" mnc="130" carrier="Carolina West Wireless Tethering" apn="tethering.cww.com" mmsc="" mmsproxy="" mmsport="80" type="dun"></apn>
       <apn mcc="310" mnc="150" carrier="internet" apn="ndo" mmsc="http://mmsc.aiowireless.net" mmsproxy="proxy.aiowireless.net" mmsport="80" type="default,mms,fota,hipri,supl"></apn>
       <apn mcc="310" mnc="160" carrier="MetroPCS 160" apn="fast.metropcs.com" mmsc="http://metropcs.mmsmvno.com/mms/wapenc" type="default,supl,mms" mvno_match_data="6D" mvno_type="gid" protocol="IPV6" roaming_protocol="IP"></apn>
       <apn mcc="310" mnc="160" carrier="T-Mobile US 160" apn="epc.tmobile.com" mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"></apn>
diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java
index 671c65e..08889b8 100644
--- a/src/com/android/messaging/util/PhoneUtils.java
+++ b/src/com/android/messaging/util/PhoneUtils.java
@@ -26,7 +26,6 @@ import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.provider.Settings;
 import android.provider.Telephony;
-import androidx.collection.ArrayMap;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
@@ -34,14 +33,18 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
+import androidx.collection.ArrayMap;
+import androidx.core.os.BuildCompat;
+
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.datamodel.data.ParticipantData;
 import com.android.messaging.sms.MmsSmsUtils;
+
 import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -369,6 +372,9 @@ public abstract class PhoneUtils {
         @Override
         @SuppressWarnings("deprecation")
         public boolean isDataRoamingEnabled() {
+            if (BuildCompat.isAtLeastT()) {
+                return mTelephonyManager.isDataRoamingEnabled();
+            }
             boolean dataRoamingEnabled = false;
             final ContentResolver cr = mContext.getContentResolver();
             if (OsUtil.isAtLeastJB_MR1()) {
diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java
index 6e39749..f92155f 100644
--- a/src/com/android/messaging/util/UriUtil.java
+++ b/src/com/android/messaging/util/UriUtil.java
@@ -49,6 +49,8 @@ public class UriUtil {
     private static final String SCHEME_MMSTO = "smsto";
     public static final HashSet<String> SMS_MMS_SCHEMES = new HashSet<String>(
         Arrays.asList(SCHEME_SMS, SCHEME_MMS, SCHEME_SMSTO, SCHEME_MMSTO));
+    private static final String SCHEME_HTTP = "http";
+    private static final String SCHEME_HTTPS = "https";
 
     public static final String SCHEME_BUGLE = "bugle";
     public static final HashSet<String> SUPPORTED_SCHEME = new HashSet<String>(
@@ -98,8 +100,7 @@ public class UriUtil {
     public static boolean isFileUri(final Uri uri) {
         return uri != null &&
                 uri.getScheme() != null &&
-                TextUtils.equals(uri.getScheme().trim().toLowerCase(),
-                        ContentResolver.SCHEME_FILE);
+                uri.getScheme().trim().toLowerCase().contains(ContentResolver.SCHEME_FILE);
     }
 
     /**
@@ -216,9 +217,10 @@ public class UriUtil {
                 inputStream = context.getContentResolver().openInputStream(sourceUri);
             } else {
                 // The content is remote. Download it.
-                final URL url = new URL(sourceUri.toString());
-                final URLConnection ucon = url.openConnection();
-                inputStream = new BufferedInputStream(ucon.getInputStream());
+                inputStream = getInputStreamFromRemoteUri(sourceUri);
+                if (inputStream == null) {
+                    return null;
+                }
             }
             return persistContentToScratchSpace(inputStream);
         } catch (final Exception ex) {
@@ -235,6 +237,23 @@ public class UriUtil {
         }
     }
 
+    @DoesNotRunOnMainThread
+    private static InputStream getInputStreamFromRemoteUri(final Uri sourceUri)
+            throws IOException {
+        if (isRemoteUri(sourceUri)) {
+            final URL url = new URL(sourceUri.toString());
+            final URLConnection ucon = url.openConnection();
+            return new BufferedInputStream(ucon.getInputStream());
+        } else {
+            return null;
+        }
+    }
+
+    private static boolean isRemoteUri(final Uri sourceUri) {
+        return sourceUri.getScheme().equals(SCHEME_HTTP)
+            || sourceUri.getScheme().equals(SCHEME_HTTPS);
+    }
+
     /**
      * Persist a piece of content from the given input stream, byte by byte to the specified
      * directory.
@@ -273,9 +292,10 @@ public class UriUtil {
                 inputStream = context.getContentResolver().openInputStream(sourceUri);
             } else {
                 // The content is remote. Download it.
-                final URL url = new URL(sourceUri.toString());
-                final URLConnection ucon = url.openConnection();
-                inputStream = new BufferedInputStream(ucon.getInputStream());
+                inputStream = getInputStreamFromRemoteUri(sourceUri);
+                if (inputStream == null) {
+                    return null;
+                }
             }
             return persistContent(inputStream, outputDir, contentType);
         } catch (final Exception ex) {