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

Commit 578f8d64 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11944020 from adf8d5cf to 24Q3-release 

Change-Id: I19da2fa3f3221416dba536bce4fa91e398c26aaf
parents 27e057c7 adf8d5cf

PREUPLOAD.cfg

+8 −1
Original line number Diff line number Diff line
@@ -14,12 +14,19 @@ rustfmt = true 
[Builtin Hooks Options]

bpfmt = -s

clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,hpp

google_java_format= --sort-imports

ktfmt = --kotlinlang-style

rustfmt = --config-path=rustfmt.toml



[Hook Scripts]

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}

# google_java_format only fixes indentation. This has Android specific checks like "m" prefix.

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  --config_xml checkstyle.xml

                  -fw android/app/src/com/android/bluetooth/

                      android/app/lib/mapapi/com/android/bluetooth/mapapi/

                      android/app/tests/src/com/android/bluetooth/

                      framework/

                      service/

yapf_hook = ./system/tools/scripts/yapf_checker.py



[Tool Paths]

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

+2 −4
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ 
    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"يتذكر جهازك الاحتفاظ بتقنية البلوتوث مفعَّلة في \"وضع الطيران\". يمكنك إيقاف تقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلها."</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"‏تظل شبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين."</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"‏يتذكر جهازك الاحتفاظ بشبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين في \"وضع الطيران\". يمكنك إيقاف شبكة Wi‑Fi وتقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلهما."</string>

    <!-- no translation found for bluetooth_enabled_auto_on_title (8983664142805050578) -->

    <skip />

    <!-- no translation found for bluetooth_enabled_auto_on_message (2790514825041114851) -->

    <skip />

    <string name="bluetooth_enabled_auto_on_title" msgid="8983664142805050578">"تمّت إعادة تفعيل البلوتوث"</string>

    <string name="bluetooth_enabled_auto_on_message" msgid="2790514825041114851">"يمكنك تغيير هذا الإعداد في أي وقت من خلال \"الإعدادات\""</string>

    <string name="bluetooth_notification_group" msgid="7251886707585872194">"تغيير حالة تفعيل أو إيقاف البلوتوث تلقائيًا"</string>

</resources>

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

+2 −4
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ 
    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"আপোনাৰ ডিভাইচটোৱে এয়াৰপ্লেন ম’ডত ব্লুটুথ অন ৰাখিবলৈ মনত ৰাখে। আপুনি যদি ব্লুটুথ অন হৈ থকাটো নিবিচাৰে, তেন্তে ইয়াক অফ কৰক।"</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"ৱাই-ফাই আৰু ব্লুটুথ অন হৈ থাকে"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"আপোনাৰ ডিভাইচটোৱে এয়াৰপ্লেন ম’ডত ৱাই-ফাই আৰু ব্লুটুথ অন ৰাখিবলৈ মনত ৰাখে। আপুনি ৱাই-ফাই আৰু ব্লুটুথ অন হৈ থকাটো নিবিচাৰিলে সেইবোৰ অফ কৰক।"</string>

    <!-- no translation found for bluetooth_enabled_auto_on_title (8983664142805050578) -->

    <skip />

    <!-- no translation found for bluetooth_enabled_auto_on_message (2790514825041114851) -->

    <skip />

    <string name="bluetooth_enabled_auto_on_title" msgid="8983664142805050578">"ব্লুটুথ পুনৰ অন কৰা হৈছে"</string>

    <string name="bluetooth_enabled_auto_on_message" msgid="2790514825041114851">"আপুনি ছেটিঙত যিকোনো সময়তে এইটো সলনি কৰিব পাৰে"</string>

    <string name="bluetooth_notification_group" msgid="7251886707585872194">"ব্লুটুথৰ স্বয়ংক্ৰিয় স্থিতি সলনি হোৱা"</string>

</resources>

android/app/res/values-b+sr+Latn/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ 
    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"Uređaj pamti da ne treba da isključuje Bluetooth u režimu rada u avionu. Isključite Bluetooth ako ne želite da ostane uključen."</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"WiFi i Bluetooth ostaju uključeni"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"Uređaj pamti da ne treba da isključuje WiFi i Bluetooth u režimu rada u avionu. Isključite WiFi i Bluetooth ako ne želite da ostanu uključeni."</string>

    <!-- no translation found for bluetooth_enabled_auto_on_title (8983664142805050578) -->

    <skip />

    <!-- no translation found for bluetooth_enabled_auto_on_message (2790514825041114851) -->

    <skip />

    <string name="bluetooth_enabled_auto_on_title" msgid="8983664142805050578">"Bluetooth je ponovo uključen"</string>

    <string name="bluetooth_enabled_auto_on_message" msgid="2790514825041114851">"To uvek možete da promenite u Podešavanjima"</string>

    <string name="bluetooth_notification_group" msgid="7251886707585872194">"Automatski status Bluetooth-a je promenjen"</string>

</resources>

android/app/res/values-en-rAU/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ 
    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on."</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"Wi-Fi and Bluetooth stay on"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on."</string>

    <!-- no translation found for bluetooth_enabled_auto_on_title (8983664142805050578) -->

    <skip />

    <!-- no translation found for bluetooth_enabled_auto_on_message (2790514825041114851) -->

    <skip />

    <string name="bluetooth_enabled_auto_on_title" msgid="8983664142805050578">"Bluetooth turned back on"</string>

    <string name="bluetooth_enabled_auto_on_message" msgid="2790514825041114851">"You can change this at any time in Settings"</string>

    <string name="bluetooth_notification_group" msgid="7251886707585872194">"Bluetooth automatic state change"</string>

</resources>