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

Commit d0cb9ae5 authored by Tyson Miller's avatar Tyson Miller
Browse files

Trebuchet: RemoteFolder make sure vanilla CM compiles without overlay 

Change-Id: I4593a11c204d69067b30695d57f386a88375b64c
parent eb5bc4f3

RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java

+7 −0
Original line number Diff line number Diff line 
package com.android.launcher3;



import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.view.View;

import android.view.ViewGroup;
@@ -73,4 +74,10 @@ public class RemoteFolderManager { 
     */

    public void onBindViewHolder(final AppDrawerListAdapter.ViewHolder holder,

                                 final AppDrawerListAdapter.AppItemIndexedInfo indexedInfo) { }



    /**

     * Get the String to be used for the RemoteFolder name and its corresponding Settings option

     * @return the name RemoteFolder and its Setting option should use

     */

    public static String getFeatureTitle(Resources res) { return null; }

}

res/xml/default_workspace_5x5.xml

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
        launcher:spanX="5"

        launcher:spanY="2" />



    <!-- Recommended Folder -->

    <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">

    </remote-folder>



    <!-- Google Folder -->

    <folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">

        <favorite

res/xml/default_workspace_5x6.xml

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
        launcher:spanX="6"

        launcher:spanY="2" />



    <!-- Recommended Folder -->

    <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">

    </remote-folder>



    <!-- Google Folder -->

    <folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">

        <favorite

src/com/android/launcher3/OverviewSettingsPanel.java

+4 −1
Original line number Diff line number Diff line
@@ -92,7 +92,10 @@ public class OverviewSettingsPanel { 
        boolean remoteAppsEnabled = SettingsProvider.getBoolean(mLauncher, null,

                R.bool.preferences_interface_homescreen_remote_folder_default);

        if (remoteAppsEnabled) {

            values.add(res.getString(R.string.recommendations_title));

            String remoteAppsName = RemoteFolderManager.getFeatureTitle(res);

            if (remoteAppsName != null) {

                values.add(remoteAppsName);

            }

        }



        String[] valuesArr = new String[values.size()];