Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca99cb71 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'bc6aa63a' into HEAD

parents 98f5e186 bc6aa63a

Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -6,10 +6,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305 


LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES := \

        $(call all-java-files-under, src) \

        src/com/android/settings/EventLogTags.logtags



LOCAL_PACKAGE_NAME := Settings

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

AndroidManifest.xml

+141 −14
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />

    <uses-permission android:name="android.permission.NFC" />

    <uses-permission android:name="android.permission.HARDWARE_TEST" />

    <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -64,11 +65,13 @@ 
    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />

    <uses-permission android:name="android.permission.SET_TIME" />

    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.REBOOT" />

    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

            android:taskAffinity=""

            android:theme="@android:style/Theme.Holo"

            android:theme="@style/Theme.Settings"

            android:hardwareAccelerated="true"

            android:requiredForAllUsers="true"

            android:supportsRtl="true">
@@ -169,7 +172,7 @@ 


        <activity android:name=".wifi.WifiSetupActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:theme="@style/setup_wizard_theme"

                android:theme="@style/SetupWizardWifiTheme"

                android:label="@string/wifi_setup_wizard_title"

                android:icon="@drawable/empty_icon"

                android:clearTaskOnLaunch="true">
@@ -512,7 +515,7 @@ 
        </receiver>



        <activity android:name="Settings$UserDictionarySettingsActivity"

                android:label="@string/user_dict_settings_titlebar"

                android:label="@string/user_dict_settings_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

            <intent-filter>
@@ -522,7 +525,7 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.UserDictionarySettings" />

                android:value="com.android.settings.inputmethod.UserDictionaryList" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/language_settings" />

            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
@@ -532,7 +535,7 @@ 
        </activity>



        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"

                  android:label="@string/user_dict_settings_titlebar"

                  android:label="@string/user_dict_settings_title"

                  android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"

                  android:windowSoftInputMode="stateVisible"

                  android:noHistory="true"
@@ -547,7 +550,7 @@ 


        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="UserDictionarySettings"

                android:label="@string/user_dict_settings_titlebar"

                android:label="@string/user_dict_settings_title"

                android:exported="true"

                android:targetActivity="Settings$UserDictionarySettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -799,7 +802,8 @@ 
        <activity android:name="Settings$AppOpsSummaryActivity"

                android:label="@string/app_ops_settings"

                android:taskAffinity=""

                android:excludeFromRecents="true">

                android:excludeFromRecents="true"

                android:enabled="false">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.APP_OPS_SETTINGS" />
@@ -815,6 +819,7 @@ 
        -->



        <activity android:name="Settings$LocationSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/location_settings_title"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity=""
@@ -822,13 +827,12 @@ 
            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />

                <action android:name="android.credentials.UNLOCK" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.LocationSettings" />

                android:value="com.android.settings.location.LocationSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/location_settings" />

        </activity>
@@ -851,6 +855,35 @@ 
                android:resource="@id/security_settings" />

        </activity>



        <activity android:name="MonitoringCertInfoActivity"

                android:label="@string/ssl_ca_cert_dialog_title"

                android:theme="@style/Transparent"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.MONITORING_CERT_INFO" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name="Settings$TrustedCredentialsSettingsActivity"

                android:label="@string/trusted_credentials"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />

                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.TrustedCredentialsSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/security_settings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="SecuritySettings"

                android:label="@string/security_settings_title"
@@ -966,7 +999,22 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.AccessibilitySettings" />

                android:value="com.android.settings.accessibility.AccessibilitySettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/accessibility_settings" />

        </activity>



        <activity android:name="Settings$CaptioningSettingsActivity"

                android:label="@string/accessibility_captioning_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$AccessibilitySettingsActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.CAPTIONING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/accessibility_settings" />

        </activity>
@@ -988,7 +1036,6 @@ 


        <!-- Second and third-level settings -->





        <!-- Lock screen settings -->

        <activity android:name="ConfirmLockPattern"/>
@@ -1004,6 +1051,11 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

        />



        <activity android:name="ChooseLockPattern" android:exported="false"/>



        <activity android:name="ChooseLockPassword" android:exported="false"
@@ -1097,6 +1149,37 @@ 
                android:resource="@id/development_settings" />

        </activity>



        <activity android:name="Settings$PrintSettingsActivity"

                android:label="@string/print_settings"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.print.PrintSettingsFragment" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/print_settings" />

        </activity>



        <activity android:name="Settings$PrintJobSettingsActivity"

                android:label="@string/print_print_job"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$PrintSettingsActivity">

            <intent-filter>

                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="printjob" android:pathPattern="*" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.print.PrintJobSettingsFragment" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/print_settings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="DevelopmentSettings"

                  android:exported="true"
@@ -1554,6 +1637,41 @@ 
                android:resource="@id/user_settings" />

        </activity>



        <activity android:name="Settings$PaymentSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/nfc_payment_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.nfc.PaymentSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/nfc_payment_settings" />

        </activity>

        <activity android:name=".nfc.PaymentDefaultDialog"

                  android:label="@string/nfc_payment_set_default_label"

                  android:excludeFromRecents="true"

                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">

            <intent-filter>

                <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name=".SmsDefaultDialog"

                  android:label="@string/sms_application_title"

                  android:excludeFromRecents="true"

                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">

            <intent-filter>

                <action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name="Settings$NotificationAccessSettingsActivity"

                  android:label="@string/manage_notification_access"

                  android:taskAffinity=""
@@ -1591,7 +1709,7 @@ 
                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />

                <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />

                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />

                <action android:name="android.location.PROVIDERS_CHANGED" />

                <action android:name="android.location.MODE_CHANGED" />

                <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />

            </intent-filter>

            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
@@ -1610,5 +1728,14 @@ 
            </intent-filter>

        </receiver>



        <provider

            android:name="android.support.v4.content.FileProvider"

            android:authorities="com.android.settings.files"

            android:grantUriPermissions="true"

            android:exported="false">

            <meta-data

                android:name="android.support.FILE_PROVIDER_PATHS"

                android:resource="@xml/file_paths" />

        </provider>

    </application>

</manifest>

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
-keep class com.android.settings.fuelgauge.*

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

-keep class com.android.settings.NotificationStation

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



# Keep click responders

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

res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png

+2 B (159 B)
Loading image diff...

res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png

−7 B (217 B)
Loading image diff...