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

Commit 64e314b6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-6.0.1_r3' of... 

Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android 6.0.1 release 3

Change-Id: If54bacef03fc826fd02ca48db5ef3a25c8fc7127
parents 89ae71c0 46742e0c

AndroidManifest.xml

+0 −22
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ 
                  android:excludeFromRecents="true">

            <intent-filter android:priority="1">

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

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

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

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1754,27 +1753,6 @@ 
        <activity android:name=".AppPicker" android:label="@string/select_application"

                android:theme="@style/Theme.AppPicker" />



        <activity android:name="Settings$UsbSettingsActivity"

                android:label="@string/storage_title_usb"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$StorageSettingsActivity">

            <intent-filter android:priority="1">

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

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

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

            </intent-filter>

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.UsbSettings" />

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

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

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

                android:value="true" />

        </activity>



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

        <activity-alias android:name="UsbSettings"

                  android:exported="true"

res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,7 @@ 
    <string name="memory_performance" msgid="5661005192284103281">"Werkverrigting"</string>

    <string name="total_memory" msgid="2017287600738630165">"Totale geheue"</string>

    <string name="average_used" msgid="5338339266517245782">"Gemiddeld gebruik (%)"</string>

    <string name="free_memory" msgid="4003936141603549746">"Gratis"</string>

    <string name="free_memory" msgid="4003936141603549746">"Beskikbaar"</string>

    <string name="memory_usage_apps" msgid="5650192998273294098">"Geheue wat deur programme gebruik word"</string>

    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">

      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> programme het geheue gebruik in die afgelope <xliff:g id="DURATION_1">%2$s</xliff:g></item>

res/values-az-rAZ/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,7 @@ 
    <string name="memory_performance" msgid="5661005192284103281">"İş göstəricisi"</string>

    <string name="total_memory" msgid="2017287600738630165">"Ümumi yaddaş"</string>

    <string name="average_used" msgid="5338339266517245782">"Orta istifadə (%)"</string>

    <string name="free_memory" msgid="4003936141603549746">"Ödənişsiz"</string>

    <string name="free_memory" msgid="4003936141603549746">"Boş"</string>

    <string name="memory_usage_apps" msgid="5650192998273294098">"Tətbiq tərəfindən istifadə olunmuş yaddaş"</string>

    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">

      <item quantity="other">Son <xliff:g id="DURATION_1">%2$s</xliff:g> ərzində yaddaşı <xliff:g id="COUNT">%1$d</xliff:g> tətbiq istifadə edib</item>

res/values-bg/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,7 @@ 
    <string name="memory_performance" msgid="5661005192284103281">"Ефективност"</string>

    <string name="total_memory" msgid="2017287600738630165">"Общо памет"</string>

    <string name="average_used" msgid="5338339266517245782">"Средно използвана (%)"</string>

    <string name="free_memory" msgid="4003936141603549746">"Свободно"</string>

    <string name="free_memory" msgid="4003936141603549746">"Свободна памет"</string>

    <string name="memory_usage_apps" msgid="5650192998273294098">"Използвана от приложенията памет"</string>

    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">

      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> приложения са използвали памет през последния период от <xliff:g id="DURATION_1">%2$s</xliff:g></item>

res/values-bn-rBD/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,7 @@ 
    <string name="memory_performance" msgid="5661005192284103281">"কার্য-সম্পাদনা"</string>

    <string name="total_memory" msgid="2017287600738630165">"মোট মেমরি"</string>

    <string name="average_used" msgid="5338339266517245782">"ব্যবহৃত গড় (%)"</string>

    <string name="free_memory" msgid="4003936141603549746">"বিনামূল্যে"</string>

    <string name="free_memory" msgid="4003936141603549746">"খালি আছে"</string>

    <string name="memory_usage_apps" msgid="5650192998273294098">"অ্যাপ্লিকেশানগুলির দ্বারা ব্যবহৃত মেমরি"</string>

    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">

      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশান শেষ <xliff:g id="DURATION_1">%2$s</xliff:g> মেমরি ব্যবহার করেছে</item>