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

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

release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release-40... 

release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release-4057695 snap-temp-L92600000069427650

Change-Id: I4a3fa780247cb8cd4d566511e957adda49ba17aa
parents f49bf49f 83067918

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v13 \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference



LOCAL_JAVA_LIBRARIES := \

res/layout/choose_lock_pattern_common.xml

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"
@@ -36,6 +35,7 @@ 
        android:orientation="vertical">



        <LinearLayout

            style="@style/SuwGlifHeaderContainer"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">
@@ -57,6 +57,7 @@ 


        <!-- takes up all space above button bar at bottom -->

        <LinearLayout

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

res/layout/dashboard_header_spacer.xml

0 → 100644
+25 −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.

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="@dimen/search_bar_margin">

    <View

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"/>

</LinearLayout>

res/layout/settings_main_dashboard.xml

+28 −4
Original line number Diff line number Diff line
@@ -18,7 +18,31 @@ 
-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:layout_width="match_parent">

    <FrameLayout

        android:id="@+id/main_content"

        android:layout_height="match_parent"

        android:layout_width="match_parent"/>

    <android.support.v7.widget.CardView

        android:id="@+id/search_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="@dimen/search_bar_margin"

        app:cardCornerRadius="2dp"

        app:cardBackgroundColor="?android:attr/colorBackground"

        app:cardElevation="2dp">

        <Toolbar

            android:id="@+id/search_action_bar"

            android:layout_width="match_parent"

             />
 
            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/search_bar_negative_margin"

            android:background="?android:attr/selectableItemBackground"

            android:navigationIcon="@drawable/ic_search_24dp"

            android:title="@string/search_menu"

            android:titleTextAppearance="?android:attr/subtitleTextAppearance"

            android:titleTextColor="?android:attr/textColorHint"

            android:theme="?android:attr/actionBarTheme"/>

    </android.support.v7.widget.CardView>

</FrameLayout>

res/values-af/strings.xml

+57 −32
Original line number Diff line number Diff line
@@ -162,10 +162,8 @@ 
    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-toegangversoek"</string>

    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hê tot jou SIM-kaart. As jy toegang tot jou SIM-kaart verleen, sal die dataverbinding op jou toestel vir die duur van die verbinding gedeaktiveer wees. Verleen toegang aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>

    <string name="bluetooth_device_name_summary" msgid="4418784300859596202">"Vir ander toestelle sigbaar as <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>

    <!-- no translation found for bluetooth_paired_device_title (8638994696317952019) -->

    <skip />

    <!-- no translation found for bluetooth_pairing_page_title (5218444163161190061) -->

    <skip />

    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>

    <string name="bluetooth_pairing_page_title" msgid="5218444163161190061">"Bind Bluetooth-toestel saam"</string>

    <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>

    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -458,7 +456,8 @@ 
    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>

    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>

    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies jou rugsteunmetode vir skermsluiting"</string>

    <!-- no translation found for setup_lock_settings_options_button_label (8511153243629402929) -->

    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Skermslotopsies"</string>

    <!-- no translation found for setup_lock_settings_options_dialog_title (5058207955455973917) -->

    <skip />

    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>

    <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Onmiddellik ná slaap"</string>
