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

Commit 0b89088c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Not using custom layout in work mode dialog"

parents 1f7f7253 894f6272

core/java/com/android/internal/app/UnlaunchableAppActivity.java

+2 −16
Original line number Diff line number Diff line
@@ -21,24 +21,15 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; 


import android.app.Activity;

import android.app.AlertDialog;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.widget.TextView;



import com.android.internal.R;
@@ -85,14 +76,9 @@ public class UnlaunchableAppActivity extends Activity 
            return;

        }



        View rootView = LayoutInflater.from(this).inflate(R.layout.unlaunchable_app_activity, null);

        TextView titleView = (TextView)rootView.findViewById(R.id.unlaunchable_app_title);

        TextView messageView = (TextView)rootView.findViewById(R.id.unlaunchable_app_message);

        titleView.setText(dialogTitle);

        messageView.setText(dialogMessage);



        AlertDialog.Builder builder = new AlertDialog.Builder(this)

                .setView(rootView)

                .setTitle(dialogTitle)

                .setMessage(dialogMessage)

                .setOnDismissListener(this);

        if (mReason == UNLAUNCHABLE_REASON_QUIET_MODE) {

            builder.setPositiveButton(R.string.work_mode_turn_on, this)

core/res/res/layout/unlaunchable_app_activity.xml

deleted100644 → 0
+0 −35
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.

-->

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="@dimen/dialog_padding"

        android:orientation="vertical">

        <TextView android:id="@+id/unlaunchable_app_title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingStart="@dimen/dialog_padding"

                android:paddingBottom="@dimen/dialog_padding"

                android:textAppearance="@android:style/TextAppearance.Material.Title" />



        <TextView android:id="@+id/unlaunchable_app_message"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingStart="@dimen/dialog_padding"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead"

                android:textColor="?android:attr/textColorSecondary" />

</LinearLayout>

core/res/res/values/symbols.xml

+0 −3
Original line number Diff line number Diff line
@@ -2700,9 +2700,6 @@ 
  <java-symbol type="string" name="language_selection_title" />

  <java-symbol type="string" name="search_language_hint" />



  <java-symbol type="layout" name="unlaunchable_app_activity" />

  <java-symbol type="id" name="unlaunchable_app_title" />

  <java-symbol type="id" name="unlaunchable_app_message" />

  <java-symbol type="string" name="work_mode_off_title" />

  <java-symbol type="string" name="work_mode_off_message" />

  <java-symbol type="string" name="work_mode_turn_on" />