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

Commit 9343134e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release-41...

release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release-4198291 snap-temp-L50900000084068812

Change-Id: I84c6494fbfdf2c00089c238c8622edb3229c991b
parents 7bbf0c70 5984c71a
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,24 @@
                android:value="com.android.settings.CryptKeeperSettings" />
        </activity>

        <activity android:name="Settings$DataPlanUsageSummaryActivity"
                android:label="@string/data_usage_summary_title"
                android:icon="@drawable/ic_settings_data_usage"
                android:taskAffinity="">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <intent-filter android:priority="10">
                <action android:name="com.android.settings.action.SETTINGS" />
            </intent-filter>
            <meta-data android:name="com.android.settings.category"
                    android:value="com.android.settings.category.ia.wireless" />
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                    android:value="com.android.settings.datausage.DataPlanUsageSummary" />
        </activity>

        <activity android:name="Settings$DataUsageSummaryActivity"
                android:label="@string/data_usage_summary_title"
                android:icon="@drawable/ic_settings_data_usage"
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 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.
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0"
        android:tint="?android:attr/colorControlNormal">
    <path
        android:fillColor="#FF000000"
        android:pathData="M9.01,14L2,14v2h7.01v3L13,15l-3.99,-4v3zM14.99,13v-3L22,10L22,8h-7.01L14.99,5L11,9l3.99,4z"/>
</vector>
+3 −2
Original line number Diff line number Diff line
@@ -4304,8 +4304,6 @@
    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
    <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>
    <!-- Summary text for accessibility service preferences, or preferences including a short description (eg. "ON / High accuracy mode"). -->
    <string name="preference_summary_default_combination"><xliff:g id="state" example="ON">%1$s</xliff:g> / <xliff:g id="description" example="High accuracy mode">%2$s</xliff:g></string>
    <!-- Preference's state when enabled. Note: UPPERCASE -->
    <string name="accessibility_summary_state_enabled">ON</string>
    <!-- Preference's state when disabled. Note: UPPERCASE -->
@@ -7762,6 +7760,9 @@
    <!-- Settings item summary for USB preference when set to entering MIDI mode [CHAR LIMIT=NONE] -->
    <string name="usb_summary_MIDI">Using device as MIDI</string>
    <!-- Settings item title for SMS Mirroring preference [CHAR LIMIT=35] -->
    <string name="sms_mirroring_pref">SMS Mirroring</string>
    <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
    <string name="background_check_pref">Background check</string>
+8 −2
Original line number Diff line number Diff line
@@ -38,11 +38,17 @@
        android:icon="@drawable/ic_android"
        android:order="-4"/>

    <Preference
        android:key="sms_mirroring"
        android:title="@string/sms_mirroring_pref"
        android:icon="@drawable/ic_compare_arrows_24dp"
        android:order="-3"/>

    <Preference
        android:key="usb_mode"
        android:title="@string/usb_pref"
        android:icon="@drawable/ic_usb"
        android:order="-3">
        android:order="-2">
        <intent android:action="android.intent.action.MAIN"
                android:targetPackage="com.android.settings"
                android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class Settings extends SettingsActivity {
    public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
    public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
    public static class DataPlanUsageSummaryActivity extends SettingsActivity { /* empty */ }
    public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
    public static class MobileDataUsageListActivity extends SettingsActivity { /* empty */ }
    public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }
Loading