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

Unverified Commit 05d6b524 authored by Bruno Martins's avatar Bruno Martins Committed by Michael Bestas
Browse files

Trebuchet: Update default workspace 



Squash of commits 9eeb786a and c1835262.
Includes:

Author: Joey <joey@lineageos.org>
Date:   Fri Nov 1 11:56:19 2019 +0100

    Update default workspace

    Change-Id: I852edb6dda3e2030f97eb244ee35c1a647366901
    Signed-off-by: default avatarJoey <joey@lineageos.org>

Author: Arne Coucheron <arco68@gmail.com>
Date:   Sat Jan 11 01:57:25 2020 +0100

    Trebuchet: Replace LockClock widget with DeskClock

    Change-Id: Ic958dbabcd18ee02cbd8b7ea2513356d5a2e90de

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Thu Dec 3 16:07:35 2020 +0000

    Trebuchet: Update GMS packages in the default workspaces

    Google Play Music is dead. Parter GMS has been updated to reflect
    this change, so apply it here as well.

    Change-Id: I13ad48964d826413e825fabb3aa8f9316ca2594d

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Thu Dec 3 16:44:59 2020 +0000

    Trebuchet: Move Duo into Google folder as per GMS sample integration

    Change-Id: I588dd9092a2804ec197f6e0735f9f0bc43a0122f

Change-Id: I0ed2e193c8acbe52644412be82e906eab0cb5e30
parent bcea793c

res/values/lineage_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -16,4 +16,7 @@ 
<resources>

    <!-- Application name -->

    <string name="lineageos_app_name" translatable="false">Trebuchet</string>



    <!-- Folder titles -->

    <string name="google_folder_title" translatable="false">Google</string>

</resources>

res/xml/default_workspace_4x4.xml

+97 −13
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ 
        launcher:screen="2"

        launcher:x="2"

        launcher:y="0" >

        <favorite

            launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />

        <favorite launcher:uri="http://www.example.com/" />

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />

    </resolve>



    <resolve
@@ -55,33 +53,119 @@ 
         launcher:screen="3"

         launcher:x="3"

         launcher:y="0" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />

        <favorite launcher:uri="http://www.example.com/" />

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="4"

        launcher:x="4"

        launcher:y="0" >

        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />

        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />

    </resolve>



    <!-- Bottom row -->

    <resolve

    <!-- Screen 0 -->

    <appwidget

        launcher:packageName="com.google.android.googlequicksearchbox"

        launcher:className="com.google.android.googlequicksearchbox.SearchWidgetProvider"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0"

        launcher:spanX="4"

        launcher:spanY="1" />



    <appwidget

        launcher:packageName="com.android.deskclock"

        launcher:className="com.android.alarmclock.DigitalAppWidgetProvider"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="1"

        launcher:spanX="4"

        launcher:spanY="2" />



    <!-- Google folder -->

    <!-- Google, Gmail, Maps, YouTube, Drive, YouTube Music, Play Movies, Duo, Photos -->

    <folder

        launcher:title="@string/google_folder_title"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="3">

        <favorite

            launcher:packageName="com.google.android.googlequicksearchbox"

            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"/>

        <favorite

            launcher:packageName="com.google.android.gm"

            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>

        <favorite

            launcher:packageName="com.google.android.apps.maps"

            launcher:className="com.google.android.maps.MapsActivity"/>

        <favorite

            launcher:packageName="com.google.android.youtube"

            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.docs"

            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.youtube.music"

            launcher:className="com.google.android.apps.youtube.music.activities.MusicActivity"/>

        <favorite

            launcher:packageName="com.google.android.videos"

            launcher:className="com.google.android.youtube.videos.EntryPoint"/>

        <favorite

            launcher:packageName="com.google.android.apps.tachyon"

            launcher:className="com.google.android.apps.tachyon.MainActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.photos"

            launcher:className="com.google.android.apps.photos.home.HomeActivity"/>

    </folder>



    <favorite

        launcher:screen="0"

        launcher:x="3"

        launcher:y="3"

        launcher:packageName="com.android.vending"

        launcher:className="com.android.vending.AssetBrowserActivity"/>



    <!-- Screen 1 -->

    <appwidget

        launcher:packageName="org.lineageos.eleven"

        launcher:className="org.lineageos.eleven.appwidgets.AppWidgetLarge"

        launcher:screen="1"

        launcher:x="0"

        launcher:y="0"

        launcher:spanX="4"

        launcher:spanY="2" />



    <resolve

        launcher:screen="1"

        launcher:x="0"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />

        <favorite launcher:uri="mailto:" />

    </resolve>



    <resolve

        launcher:screen="0"

        launcher:screen="1"

        launcher:x="1"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />

        <favorite launcher:uri="#Intent;type=images/*;end" />

    </resolve>



    <resolve

        launcher:screen="0"

    <favorite

        launcher:packageName="org.lineageos.eleven"

        launcher:className="org.lineageos.eleven.ui.activities.HomeActivity"

        launcher:screen="1"

        launcher:x="2"

        launcher:y="-1" />



    <favorite

        launcher:packageName="com.android.settings"

        launcher:className="com.android.settings.Settings"

        launcher:screen="1"

        launcher:x="3"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />

        <favorite launcher:uri="market://details?id=com.android.launcher" />

    </resolve>

        launcher:y="-1" />



