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

Commit bc9f7e5a authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android Git Automerger
Browse files

am 1d5208e8: Holo style for alert dialog 

* commit '1d5208e8':
  Holo style for alert dialog
parents 238dcedf 1d5208e8

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 


        <activity android:name="AlarmAlert"

                android:excludeFromRecents="true"

                android:theme="@style/AlarmAlertTheme"

                android:theme="@android:style/Theme.Holo.Dialog"

                android:launchMode="singleInstance"

                android:taskAffinity=""

                android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>

res/layout/alarm_alert.xml

+44 −68
Original line number Diff line number Diff line
@@ -18,37 +18,13 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center_horizontal"

        android:background="@drawable/dialog"

        android:orientation="vertical">



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

            style="?android:attr/textAppearanceLarge"

            android:padding="5dip"

            android:singleLine="true"

            android:ellipsize="end"

    android:gravity="center"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

        <ImageView

            android:layout_width="match_parent"

            android:layout_height="1dip"

            android:scaleType="fitXY"

            android:gravity="fill_horizontal"

            android:src="@drawable/dialog_divider_horizontal_light"

            android:layout_marginLeft="10dip"

            android:layout_marginRight="10dip"/>

    android:orientation="vertical">



    <com.android.deskclock.DigitalClock

            style="@style/clock"

            android:paddingTop="30dip"

            android:paddingBottom="30dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="30dip"

        android:baselineAligned="true"

        android:gravity="center_horizontal">
@@ -71,27 +47,29 @@ 


    </com.android.deskclock.DigitalClock>



    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:background="?android:attr/dividerHorizontal" />



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            style="@android:style/ButtonBar">

        style="?android:attr/buttonBarStyle">



        <Button

            android:id="@+id/snooze"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="3"

            android:text="@string/alarm_alert_snooze_text" />



            <!-- blank stretchable view -->

            <View

                android:layout_width="2dip"

                android:layout_height="2dip"

                android:layout_gravity="fill_horizontal"

                android:layout_weight="1"/>



        <Button

            android:id="@+id/dismiss"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="3"
@@ -100,5 +78,3 @@ 
    </LinearLayout>



</LinearLayout>
 


</LinearLayout>

src/com/android/deskclock/AlarmAlert.java

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.IntentFilter; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.view.WindowManager;



/**

 * Full screen alarm alert: pops visible indicator and plays alarm tone. This

src/com/android/deskclock/AlarmAlertFullScreen.java

+3 −11
Original line number Diff line number Diff line
@@ -20,23 +20,19 @@ import android.app.Activity; 
import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.Context;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.os.Bundle;

import android.preference.PreferenceManager;

import android.view.KeyEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.Toast;

import android.widget.TextView;



import java.util.Calendar;
@@ -87,8 +83,6 @@ public class AlarmAlertFullScreen extends Activity { 
                        DEFAULT_VOLUME_BEHAVIOR);

        mVolumeBehavior = Integer.parseInt(vol);



        requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);



        final Window win = getWindow();

        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED

                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
@@ -110,9 +104,7 @@ public class AlarmAlertFullScreen extends Activity { 
    }



    private void setTitle() {

        String label = mAlarm.getLabelOrDefault(this);

        TextView title = (TextView) findViewById(R.id.alertTitle);

        title.setText(label);

        setTitle(mAlarm.getLabelOrDefault(this));

    }



    private void updateLayout() {