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

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

release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-41... 

release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-4124666 snap-temp-L64200000076596327

Change-Id: Ib06bb4ff5ce9dcf9ed4f65fb987d636dd52b41dd
parents 6001c827 c225ee4e

res/layout-sw320dp/settings_entity_header.xml

0 → 100644
+109 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2016 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.

  -->



<!-- Entity header -->

<RelativeLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingTop="24dp"

    android:paddingBottom="24dp">



    <ImageView

        android:id="@+id/entity_header_icon"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="fitXY"

        android:layout_gravity="center_horizontal"

        android:antialias="true" />



    <LinearLayout

        android:id="@+id/entity_header_links"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:orientation="vertical">



        <ImageButton

            android:id="@android:id/button1"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@drawable/ic_settings_24dp"

            android:tint="?android:attr/colorAccent" />



        <ImageButton

            android:id="@android:id/button2"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@null"

            android:tint="?android:attr/colorAccent" />



    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_toEndOf="@id/entity_header_icon"

        android:layout_toStartOf="@id/entity_header_links"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:orientation="vertical">



        <TextView

            android:id="@+id/entity_header_title"

            style="@style/TextAppearance.EntityHeaderTitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:singleLine="false"

            android:ellipsize="marquee"

            android:gravity="start"

            android:textDirection="locale"

            android:paddingTop="8dp" />



        <TextView

            android:id="@+id/install_type"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="start"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="@android:style/TextAppearance.Material.Body1"

            android:textColor="?android:attr/textColorSecondary" />



        <TextView

            android:id="@+id/entity_header_summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="start"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="@android:style/TextAppearance.Material.Body1"

            android:textColor="?android:attr/textColorSecondary" />



    </LinearLayout>



</RelativeLayout>
 
 No newline at end of file

res/layout/battery_usage_graph.xml

+7 −0
Original line number Diff line number Diff line
@@ -43,4 +43,11 @@ 
        android:gravity="end"

        settings:textColor="?android:attr/textColorSecondary" />



    <TextView

        android:id="@+id/bottom_summary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:textAppearance="?android:attr/textAppearanceSmall" />



</LinearLayout>

res/layout/settings_entity_header.xml

+45 −50
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2016 The Android Open Source Project

  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.
@@ -16,63 +16,31 @@ 
  -->



<!-- Entity header -->

<RelativeLayout

<LinearLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="0dp"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingTop="24dp"

    android:paddingBottom="24dp">

    android:paddingBottom="32dp"

    android:orientation="horizontal">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/entity_header_icon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_marginBottom="16dp"

            android:scaleType="fitXY"

        android:layout_gravity="center_horizontal"

            android:antialias="true" />



    <LinearLayout

        android:id="@+id/entity_header_links"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:orientation="vertical">



        <ImageButton

            android:id="@android:id/button1"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@drawable/ic_settings_24dp"

            android:tint="?android:attr/colorAccent" />



        <ImageButton

            android:id="@android:id/button2"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@null"

            android:tint="?android:attr/colorAccent" />



    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_toEndOf="@id/entity_header_icon"

        android:layout_toStartOf="@id/entity_header_links"

        android:paddingStart="24dp"

        android:paddingEnd="24dp"

        android:orientation="vertical">



        <TextView

            android:id="@+id/entity_header_title"

            style="@style/TextAppearance.EntityHeaderTitle"
@@ -81,8 +49,7 @@ 
            android:singleLine="false"

            android:ellipsize="marquee"

            android:gravity="start"

            android:textDirection="locale"

            android:paddingTop="8dp" />

            android:textDirection="locale" />



        <TextView

            android:id="@+id/install_type"
@@ -107,4 +74,32 @@ 


    </LinearLayout>



</RelativeLayout>
 
    <LinearLayout

        android:id="@+id/entity_header_links"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <ImageButton

            android:id="@android:id/button1"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@drawable/ic_settings_24dp"

            android:tint="?android:attr/colorAccent" />



        <ImageButton

            android:id="@android:id/button2"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@null"

            android:tint="?android:attr/colorAccent" />



    </LinearLayout>



</LinearLayout>

res/layout/storage_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ 
        android:layout_marginStart="72dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:visibility="gone"

        android:max="100"

        style="?android:attr/progressBarStyleHorizontal" />

res/values-af/strings.xml

+25 −18
Original line number Diff line number Diff line
@@ -533,16 +533,20 @@ 
    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>

    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"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_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Jou data sal uitgevee word"</string>

    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie toestel se data uitgevee word"</string>

    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie toestel se data uitgevee word"</string>

    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie toestel se data uitgevee word"</string>

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

    <skip />

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

    <skip />

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

    <skip />

    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie gebruiker uitgevee word"</string>

    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie gebruiker uitgevee word"</string>

    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie gebruiker uitgevee word"</string>

    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal jou werkprofiel en sy data uitgevee word"</string>

    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal jou werkprofiel en sy data uitgevee word"</string>

    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal jou werkprofiel en sy data uitgevee word"</string>

    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Te veel verkeerde pogings. Hierdie toestel se data sal uitgevee word."</string>

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

    <skip />

    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Te veel verkeerde pogings. Hierdie gebruiker sal uitgevee word."</string>

    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Te veel verkeerde pogings. Hierdie werkprofiel en sy data sal uitgevee word."</string>

    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Maak toe"</string>
