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

Commit c7f23ee4 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR1 

Merged-In: Ia7114399bc3b5ac8ab5284ba66160813f46b25e7
Bug: 315507370
Change-Id: Id9ab9f9e253c144437de0e0ad18203df27a4e83a
parents 16336062 0b09f8c4

android/BluetoothLegacyMigration/res/drawable/ic_bluetooth_share_icon.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

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

  -->

<!-- This drawable should only be used by the Bluetooth application for its share target icon. -->

<!-- The tint color is from https://www.bluetooth.com/develop-with-bluetooth/marketing-branding/ -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="#2285F8">



    <path

        android:fillColor="@android:color/white"

        android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L11,14.41V22h1l5.71-5.71L13.41,12L17.71,7.71z M13,5.83 l1.88,1.88L13,9.59V5.83z M14.88,16.29L13,18.17v-3.76L14.88,16.29z" />

</vector>

android/BluetoothLegacyMigration/res/mipmap-anydpi/bt_share.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

  <foreground>

    <inset

      android:drawable="@*android:drawable/ic_bluetooth_share_icon"

      android:drawable="@drawable/ic_bluetooth_share_icon"

      android:insetTop="25%"

      android:insetRight="25%"

      android:insetBottom="25%"

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static void callback_thread_event(bt_cb_thread_evt event) { 
    }

    vm->DetachCurrentThread();

    sHaveCallbackThread = false;

    callbackEnv = NULL;

  }

}

android/app/res/values-af/strings.xml

+3 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="2326164424236203271">"Bluetooth"</string>

    <string name="permlab_bluetoothShareManager" msgid="5297865456717871041">"Maak toegang aflaaibestuurder oop."</string>

    <string name="permdesc_bluetoothShareManager" msgid="1588034776955941477">"Gee aan die program toegang tot die BluetoothShare-bestuurder en om dit te gebruik om lêers oor te dra."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="5785922051395856524">"Voeg Bluetooth-toesteltoegang by aanvaarlys."</string>
@@ -131,9 +130,9 @@ 
    <string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"Lêers groter as 4 GB kan nie oorgedra word nie"</string>

    <string name="bluetooth_connect_action" msgid="2319449093046720209">"Koppel aan Bluetooth"</string>

    <string name="bluetooth_enabled_apm_title" msgid="6914461147844949044">"Bluetooth is aan in vliegtuigmodus"</string>

    <string name="bluetooth_enabled_apm_message" msgid="6168686193308136881">"As jy Bluetooth aangeskakel hou, sal jou toestel onthou om dit aan te hou wanneer jy weer in vliegtuigmodus is"</string>

    <string name="bluetooth_enabled_apm_message" msgid="8409900562494838113">"As jy Bluetooth aangeskakel hou, sal jou foon onthou om dit aan te hou wanneer jy weer in vliegtuigmodus is"</string>

    <string name="bluetooth_stays_on_title" msgid="39720820955212918">"Bluetooth bly aan"</string>

    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"Jou toestel onthou om Bluetooth aan te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie."</string>

    <string name="bluetooth_stays_on_message" msgid="7142453371222249965">"Jou foon onthou om Bluetooth aangeskakel te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie."</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"Wi-fi en Bluetooth bly aan"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"Jou toestel onthou om wi‑fi en Bluetooth aan te hou in vliegtuigmodus. Skakel wi-fi en Bluetooth af as jy nie wil hê dit moet aan bly nie."</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="2390749828997719812">"Jou foon onthou om wi‑fi en Bluetooth aan te hou in vliegtuigmodus. Skakel wi-fi en Bluetooth af as jy nie wil het hulle moet aan bly nie."</string>

</resources>

android/app/res/values-af/strings_pbap.xml

+0 −2
Original line number Diff line number Diff line
@@ -13,6 +13,4 @@ 
    <string name="localPhoneName" msgid="9119254982537191352">"My naam"</string>

    <string name="defaultnumber" msgid="5348816189286607406">"000000"</string>

    <string name="pbap_notification_group" msgid="4215789331721465381">"Bluetooth-kontakdeling"</string>

    <string name="phonebook_advance_feature_support" msgid="8129553051734505128">"Foonboek se gevorderde kenmerk word gesteun"</string>

    <string name="repair_for_adv_phonebook_feature" msgid="3489797973131684927">"Bind weer saam met Foonboek se gevorderde kenmerk"</string>

</resources>