</favorites>

res/xml/default_workspace_5x5.xml

+93 −20
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">



    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->

    <!-- Dialer, Messaging, [Maps/Music], Browser, Camera -->

    <!-- Dialer, Messaging, Contacts, Browser, Camera -->

    <resolve

        launcher:container="-101"

        launcher:screen="0"
@@ -45,8 +45,7 @@ 
        launcher:screen="2"

        launcher:x="2"

        launcher:y="0" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" />

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" />

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />

    </resolve>



    <resolve
@@ -54,8 +53,7 @@ 
        launcher:screen="3"

        launcher:x="3"

        launcher:y="0" >

        <favorite

            launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />

        <favorite launcher:uri="http://www.example.com/" />

    </resolve>
@@ -68,31 +66,106 @@ 
        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />

    </resolve>



    <!-- Bottom row -->

    <resolve

    <!-- Screen 0 -->

    <appwidget

        launcher:packageName="com.google.android.googlequicksearchbox"

        launcher:className="com.google.android.googlequicksearchbox.SearchWidgetProvider"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0"

        launcher:spanX="5"

        launcher:spanY="1" />



    <appwidget

        launcher:packageName="com.android.deskclock"

        launcher:className="com.android.alarmclock.DigitalAppWidgetProvider"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="1"

        launcher:spanX="5"

        launcher:spanY="2" />



    <!-- Google Folder -->

    <!-- Google, Gmail, Maps, YouTube, Drive, YouTube Music, Play Movies, Duo, Photos -->

    <folder

        launcher:title="@string/google_folder_title"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="4">

        <favorite

            launcher:packageName="com.google.android.googlequicksearchbox"

            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"/>

        <favorite

            launcher:packageName="com.google.android.gm"

            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>

        <favorite

            launcher:packageName="com.google.android.apps.maps"

            launcher:className="com.google.android.maps.MapsActivity"/>

        <favorite

            launcher:packageName="com.google.android.youtube"

            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.docs"

            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.youtube.music"

            launcher:className="com.google.android.apps.youtube.music.activities.MusicActivity"/>

        <favorite

            launcher:packageName="com.google.android.videos"

            launcher:className="com.google.android.youtube.videos.EntryPoint"/>

        <favorite

            launcher:packageName="com.google.android.apps.tachyon"

            launcher:className="com.google.android.apps.tachyon.MainActivity"/>

        <favorite

            launcher:packageName="com.google.android.apps.photos"

            launcher:className="com.google.android.apps.photos.home.HomeActivity"/>

    </folder>



    <favorite

        launcher:screen="0"

        launcher:x="4"

        launcher:y="4"

        launcher:packageName="com.android.vending"

        launcher:className="com.android.vending.AssetBrowserActivity"/>



    <!-- Screen 1 -->

    <appwidget

        launcher:packageName="org.lineageos.eleven"

        launcher:className="org.lineageos.eleven.appwidgets.AppWidgetLarge"

        launcher:screen="1"

        launcher:x="0"

        launcher:y="0"

        launcher:spanX="5"

        launcher:spanY="2" />



    <resolve

        launcher:screen="1"

        launcher:x="0"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />

        <favorite launcher:uri="mailto:" />



    </resolve>



    <resolve

        launcher:screen="0"

        launcher:screen="1"

        launcher:x="1"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />

        <favorite launcher:uri="#Intent;type=images/*;end" />



    </resolve>



    <resolve

        launcher:screen="0"

        launcher:x="4"

        launcher:y="-1" >

        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />

        <favorite launcher:uri="market://details?id=com.android.launcher" />

    </resolve>

    <favorite

        launcher:packageName="org.lineageos.eleven"

        launcher:className="org.lineageos.eleven.ui.activities.HomeActivity"

        launcher:screen="1"

        launcher:x="2"

        launcher:y="-1" />



    <favorite

        launcher:packageName="com.android.settings"

        launcher:className="com.android.settings.Settings"

        launcher:screen="1"

        launcher:x="3"

        launcher:y="-1" />



</favorites>