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

Commit b95ff4ec authored by Fan Zhang's avatar Fan Zhang
Browse files

Use a single layout for CreateShortcut activity. 

The old layout is inherited from LauncherActivity, which uses a
inconsistent theme and UI between phone and tablet. It's more consistent
to just use a single layout that matches setting theme.

Fixes: 32220535
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/CreateShortcutTest.java
Change-Id: I769d1404c82c2057bf021e4cf557e7cf397d92a7
parent 36d0d143

res/layout/activity_list.xml

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

<!--

  Copyright (C) 2016 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"

             android:layout_width="match_parent"

             android:layout_height="match_parent">



    <ListView

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

        android:text="@string/activity_list_empty"

        android:visibility="gone"

        android:textAppearance="?android:attr/textAppearanceMedium"/>



</FrameLayout>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -612,6 +612,8 @@ 
    <string name="settings_label_launcher">Settings</string>

    <!-- Label for option to select a settings panel as a shortcut -->

    <string name="settings_shortcut">Settings shortcut</string>

    <!-- Shown in create shortcut activity when there is no shortcut that can be created. [CHAR_LIMIT=None] -->

    <string name="activity_list_empty">No matching activities found.</string>

    <!-- Wireless controls settings screen, setting check box label -->

    <string name="airplane_mode">Airplane mode</string>

    <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->

src/com/android/settings/CreateShortcut.java

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ public class CreateShortcut extends LauncherActivity { 
        return false;

    }



    @Override

    protected void onSetContentView() {

        setContentView(R.layout.activity_list);

    }



    /**

     * Perform query on package manager for list items.  The default

     * implementation queries for activities.

tests/app/src/com/android/settings/CreateShortcutTest.java

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

 * Copyright (C) 2016 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.settings;



import android.app.Instrumentation;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;

import static android.support.test.espresso.matcher.ViewMatchers.withText;



@RunWith(AndroidJUnit4.class)

@SmallTest

public class CreateShortcutTest {



    @Test

    public void test_layoutDoesNotHaveCancelButton() {

        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();

        instrumentation.startActivitySync(new Intent(Intent.ACTION_CREATE_SHORTCUT)

                .setClassName(instrumentation.getTargetContext(),

                        CreateShortcut.class.getName()));

        onView(withText(R.string.cancel)).check(doesNotExist());

    }

}