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

Commit fc86ca6f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Offer trampoline to help articles." into nyc-mr1-dev

parents 2dc574e5 4f425c89
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -3043,6 +3043,12 @@
            </intent-filter>
        </service>

        <activity android:name=".HelpTrampoline"
            android:exported="true"
            android:theme="@android:style/Theme.NoDisplay"
            android:permission="android.permission.DUMP"
            android:enabled="@bool/config_has_help" />

        <!-- This is the longest AndroidManifest.xml ever. -->
    </application>
</manifest>
+3 −0
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@

    <!--Whether the storage manager exists. -->
    <bool name="config_has_storage_manager">false</bool>

    <!--Whether help links are defined. -->
    <bool name="config_has_help">false</bool>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -5661,6 +5661,8 @@
    <string name="help_url_gestures" translatable="false"></string>
    <!-- Help URL, Manage Storage [DO NOT TRANSLATE]-->
    <string name="help_url_manage_storage" translatable="false"></string>
    <!-- Help URL, Android is upgrading [DO NOT TRANSLATE] -->
    <string name="help_url_upgrading" translatable="false"></string>
    <!-- User account title [CHAR LIMIT=30] -->
    <string name="user_account_title">Account for content</string>
+51 −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.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.util.Log;

import com.android.settingslib.HelpUtils;

public class HelpTrampoline extends Activity {
    private static final String TAG = "HelpTrampoline";

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        try {
            final String name = getIntent().getStringExtra(Intent.EXTRA_TEXT);
            final int id = getResources().getIdentifier(name, "string", getPackageName());
            final String value = getResources().getString(id);

            final Intent intent = HelpUtils.getHelpIntent(this, value, null);
            if (intent != null) {
                startActivity(intent);
            }

        } catch (Resources.NotFoundException | ActivityNotFoundException e) {
            Log.w(TAG, "Failed to resolve help", e);
        }

        finish();
    }
}