@@ -530,13 +529,36 @@ 
    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>

    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>

    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>

    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probeer weer. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>

    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Laaste poging"</string>

    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"As jy met hierdie poging \'n verkeerde werkpatroon invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>

    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"As jy met hierdie poging \'n verkeerde werk-PIN invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>

    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"As jy met hierdie poging \'n verkeerde werkwagwoord invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>

    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Te veel verkeerde pogings. Jou werkprofiel en geassosieerde data sal van hierdie toestel af verwyder word."</string>

    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Maak toe"</string>

    <!-- no translation found for lock_failed_attempts_before_wipe (2219711062197089783) -->

    <skip />

    <!-- no translation found for lock_last_attempt_before_wipe_warning_title (4277765862798876826) -->

    <skip />

    <!-- no translation found for lock_last_pattern_attempt_before_wipe_device (4999108263936246210) -->

    <skip />

    <!-- no translation found for lock_last_pin_attempt_before_wipe_device (2191214314973933300) -->

    <skip />

    <!-- no translation found for lock_last_password_attempt_before_wipe_device (6526655065466746563) -->

    <skip />

    <!-- no translation found for lock_last_pattern_attempt_before_wipe_user (7851504071368235547) -->

    <skip />

    <!-- no translation found for lock_last_pin_attempt_before_wipe_user (4049024921333961715) -->

    <skip />

    <!-- no translation found for lock_last_password_attempt_before_wipe_user (4660886542496781672) -->

    <skip />

    <!-- no translation found for lock_last_pattern_attempt_before_wipe_profile (2437716252059050291) -->

    <skip />

    <!-- no translation found for lock_last_pin_attempt_before_wipe_profile (5799931839127476913) -->

    <skip />

    <!-- no translation found for lock_last_password_attempt_before_wipe_profile (6786586046975042158) -->

    <skip />

    <!-- no translation found for lock_failed_attempts_now_wiping_device (1951676829299522277) -->

    <skip />

    <!-- no translation found for lock_failed_attempts_now_wiping_user (6188180643494518001) -->

    <skip />

    <!-- no translation found for lock_failed_attempts_now_wiping_profile (1745475043685915442) -->

    <skip />

    <!-- no translation found for lock_failed_attempts_now_wiping_dialog_dismiss (8246716090548717312) -->

    <skip />

    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Moet minstens <xliff:g id="COUNT">%d</xliff:g> karakters lank wees"</string>

    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Die PIN moet minstens <xliff:g id="COUNT">%d</xliff:g> syfers lank wees"</string>

    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
@@ -1285,6 +1307,8 @@ 
    <string name="error_apn_empty" msgid="4932211013600863642">"Die APN kan nie leeg wees nie."</string>

    <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-veld moet 3 syfers wees."</string>

    <string name="error_mnc_not23" msgid="8418177072458379439">"Die MNC-veld moet uit 2 of 3 syfers bestaan."</string>

    <!-- no translation found for error_adding_apn_type (4181334016628549645) -->

    <skip />

    <string name="restore_default_apn" msgid="8178010218751639581">"Laai verstek APN-instellings terug"</string>

    <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>

    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Terugstel van verstek APN-instellings voltooi"</string>
@@ -1506,8 +1530,10 @@ 
    <string name="applications_settings_header" msgid="1014813055054356646">"Program-instellings"</string>

    <string name="install_applications" msgid="4872012136210802181">"Onbekende bronne"</string>

    <string name="install_applications_title" msgid="4987712352256508946">"Laat alle programbronne toe"</string>

    <string name="recent_app_category_title" msgid="8449656234283016115">"Programme wat onlangs gebruik is"</string>

    <string name="see_all_apps_title" msgid="1810966300215671576">"Sien alle programme"</string>

    <!-- no translation found for recent_app_category_title (7212519567652392872) -->

    <skip />

    <!-- no translation found for see_all_apps_title (2428036869072119705) -->

    <skip />

    <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Jou tablet en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou tablet of verlies van data wat uit hul gebruik kan spruit."</string>

    <string name="install_all_warning" product="default" msgid="1952257127370115988">"Jou foon en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou foon of verlies van data wat uit hul gebruik kan spruit."</string>

    <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
@@ -1872,7 +1898,6 @@ 
    <string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>

    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>

    <string name="touch_filtered_warning" msgid="8644034725268915030">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>

    <string name="window_obscured_warning" msgid="8711643931674708175">"Instellings kan nie op jou handeling reageer nie, omdat \'n ander program bo-oor hierdie opsies gewys word."</string>

    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>

    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Omdat jy \'n toeganklikheiddiens aangeskakel het, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>

    <string name="enable_service_pattern_reason" msgid="777577618063306751">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
@@ -1936,6 +1961,7 @@ 
    <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>

    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>

    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>

    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>

    <string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>

    <string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>

    <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
@@ -2028,8 +2054,7 @@ 
    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>

    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>

    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>

    <!-- no translation found for battery_screen_usage (6537658662149713585) -->

    <skip />

    <string name="battery_screen_usage" msgid="6537658662149713585">"Skermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>

    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>

    <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>

    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
