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

Commit 7f370ddb authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

QSTileHost recreates default on blank setting 

It only guarded for null setting.
Blank sysui_qs_tiles should behave in the same way as null.

Test: atest
Bug: 118592837
Change-Id: Ie6e954a2f3bd6ff2b1a28f193d77549d9adfea81
parent 82b6b06f

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { 
    protected static List<String> loadTileSpecs(Context context, String tileList) {

        final Resources res = context.getResources();

        final String defaultTileList = res.getString(R.string.quick_settings_tiles_default);

        if (tileList == null) {

        if (TextUtils.isEmpty(tileList)) {

            tileList = res.getString(R.string.quick_settings_tiles);

            if (DEBUG) Log.d(TAG, "Loaded tile specs from config: " + tileList);

        } else {

packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

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

 */



package com.android.systemui.qs;





import static junit.framework.TestCase.assertFalse;



import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;



import com.android.systemui.SysuiTestCase;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.List;



@RunWith(AndroidTestingRunner.class)

@SmallTest

public class QSTileHostTest extends SysuiTestCase {



    @Test

    public void testLoadTileSpecs_emptySetting() {

        List<String> tiles = QSTileHost.loadTileSpecs(mContext, "");

        assertFalse(tiles.isEmpty());

    }



    @Test

    public void testLoadTileSpecs_nullSetting() {

        List<String> tiles = QSTileHost.loadTileSpecs(mContext, null);

        assertFalse(tiles.isEmpty());

    }

}