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

Commit 64ea8403 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2c

am: 2fdb4591

Change-Id: Ib699ffe15a91fdaa1cbfbb788f4b0ee92752174a
parents a5f0a82f 2fdb4591
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -1876,6 +1876,20 @@
                android:value="true" />
        </activity>

        <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
             activity is disabled to be CTS compliant. -->
        <activity
            android:name=".development.DevelopmentSettingsDisabledActivity"
            android:icon="@drawable/ic_settings_development"
            android:label="@string/development_settings_title"
            android:theme="@android:style/Theme.NoDisplay">
            <intent-filter android:priority="-1">
                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <activity android:name="Settings$PrintSettingsActivity"
                android:label="@string/print_settings"
                android:icon="@drawable/ic_settings_print"
+28 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 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.development;

import android.app.Activity;
import android.os.Bundle;

public class DevelopmentSettingsDisabledActivity extends Activity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        finish();
    }
}