Merge commit '819bbf1e' into remote

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

        $(call all-logtags-files-under, src)

LOCAL_MODULE := settings-logtags

include $(BUILD_STATIC_JAVA_LIBRARY)

# Build the Settings APK

include $(CLEAR_VARS)

LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    jsr305

    jsr305 \

    settings-logtags

LOCAL_MODULE_TAGS := optional

-keep class com.android.settings.users.*

-keep class com.android.settings.nfc.*

-keep class com.android.settings.notification.*

-keep class com.android.settings.overlay.FeatureFactoryImpl

-keep class com.android.settings.accessibility.*FragmentForSetupWizard

-keep class com.android.settings.display.*FragmentForSetupWizard

-keep class com.android.settings.display.NightDisplaySettings

# Keep click responders

-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {

<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2016 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">

    <item android:state_selected="false"

          android:color="#b3ffffff"/>

    <item android:color="@android:color/white"/>

</selector>