@@ -2678,16 +2703,12 @@ 
      <item quantity="one">Wys %d versteekte item</item>

    </plurals>

    <string name="network_dashboard_title" msgid="4771589228992391573">"Netwerk en internet"</string>

    <!-- no translation found for network_dashboard_summary_mobile (3851083934739500429) -->

    <skip />

    <!-- no translation found for network_dashboard_summary_data_usage (3843261364705042212) -->

    <skip />

    <!-- no translation found for network_dashboard_summary_hotspot (8494210248613254574) -->

    <skip />

    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiel"</string>

    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>

    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"warmkol"</string>

    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Gekoppelde toestelle"</string>

    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>

    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (9106040742715366495) -->

    <skip />

    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>

    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programme en kennisgewings"</string>

    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Toestemmings, verstekprogramme"</string>

    <string name="account_dashboard_title" msgid="4936890821712178853">"Gebruikers en rekeninge"</string>
@@ -2809,7 +2830,8 @@ 
    <string name="configure_notification_settings" msgid="7616737397127242615">"Kennisgewings"</string>

    <string name="advanced_section_header" msgid="8833934850242546903">"Gevorderd"</string>

    <string name="profile_section_header" msgid="2320848161066912001">"Werkkennisgewings"</string>

    <string name="notification_badging_title" msgid="5125022693565388760">"Laat ikoonkentekens toe"</string>

    <!-- no translation found for notification_badging_title (5938709971403474078) -->

    <skip />

    <string name="notification_pulse_title" msgid="1905382958860387030">"Flikkerende lig"</string>

    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op die sluitskerm"</string>

    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
@@ -2882,14 +2904,16 @@ 
      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorieë is uitgevee</item>

      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategorie is uitgevee</item>

    </plurals>

    <string name="notification_badges" msgid="4468378071033143539">"Kennisgewingkentekens"</string>

    <string name="notification_toggle_on" msgid="650145396718191048">"Aan"</string>

    <string name="notification_toggle_off" msgid="2142010737190671762">"Af"</string>

    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>

    <string name="app_notification_block_summary" msgid="4744020456943215352">"Moet nooit hierdie kennisgewings wys nie"</string>

    <string name="notification_content_block_title" msgid="5854232570963006360">"Wys kennisgewings"</string>

    <string name="notification_content_block_summary" msgid="7746185794438882389">"Moet nooit kennisgewings in die skadu of op randtoestelle wys nie"</string>

    <string name="notification_badge_title" msgid="7734903868300369178">"Laat ikoonkenteken toe"</string>

    <!-- no translation found for notification_badge_title (6370122441168519809) -->

    <skip />

    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->

    <skip />

    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie Steur Nie"</string>

    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na \'Net prioriteit\' gestel is"</string>

    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
@@ -3117,8 +3141,8 @@ 
    <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>

    <string name="high_power_apps" msgid="3459065925679828230">"Batteryoptimalisering"</string>

    <string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>

    <string name="show_all_apps" msgid="1742726460081356745">"Wys alle programme"</string>

    <string name="hide_extra_apps" msgid="5568177134273528751">"Versteek ekstra programme"</string>

    <string name="show_all_apps" msgid="1512506948197818534">"Wys volle toestelgebruik"</string>

    <string name="hide_extra_apps" msgid="5016497281322459633">"Wys programgebruik"</string>

    <string name="power_high_usage_title" msgid="6027369425057347826">"Groot gebruik"</string>

    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">

      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> programme tree abnormaal op</item>
@@ -3473,7 +3497,7 @@ 
    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Outomaties"</string>

    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>

    <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Maak nou spasie beskikbaar"</string>

    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebare"</string>

    <string name="gesture_preference_title" msgid="4033736910560673690">"Gebaarkortpaaie"</string>

    <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Vinnige gebare om jou foon te beheer"</string>

    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Vinnige gebare om jou tablet te beheer"</string>

    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Vinnige gebare om jou toestel te beheer"</string>
@@ -3497,7 +3521,8 @@ 
    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou toestel om jou kennisgewings na te gaan."</string>

    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Lig op om kamera oop te maak"</string>

    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Lig jou foon op na \'n fotoneemposisie (landskap of portret) om die kamera outomaties oop te maak. Dit werk wanneer jou foon slaap of gesluit is."</string>

    <string name="camera_lift_trigger_suggestion_summary" msgid="3574391686649107540">"Neem foto\'s van die sluitskerm af"</string>

    <!-- no translation found for camera_lift_trigger_suggestion_summary (7209899898244722404) -->

    <skip />

    <string name="assist_gesture_title" msgid="7746563137898655539">"Bystandgebaar"</string>

    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>

    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitiwiteit"</string>