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

Unverified Commit 26c3a71a authored by dwardo's avatar dwardo Committed by Michael Bestas
Browse files

Trebuchet: Add 5x6, 5x7 and 6x6 default workspaces 

  Had a 5x6 grid (with 6 hotseat spots) on my fajita back in los 16.0
  and wanted one on los 17.1
  On my Shamu I used to have 6x6 (with 6 hotseat spots)
  5x7 has 5 hotseat spots

Includes:
Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sun May 16 21:26:44 2021 -0700

    Trebuchet: Set 5x6 grid to 5 hotseat icons

    * 5x5 and 5x7 have hotseat icon count 5 (matches column count)

    * 5x6 currently has hotseat icon count set to 6 which does not
      look good with the column count of 5.

    * The original commit message shows this was intentional:
      https://review.lineageos.org/q/Ib8d5dcc70d386376755c0a57b009ced1b2ee0834
      But a hotseat icon count of 5 for all of 5x5,5x6,5x7 looks more consistent.

    Change-Id: Ic55a258b8ef64d10b7440576af87d0e78d318cc3

Change-Id: Ib8d5dcc70d386376755c0a57b009ced1b2ee0834
parent 8e8c0513

res/xml/default_workspace_5x6.xml

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

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

-->



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

    <resolve

        launcher:container="-101"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0" >

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

        <favorite launcher:uri="tel:123" />

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="1"

        launcher:x="1"

        launcher:y="0" >

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

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

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

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

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="2"

        launcher:x="2"

        launcher:y="0" >

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

    </resolve>



    <resolve

        launcher:container="-101"

        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>



    <!-- 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="5">

        <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="5"

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



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

res/xml/default_workspace_5x7.xml

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

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

-->



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

    <resolve

        launcher:container="-101"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0" >

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

        <favorite launcher:uri="tel:123" />

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="1"

        launcher:x="1"

        launcher:y="0" >

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

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

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

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

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="2"

        launcher:x="2"

        launcher:y="0" >

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

    </resolve>



    <resolve

        launcher:container="-101"

        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>



    <!-- 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="6">

        <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="6"

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



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

res/xml/default_workspace_6x6.xml

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

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

-->



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

    <resolve

        launcher:container="-101"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0" >

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

        <favorite launcher:uri="tel:123" />

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="1"

        launcher:x="1"

        launcher:y="0" >

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

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

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

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

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

    </resolve>



    <resolve

        launcher:container="-101"

        launcher:screen="2"

        launcher:x="2"

        launcher:y="0" >

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

    </resolve>



    <resolve

        launcher:container="-101"

        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>



    <!-- 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="5">

        <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="5"

        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="6"

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



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

res/xml/device_profiles.xml

+63 −0
Original line number Diff line number Diff line
@@ -156,6 +156,48 @@ 


    </grid-option>



    <grid-option

        launcher:name="5_by_6"

        launcher:numRows="6"

        launcher:numColumns="5"

        launcher:numFolderRows="5"

        launcher:numFolderColumns="4"

        launcher:numHotseatIcons="5"

        launcher:dbFile="launcher_5_by_6.db"

        launcher:defaultLayoutId="@xml/default_workspace_5x6"

        launcher:deviceCategory="phone|multi_display" >



        <display-option

            launcher:name="Large Phone"

            launcher:minWidthDps="406"

            launcher:minHeightDps="694"

            launcher:iconImageSize="56"

            launcher:iconTextSize="13.0"

            launcher:canBeDefault="true" />



    </grid-option>



    <grid-option

        launcher:name="5_by_7"

        launcher:numRows="7"

        launcher:numColumns="5"

        launcher:numFolderRows="6"

        launcher:numFolderColumns="4"

        launcher:numHotseatIcons="5"

        launcher:dbFile="launcher_5_by_7.db"

        launcher:defaultLayoutId="@xml/default_workspace_5x7"

        launcher:deviceCategory="phone|multi_display" >



        <display-option

            launcher:name="Large Phone"

            launcher:minWidthDps="406"

            launcher:minHeightDps="694"

            launcher:iconImageSize="56"

            launcher:iconTextSize="13.0"

            launcher:canBeDefault="true" />



    </grid-option>



    <grid-option

        launcher:name="6_by_5"

        launcher:numRows="5"
@@ -203,4 +245,25 @@ 


    </grid-option>



    <grid-option

        launcher:name="6_by_6"

        launcher:numRows="6"

        launcher:numColumns="6"

        launcher:numFolderRows="5"

        launcher:numFolderColumns="5"

        launcher:numHotseatIcons="6"

        launcher:dbFile="launcher_6_by_6.db"

        launcher:defaultLayoutId="@xml/default_workspace_6x6"

        launcher:deviceCategory="phone|multi_display" >



        <display-option

            launcher:name="Large Phone"

            launcher:minWidthDps="406"

            launcher:minHeightDps="694"

            launcher:iconImageSize="48"

            launcher:iconTextSize="13.0"

            launcher:canBeDefault="true" />



    </grid-option>



</profiles>
 
 No newline at end of file

src/com/android/launcher3/LauncherFiles.java

+6 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ public class LauncherFiles { 
    private static final String XML = ".xml";



    public static final String LAUNCHER_DB = "launcher.db";

    public static final String LAUNCHER_6_BY_6_DB = "launcher_6_by_6.db";

    public static final String LAUNCHER_6_BY_5_DB = "launcher_6_by_5.db";

    public static final String LAUNCHER_5_BY_7_DB = "launcher_5_by_7.db";

    public static final String LAUNCHER_5_BY_6_DB = "launcher_5_by_6.db";

    public static final String LAUNCHER_4_BY_5_DB = "launcher_4_by_5.db";

    public static final String LAUNCHER_4_BY_4_DB = "launcher_4_by_4.db";

    public static final String LAUNCHER_3_BY_3_DB = "launcher_3_by_3.db";
@@ -33,7 +36,10 @@ public class LauncherFiles { 


    public static final List<String> GRID_DB_FILES = Collections.unmodifiableList(Arrays.asList(

            LAUNCHER_DB,

            LAUNCHER_6_BY_6_DB,

            LAUNCHER_6_BY_5_DB,

            LAUNCHER_5_BY_7_DB,

            LAUNCHER_5_BY_6_DB,

            LAUNCHER_4_BY_5_DB,

            LAUNCHER_4_BY_4_DB,

            LAUNCHER_3_BY_3_DB,