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

Commit 21f498c5 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Moving all configs from overrides.xml to config.xml" into main

parents 16a0f610 bd07c054

quickstep/res/values/config.xml

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,18 @@ 
    <string name="test_information_handler_class" translatable="false">com.android.quickstep.QuickstepTestInformationHandler</string>

    <string name="window_manager_proxy_class" translatable="false">com.android.quickstep.util.SystemWindowManagerProxy</string>

    <string name="widget_holder_factory_class" translatable="false">com.android.launcher3.uioverrides.QuickstepWidgetHolder$QuickstepHolderFactory</string>

    <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>

    <string name="app_launch_tracker_class" translatable="false">com.android.launcher3.appprediction.PredictionAppTracker</string>

    <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>

    <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>

    <string name="secondary_display_predictions_class" translatable="false">com.android.launcher3.secondarydisplay.SecondaryDisplayPredictionsImpl</string>

    <string name="taskbar_model_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarModelCallbacksFactory</string>

    <string name="taskbar_view_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarViewCallbacksFactory</string>

    <string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>



    <string name="nav_handle_long_press_handler_class" translatable="false"></string>

    <string name="assist_utils_class" translatable="false"></string>

    <string name="assist_state_manager_class" translatable="false"></string>



    <!-- The number of thumbnails and icons to keep in the cache. The thumbnail cache size also

         determines how many thumbnails will be fetched in the background. -->

quickstep/res/values/override.xml

deleted100644 → 0
+0 −42
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.

-->



<!-- Class overrides for launcher with quickstep. -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>



  <string name="app_launch_tracker_class" translatable="false">com.android.launcher3.appprediction.PredictionAppTracker</string>



  <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>



  <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>



  <string name="nav_handle_long_press_handler_class" translatable="false"></string>



  <string name="assist_utils_class" translatable="false"></string>



  <string name="secondary_display_predictions_class" translatable="false">com.android.launcher3.secondarydisplay.SecondaryDisplayPredictionsImpl</string>



  <string name="taskbar_model_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarModelCallbacksFactory</string>



  <string name="taskbar_view_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarViewCallbacksFactory</string>



  <string name="assist_state_manager_class" translatable="false"></string>



  <string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>



</resources>

res/values/config.xml

+2 −67
Original line number Diff line number Diff line
@@ -17,38 +17,23 @@ 
    <!-- Miscellaneous -->

    <bool name="config_largeHeap">false</bool>



    <integer name="extracted_color_gradient_alpha">153</integer>



    <!-- A string pointer to the original app name string. This allows derived projects to

     easily override the app name without providing all translations -->

    <string name="derived_app_name" translatable="false">@string/app_name</string>



    <!-- String representing the intent for search on the apps market. To specify a query, add

    q=<query> to the data to the intent -->

    <string name="market_search_intent" translatable="false">market://search?c=apps</string>



    <!-- String representing the intent to delete a package.-->

    <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;end</string>



    <!-- String representing the fragment class for settings activity.-->

    <string name="settings_fragment_name" translatable="false">com.android.launcher3.settings.SettingsActivity$LauncherSettingsFragment</string>



    <!-- DragController -->

    <item type="id" name="drag_event_parity" />



    <!-- AllApps & Launcher transitions -->

    <!-- The duration of the animation from search hint to text entry -->

    <integer name="config_searchHintAnimationDuration">50</integer>



    <!-- The duration of the PagedView page snap animation -->

    <integer name="config_pageSnapAnimationDuration">750</integer>



    <!-- The duration of the PagedView page snap animation -->

    <integer name="config_keyboardTaskFocusSnapAnimationDuration">750</integer>



    <!-- View tag key used to store SpringAnimation data. -->

    <item type="id" name="spring_animation_tag" />



    <!-- View tag key used to determine if we should fade in the child views.. -->

    <string name="popup_container_iterate_children" translatable="false">popup_container_iterate_children</string>
@@ -91,71 +76,27 @@ 
    <string name="taskbar_model_callbacks_factory_class" translatable="false"></string>

    <string name="taskbar_view_callbacks_factory_class" translatable="false"></string>

    <string name="launcher_restore_event_logger_class" translatable="false"></string>



    <!-- View ID to use for QSB widget -->

    <item type="id" name="qsb_widget" />



    <!-- View ID used by cell layout to jail its content -->

    <item type="id" name="cell_layout_jail_id" />



    <!-- View IDs to store item highlight information -->

    <item type="id" name="view_unhighlight_background" />



    <!-- view ID used to restore work tab state -->

    <item type="id" name="work_tab_state_id" />



    <!-- Menu id for feature flags -->

    <item type="id" name="menu_apply_flags" />

    <!--  Used for determining category of a widget presented in widget recommendations. -->

    <string name="widget_recommendation_category_provider_class" translatable="false"></string>



    <!-- Default packages -->

    <string name="wallpaper_picker_package" translatable="false"></string>

    <string name="local_colors_extraction_class" translatable="false"></string>

    <string name="search_session_manager_class" translatable="false"></string>



    <!-- Accessibility actions -->

    <item type="id" name="action_remove" />

    <item type="id" name="action_uninstall" />

    <item type="id" name="action_reconfigure" />

    <item type="id" name="action_add_to_workspace" />

    <item type="id" name="action_move" />

    <item type="id" name="action_move_to_workspace" />

    <item type="id" name="action_move_screen_backwards" />

    <item type="id" name="action_move_screen_forwards" />

    <item type="id" name="action_resize" />

    <item type="id" name="action_deep_shortcuts" />

    <item type="id" name="action_remote_action_shortcut" />

    <item type="id" name="action_dismiss_prediction" />

    <item type="id" name="action_pin_prediction"/>



    <!-- QSB IDs. DO not change -->

    <item type="id" name="search_container_workspace" />

    <item type="id" name="search_container_all_apps" />

    <item type="id" name="search_container_hotseat" />



    <!-- Scalable Grid configuration -->

    <!-- This is a float because it is converted to dp later in DeviceProfile -->

    <dimen name="hotseat_bar_bottom_space_default">48</dimen>

    <dimen name="hotseat_qsb_space_default">0</dimen>



    <!-- Recents -->

    <item type="id" name="overview_panel"/>



    <!-- Whether to enable background preloading of task thumbnails. -->

    <bool name="config_enableTaskSnapshotPreloading">true</bool>



    <!-- Configuration resources -->

    <item name="all_apps_spring_damping_ratio" type="dimen" format="float">0.75</item>

    <item name="all_apps_spring_stiffness" type="dimen" format="float">600</item>



    <item name="dismiss_task_trans_y_damping_ratio" type="dimen" format="float">0.73</item>

    <item name="dismiss_task_trans_y_stiffness" type="dimen" format="float">800</item>



    <item name="dismiss_task_trans_x_damping_ratio" type="dimen" format="float">0.73</item>

    <item name="dismiss_task_trans_x_stiffness" type="dimen" format="float">800</item>



    <item name="horizontal_spring_damping_ratio" type="dimen" format="float">0.8</item>

    <item name="horizontal_spring_stiffness" type="dimen" format="float">250</item>



    <item name="swipe_up_rect_scale_damping_ratio" type="dimen" format="float">0.75</item>

    <item name="swipe_up_rect_scale_stiffness" type="dimen" format="float">200</item>

    <item name="swipe_up_rect_scale_higher_stiffness" type="dimen" format="float">400</item>
