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

Commit 0763fa1c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-94878621-f29d-487c-a2aa-213f2be9d20c-for-git_oc-mr1-release-42... 

release-request-94878621-f29d-487c-a2aa-213f2be9d20c-for-git_oc-mr1-release-4222039 snap-temp-L91400000086509174

Change-Id: I354c36a3cabee0f39725b1b132774f8a583ee5e2
parents c12b711b 97ca7e47

res/layout/battery_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:minLines="2"

            android:textAppearance="@android:style/TextAppearance.Material.Small"/>



        <TextView

res/values-pt-rBR/strings.xml

+11 −19
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ 
    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>

    <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>

    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>

    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>

    <!-- no translation found for bluetooth_device_name_summary (6210079027471483881) -->

    <skip />

    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>

    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>

    <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -846,8 +847,7 @@ 
    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>

    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>

    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>

    <!-- no translation found for wifi_details_title (3471132676909349382) -->

    <skip />

    <string name="wifi_details_title" msgid="3471132676909349382">"Informações da rede"</string>

    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>

    <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>

    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -995,8 +995,7 @@ 
    <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>

    <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>

    <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>

    <!-- no translation found for search_clear_history (4196658962573162457) -->

    <skip />

    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>

    <string name="display_settings" msgid="7965901687241669598">"Tela"</string>

    <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>

    <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
@@ -2353,8 +2352,7 @@ 
    <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>

    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

    <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>

    <!-- no translation found for data_plan_usage_manage_plans_button_text (8997761990902708162) -->

    <skip />

    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerenciar planos"</string>

    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>

    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>

    <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2440,12 +2438,9 @@ 
    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>

    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi limitadas"</string>

    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes limitadas, ative o Wi-Fi."</string>

    <!-- no translation found for data_usage_metered_auto (1262028400911918865) -->

    <skip />

    <!-- no translation found for data_usage_metered_yes (9217539611385225894) -->

    <skip />

    <!-- no translation found for data_usage_metered_no (4025232961929071789) -->

    <skip />

    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>

    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Limitada"</string>

    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ilimitada"</string>

    <string name="data_usage_disclaimer" msgid="6887858149980673444">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>

    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>

    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
@@ -2848,8 +2843,7 @@ 
    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>

    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>

    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>

    <!-- no translation found for zen_mode_visual_interruptions_settings_title (7738713773934576844) -->

    <skip />

    <string name="zen_mode_visual_interruptions_settings_title" msgid="7738713773934576844">"Bloquear sinais visuais"</string>

    <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>

    <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil pessoal"</string>

    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são os mesmos para os perfis pessoal e de trabalho"</string>
@@ -3010,8 +3004,7 @@ 
    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>

    <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>

    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>

    <!-- no translation found for zen_mode_alarms_summary (3774926045611788635) -->

    <skip />

    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes são sempre prioridade e emitem som"</string>

    <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>

    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>

    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -3497,8 +3490,7 @@ 
    <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>

    <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>

    <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>

    <!-- no translation found for bluetooth_disabled (6244000672828617410) -->

    <skip />

    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</string>

    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>

    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>

    <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>

res/values-pt-rPT/strings.xml

+52 −53

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java

+13 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;

import android.util.Log;



import com.android.settings.R;

import com.android.settings.widget.SummaryUpdater;
@@ -29,9 +29,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; 
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;

import com.android.settingslib.bluetooth.LocalBluetoothManager;



import java.util.ArrayList;

import java.util.Collection;

import java.util.List;

import java.util.Set;



/**
@@ -39,6 +37,7 @@ import java.util.Set; 
 * bluetooth summary info.

 */

public final class BluetoothSummaryUpdater extends SummaryUpdater implements BluetoothCallback {

    private static final String TAG = "BluetoothSummaryUpdater";



    private final LocalBluetoothManager mBluetoothManager;

    private final LocalBluetoothAdapter mBluetoothAdapter;
@@ -58,6 +57,9 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu 
    public void onBluetoothStateChanged(int bluetoothState) {

        mEnabled = bluetoothState == BluetoothAdapter.STATE_ON

            || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;

        if (!mEnabled) {

            mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;

        }

        notifyChangeIfNeeded();

    }
@@ -161,7 +163,6 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu 
        if (devices == null || devices.isEmpty()) {

            return null;

        }



        for (BluetoothDevice device : devices) {

            if (device.isConnected()) {

                deviceName = device.getName();
@@ -171,7 +172,14 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu 
                }

            }

        }



        if (deviceName == null) {

            Log.w(TAG, "getConnectedDeviceSummary, deviceName is null, numBondedDevices="

                    + devices.size());

            for (BluetoothDevice device : devices) {

                Log.w(TAG, "getConnectedDeviceSummary, device=" + device.getName() + "["

                        + device.getAddress() + "]" + ", isConnected=" + device.isConnected());

            }

        }

        return count > 1 ? mContext.getString(R.string.bluetooth_connected_multiple_devices_summary)

                : mContext.getString(R.string.bluetooth_connected_summary, deviceName);

    }

src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java

+20 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
package com.android.settings.display;



import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;
@@ -21,8 +22,12 @@ import android.support.v14.preference.SwitchPreference; 
import android.support.v7.preference.Preference;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.search.DatabaseIndexingUtils;

import com.android.settings.search.InlineSwitchPayload;

import com.android.settings.search.ResultPayload;

import com.android.settingslib.core.AbstractPreferenceController;



import static android.provider.Settings.Secure.DOZE_ENABLED;
@@ -32,6 +37,9 @@ public class AmbientDisplayNotificationsPreferenceController extends 
        AbstractPreferenceController implements PreferenceControllerMixin,

        Preference.OnPreferenceChangeListener {



    private final int ON = 1;

    private final int OFF = 0;



    @VisibleForTesting

    static final String KEY_AMBIENT_DISPLAY_NOTIFICATIONS = "ambient_display_notification";

    private static final int MY_USER = UserHandle.myUserId();
@@ -67,7 +75,7 @@ public class AmbientDisplayNotificationsPreferenceController extends 
    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        boolean value = (Boolean) newValue;

        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? 1 : 0);

        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? ON : OFF);

        return true;

    }
@@ -75,4 +83,15 @@ public class AmbientDisplayNotificationsPreferenceController extends 
    public boolean isAvailable() {

        return mConfig.pulseOnNotificationAvailable();

    }



    @Override

    public ResultPayload getResultPayload() {

        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,

                AmbientDisplaySettings.class.getName(), KEY_AMBIENT_DISPLAY_NOTIFICATIONS,

                mContext.getString(R.string.ambient_display_screen_title));



        return new InlineSwitchPayload(Settings.Secure.DOZE_ENABLED,

                ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),

                ON /* defaultValue */);

    }

}