@@ -1319,10 +1323,8 @@ 
    <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>

    <!-- no translation found for reset_dashboard_title (6254873816990678620) -->

    <skip />

    <!-- no translation found for reset_network_title (6166025966016873843) -->

    <skip />

    <string name="reset_dashboard_title" msgid="6254873816990678620">"Stel opsies terug"</string>

    <string name="reset_network_title" msgid="6166025966016873843">"Stel Wi-Fi, mobiel en Bluetooth terug"</string>

    <string name="reset_network_desc" msgid="5547979398298881406">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>

    <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>

    <string name="reset_network_final_desc" msgid="6388371121099245116">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling ontdoen nie!"</string>
@@ -1330,8 +1332,7 @@ 
    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>

    <string name="network_reset_not_available" msgid="7188610385577164676">"Netwerkterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>

    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellings is teruggestel"</string>

    <!-- no translation found for master_clear_title (6617679904229218425) -->

    <skip />

    <string name="master_clear_title" msgid="6617679904229218425">"Vee alle data uit (Fabriekterugstelling)"</string>

    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">

      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> rekeninge sal teruggestel word</item>

      <item quantity="one">1 rekening sal teruggestel word</item>
@@ -1805,6 +1806,8 @@ 
    <string name="accessibility_settings_summary" msgid="981260486011624939">"Skermlesers, skerm, interaksiekontroles"</string>

    <string name="vision_settings_title" msgid="4204111425716868288">"Visie-instellings"</string>

    <string name="vision_settings_description" msgid="5679491180156408260">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>

    <!-- no translation found for vision_settings_suggestion_title (917294957154878441) -->

    <skip />

    <string name="screen_reader_category_title" msgid="7739154903913400641">"Skermlesers"</string>

    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Oudio en teks op skerm"</string>

    <string name="display_category_title" msgid="685461049938269166">"Vertoon"</string>
@@ -2083,7 +2086,8 @@ 
    <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>

    <string name="battery_last_full_charge" msgid="7151251641099019361">"Laas volgelaai"</string>

    <string name="battery_footer_summary" msgid="4701358808575132647">"Oorblywende batterytyd is benaderd en kan op grond van gebruik verander"</string>

    <!-- no translation found for battery_footer_summary (2725134194905566773) -->

    <skip />

    <string name="battery_detail_foreground" msgid="3350401514602032183">"Terwyl dit aktief gebruik word"</string>

    <string name="battery_detail_background" msgid="1929644393553768999">"In die agtergrond"</string>

    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batterygebruik"</string>
@@ -2884,8 +2888,10 @@ 
    <string name="notification_importance_low_title" msgid="8131254047772814309">"Middelmatig"</string>

    <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>

    <string name="notification_importance_high_title" msgid="3058778300264746473">"Dringend"</string>

    <string name="allow_sound" msgid="1820188704793497324">"Laat klank toe"</string>

    <string name="show_silently_summary" msgid="7616604629123146565">"Moenie \'n geluid maak, vibreer of hierdie kennisgewings vir \'n kort tyd op die huidige skerm wys nie."</string>

    <!-- no translation found for allow_interruption (7136150018111848721) -->

    <skip />

    <!-- no translation found for allow_interruption_summary (7870159391333957050) -->

    <skip />

    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Min belang"</string>

    <string name="notification_channel_summary_low" msgid="322317684244981244">"Middelmatige belang"</string>

    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Groot belang"</string>
@@ -3360,6 +3366,8 @@ 
    <string name="condition_bg_data_summary" msgid="656957852895282228">"Agtergronddata is net deur Wi-Fi beskikbaar. Dit kan sommige programme of dienste beïnvloed wanneer Wi-Fi nie beskikbaar is nie."</string>

    <string name="condition_work_title" msgid="7293722361184366648">"Werkprofiel is af"</string>

    <string name="condition_work_summary" msgid="7543202177571590378">"Programme, agtergrondsinkronisering en ander kenmerke wat met jou werkprofiel verband hou, is afgeskakel."</string>

    <string name="night_display_suggestion_title" msgid="6602129097059325291">"Stel Aandbeligting-skedule"</string>

    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint skerm geelbruin om jou te help om aan die slaap te raak"</string>

    <string name="condition_night_display_title" msgid="5599814941976856183">"Aandbeligting is aan"</string>

    <string name="condition_night_display_summary" msgid="5443722724310650381">"Skerm is geelbruin getint. Dit kan jou help om aan die slaap te raak."</string>

    <string name="suggestions_title" msgid="7280792342273268377">"Voorstelle"</string>
@@ -3378,10 +3386,8 @@ 
    <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>

    <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>

    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</string>

    <!-- no translation found for camera_hal_hdrplus_switch (8377365197105267466) -->

    <skip />

    <!-- no translation found for camera_hal_hdrplus_toast (2063703797270055299) -->

    <skip />

    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera-HAL-HDR+"</string>

    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Herselflaai toestel om Kamera-HAL-HDR+-verandering toe te pas"</string>

    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>

    <string name="usage" msgid="2977875522080448986">"Gebruik"</string>

    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobieledatagebruik"</string>
@@ -3544,7 +3550,8 @@ 
    <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="4033736910560673690">"Gebaarkortpaaie"</string>

    <!-- no translation found for gesture_preference_title (8155668859866666018) -->

    <skip />

    <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>