@@ -217,9 +158,6 @@ 
    <!-- Widget component names to be included in fitness category of widget suggestions. -->

    <string-array name="fitness_recommendations"></string-array>



    <!-- Name of the class used to generate colors from the wallpaper colors. Must be implementing the LauncherAppWidgetHostView.ColorGenerator interface. -->

    <string name="color_generator_class" translatable="false"/>



    <!-- Swipe back to home related -->

    <dimen name="swipe_back_window_scale_x_margin">10dp</dimen>

    <dimen name="swipe_back_window_corner_radius">40dp</dimen>
@@ -275,9 +213,6 @@ 
    <!--  Used for custom widgets  -->

    <array name="custom_widget_providers"/>



    <!--  Used for determining category of a widget presented in widget recommendations. -->

    <string name="widget_recommendation_category_provider_class" translatable="false"></string>



    <!-- Embed parameters -->

    <dimen name="activity_split_ratio"  format="float">0.5</dimen>

    <integer name="min_width_split">720</integer>

res/values/id.xml

+43 −0
Original line number Diff line number Diff line
@@ -23,6 +23,40 @@ 
    <item type="id" name="split_topLeft_appInfo" />

    <item type="id" name="split_bottomRight_appInfo" />



    <!-- Accessibility actions -->

    <item type="id" name="action_remove" />

    <item type="id" name="action_uninstall" />

    <item type="id" name="action_reconfigure" />

    <item type="id" name="action_add_to_workspace" />

    <item type="id" name="action_move" />

    <item type="id" name="action_move_to_workspace" />

    <item type="id" name="action_move_screen_backwards" />

    <item type="id" name="action_move_screen_forwards" />

    <item type="id" name="action_resize" />

    <item type="id" name="action_deep_shortcuts" />

    <item type="id" name="action_remote_action_shortcut" />

    <item type="id" name="action_dismiss_prediction" />

    <item type="id" name="action_pin_prediction"/>



    <!-- QSB IDs. DO not change -->

    <item type="id" name="search_container_workspace" />

    <item type="id" name="search_container_all_apps" />

    <item type="id" name="search_container_hotseat" />



    <!-- View ID to use for QSB widget -->

    <item type="id" name="qsb_widget" />



    <!-- View ID used by cell layout to jail its content -->

    <item type="id" name="cell_layout_jail_id" />



    <!-- View IDs to store item highlight information -->

    <item type="id" name="view_unhighlight_background" />



    <!-- view ID used to restore work tab state -->

    <item type="id" name="work_tab_state_id" />



    <!-- Menu id for feature flags -->

    <item type="id" name="menu_apply_flags" />



    <!--  Do not change, must be kept in sync with sysui navbar button IDs for tests!  -->

    <item type="id" name="home" />
@@ -53,4 +87,13 @@ 
    <item type="id" name="ps_settings_button" />

    <item type="id" name="ps_transition_image" />



    <!-- Recents -->

    <item type="id" name="overview_panel"/>



    <!-- DragController -->

    <item type="id" name="drag_event_parity" />



    <!-- View tag key used to store SpringAnimation data. -->

    <item type="id" name="spring_animation_tag" />



</resources>

src/com/android/launcher3/util/PackageManagerHelper.java

+0 −17
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; 
import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.uioverrides.ApiWrapper;



import java.net.URISyntaxException;

import java.util.List;

import java.util.Objects;
@@ -166,22 +165,6 @@ public class PackageManagerHelper { 
        return (info.flags & ApplicationInfo.FLAG_SUSPENDED) != 0;

    }



    /**

     * Creates a new market search intent.

     */

    public static Intent getMarketSearchIntent(Context context, String query) {

        try {

            Intent intent = Intent.parseUri(context.getString(R.string.market_search_intent), 0);

            if (!TextUtils.isEmpty(query)) {

                intent.setData(

                        intent.getData().buildUpon().appendQueryParameter("q", query).build());

            }

            return intent;

        } catch (URISyntaxException e) {

            throw new RuntimeException(e);

        }

    }



    /**

     * Starts the details activity for {@code info}

     */