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

Commit 31ed7f33 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging ub-launcher3-master, build 5211209 

Test: manual

Bug: 111698021
Bug: 111699315
Bug: 111850268
Bug: 111939693
Bug: 117532945
Bug: 118118435
Bug: 118846684
Bug: 119884907
Bug: 120255489
Bug: 120505990
Bug: 120638555
Bug: 120736782
Bug: 120901833
Bug: 120997004
Bug: 121044483
Bug: 121048571
Bug: 121362965
Bug: 121414492

Change-Id: I9f6552a84d981595c9a6105413cd04177725b16d
parents 30ba96db 0a9261b3

AndroidManifest-common.xml

+0 −10
Original line number Diff line number Diff line
@@ -132,16 +132,6 @@ 
            </intent-filter>

        </activity>



        <!-- TODO: Remove -->

        <activity android:name="com.android.launcher3.util.MyActivity"

            android:theme="@style/AppTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!--

        Should point to the content provider which can be used to dump Launcher3 compatible

        worspace configuration to the dump's file descriptor by using launcher_dump.proto

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

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

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>

    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.

SecondaryDisplayLauncher/res/values-af/strings.xml

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

<!-- 

/*

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

*/

 -->



<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="8116646702313548897">"SecondaryDisplayLauncher"</string>

    <string name="couldnt_launch" msgid="7873588052226763866">"Kon nie die aktiwiteit begin nie"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"Voeg programkortpad by"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"Stel muurpapier"</string>

</resources>

SecondaryDisplayLauncher/res/values-am/strings.xml

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

<!-- 

/*

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

*/

 -->



<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="8116646702313548897">"SecondaryDisplayLauncher"</string>

    <string name="couldnt_launch" msgid="7873588052226763866">"እንቅስቃሴውን ማስጀመር አልተቻለም"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"የመተግበሪያ አቋራጭ ያክሉ"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"ልጣፍ አዘጋጅ"</string>

</resources>

SecondaryDisplayLauncher/res/values-ar/strings.xml

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

<!-- 

/*

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

*/

 -->



<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="8116646702313548897">"SecondaryDisplayLauncher"</string>

    <string name="couldnt_launch" msgid="7873588052226763866">"تعذَّر تشغيل النشاط."</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"إضافة اختصار التطبيق"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"تعيين الخلفية"</string>

</resources>