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

Commit 90a9714c authored by Yanting Yang's avatar Yanting Yang
Browse files

Deprecate silky flag for official release 

- Turn on the collapsing toolbar by default.
- Remove the silky flag from All apps page.
- Ignore tests of ChooseLockGenericTest and trace it on b/179136903.
- Remove silky flag.

Fixes: 183670633
Bug: 179136903
Test: robotests & visual
Change-Id: Iee2a9e7ccaebd1624f995af4fd45446142e5f500
parent 04fdd614

res/layout/manage_applications_apps.xml

+32 −42
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ 
     limitations under the License.

-->



<androidx.coordinatorlayout.widget.CoordinatorLayout

<FrameLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:layout_height="match_parent">



    <FrameLayout

        android:id="@+id/pinned_header"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        settings:layout_behavior="com.android.settings.widget.FloatingAppBarScrollingViewBehavior">

        android:layout_height="wrap_content"

        android:elevation="2dp"/>



    <FrameLayout

        android:id="@+id/list_container"
@@ -48,7 +48,7 @@ 
            android:id="@android:id/empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

                android:gravity="center"

            android:gravity="bottom|center_horizontal"

            android:layout_gravity="center"

            android:text="@string/no_applications"

            android:textAppearance="?android:attr/textAppearanceLarge"
@@ -60,14 +60,4 @@ 


</FrameLayout>



    <com.google.android.material.appbar.AppBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        <FrameLayout

            android:id="@+id/pinned_header"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            settings:layout_scrollFlags="scroll|enterAlways"/>

    </com.google.android.material.appbar.AppBarLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/manage_applications_apps_v2.xml

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

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

-->



<FrameLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <FrameLayout

        android:id="@+id/pinned_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="2dp"/>



    <FrameLayout

        android:id="@+id/list_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone">



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/apps_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:clipToPadding="false"

            android:scrollbars="none"

            settings:fastScrollEnabled="true"

            settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"

            settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"

            settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"

            settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>



        <TextView

            android:id="@android:id/empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="bottom|center_horizontal"

            android:layout_gravity="center"

            android:text="@string/no_applications"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:visibility="invisible"/>



    </FrameLayout>



    <include layout="@layout/loading_container"/>



</FrameLayout>

src/com/android/settings/applications/manageapplications/ManageApplications.java

+1 −7
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.os.UserManager; 
import android.preference.PreferenceFrameLayout;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.view.LayoutInflater;
@@ -112,7 +111,6 @@ import com.android.settings.applications.appinfo.ExternalSourcesDetails; 
import com.android.settings.applications.appinfo.ManageExternalStorageDetails;

import com.android.settings.applications.appinfo.MediaManagementAppsDetails;

import com.android.settings.applications.appinfo.WriteSettingsDetails;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
@@ -396,11 +394,7 @@ public class ManageApplications extends InstrumentedFragment 
            return mRootView;

        }



        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {

            mRootView = inflater.inflate(R.layout.manage_applications_apps_v2, null);

        } else {

        mRootView = inflater.inflate(R.layout.manage_applications_apps, null);

        }

        mLoadingContainer = mRootView.findViewById(R.id.loading_container);

        mListContainer = mRootView.findViewById(R.id.list_container);

        if (mListContainer != null) {

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -27,6 +27,5 @@ public class FeatureFlags { 
    public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";

    public static final String CONDITIONAL_CARDS = "settings_conditionals";

    public static final String TETHER_ALL_IN_ONE = "settings_tether_all_in_one";

    public static final String SILKY_HOME = "settings_silky_home";

    public static final String CONTEXTUAL_HOME = "settings_contextual_home";

}

src/com/android/settings/core/SettingsBaseActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.MenuItem;
@@ -116,8 +115,7 @@ public class SettingsBaseActivity extends FragmentActivity { 
            ThemeHelper.trySetDynamicColor(this);

        }



        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)

                && isToolbarEnabled() && !isAnySetupWizard) {

        if (isToolbarEnabled() && !isAnySetupWizard) {

            super.setContentView(R.layout.collapsing_toolbar_base_layout);

            mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);

        } else {