Project

General

Profile

« Previous | Next » 

Revision 4918f19c

Added by Leszek Koltunski over 4 years ago

Various improvements.

View differences:

src/main/java/org/distorted/magic/RubikSettings.java
20 20
package org.distorted.magic;
21 21

  
22 22
import android.app.Dialog;
23
import android.content.DialogInterface;
23 24
import android.os.Bundle;
24 25
import android.support.annotation.NonNull;
25 26
import android.support.v4.app.FragmentActivity;
......
74 75
    LinearLayout outerLayout = new LinearLayout(act);
75 76
    LinearLayout.LayoutParams outerLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 0.5f);
76 77
    outerLayoutParams.topMargin    = margin;
77
    outerLayoutParams.bottomMargin = margin;
78
    outerLayoutParams.bottomMargin = 0;
78 79
    outerLayoutParams.leftMargin   = margin;
79 80
    outerLayoutParams.rightMargin  = margin;
80 81

  
......
205 206
    {
206 207
    FragmentActivity act = getActivity();
207 208
    AlertDialog.Builder builder = new AlertDialog.Builder(act);
208
    builder.setCancelable(false);
209

  
210
    builder.setCancelable(true);
211
    builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener()
212
      {
213
      @Override
214
      public void onClick(DialogInterface dialog, int which)
215
        {
216

  
217
        }
218
      });
209 219

  
210 220
    LayoutInflater inflater = act.getLayoutInflater();
211 221
    final View view = inflater.inflate(R.layout.settings, null);

Also available in: Unified diff