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

Commit 5e54896d authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Show "select a printer" as "destination" the first the the user prints 

The Spinner does not support a prompt, hence temporarily hijack the
first element and install an alternate view. Once the Spinner is touched
revert to the old behavior.

If we showed a prompt the views in the spinner cannot be recycled.

Bug: 24132864
Change-Id: Iaf97878f85388a8c6351e716117b16f34919ad84
parent fba5632f

packages/PrintSpooler/res/layout/printer_dropdown_prompt.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 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.

-->



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

      android:layout_width="fill_parent"

      android:layout_height="wrap_content"

      android:textAppearance="?android:attr/textAppearanceMedium"

      android:textIsSelectable="false"

      android:textColor="?android:attr/textColorPrimary"

      android:paddingStart="20dip"

      android:paddingEnd="8dip"

      android:minHeight="56dip"

      android:orientation="horizontal"

      android:text="@string/destination_default_text"

      android:gravity="start|center_vertical" />

packages/PrintSpooler/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
    <!-- Label of the page selection widget. [CHAR LIMIT=20] -->

    <string name="label_pages">Pages</string>



    <!-- Label of the destination widget. [CHAR LIMIT=20] -->

    <string name="destination_default_text">Select a printer</string>



    <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->

    <string name="template_all_pages">All <xliff:g id="page_count" example="100">%1$s</xliff:g></string>

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+95 −23
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.text.TextWatcher; 
import android.util.ArrayMap;

import android.util.Log;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.View.OnFocusChangeListener;
@@ -125,6 +126,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


    private static final String FRAGMENT_TAG = "FRAGMENT_TAG";



    private static final String HAS_PRINTED_PREF = "has_printed";



    private static final int ORIENTATION_PORTRAIT = 0;

    private static final int ORIENTATION_LANDSCAPE = 1;
@@ -187,6 +190,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


    private Spinner mDestinationSpinner;

    private DestinationAdapter mDestinationSpinnerAdapter;

    private boolean mShowDestinationPrompt;



    private Spinner mMediaSizeSpinner;

    private ArrayAdapter<SpinnerItem<MediaSize>> mMediaSizeSpinnerAdapter;
@@ -1093,6 +1097,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


        updateOptionsUi();

        addCurrentPrinterToHistory();

        setUserPrinted();



        PageRange[] selectedPages = computeSelectedPages();

        if (!Arrays.equals(mSelectedPages, selectedPages)) {
@@ -1195,6 +1200,29 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        // Print button

        mPrintButton = (ImageView) findViewById(R.id.print_button);

        mPrintButton.setOnClickListener(clickListener);



        // Special prompt instead of destination spinner for the first time the user printed

        if (!hasUserEverPrinted()) {

            mShowDestinationPrompt = true;



            mSummaryCopies.setEnabled(false);

            mSummaryPaperSize.setEnabled(false);



            mDestinationSpinner.setOnTouchListener(new View.OnTouchListener() {

                @Override

                public boolean onTouch(View v, MotionEvent event) {

                    mShowDestinationPrompt = false;

                    mSummaryCopies.setEnabled(true);

                    mSummaryPaperSize.setEnabled(true);

                    updateOptionsUi();



                    mDestinationSpinner.setOnTouchListener(null);

                    mDestinationSpinnerAdapter.notifyDataSetChanged();



                    return false;

                }

            });

        }

    }



    /**
@@ -1332,6 +1360,22 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                && printer.getStatus() != PrinterInfo.STATUS_UNAVAILABLE;

    }



    /**

     * Disable all options UI elements, beside the {@link #mDestinationSpinner}

     */

    private void disableOptionsUi() {

        mCopiesEditText.setEnabled(false);

        mCopiesEditText.setFocusable(false);

        mMediaSizeSpinner.setEnabled(false);

        mColorModeSpinner.setEnabled(false);

        mDuplexModeSpinner.setEnabled(false);

        mOrientationSpinner.setEnabled(false);

        mRangeOptionsSpinner.setEnabled(false);

        mPageRangeEditText.setEnabled(false);

        mPrintButton.setVisibility(View.GONE);

        mMoreOptionsButton.setEnabled(false);

    }



    void updateOptionsUi() {

        // Always update the summary.

        updateSummary();
@@ -1346,32 +1390,14 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            if (mState != STATE_PRINTER_UNAVAILABLE) {

                mDestinationSpinner.setEnabled(false);

            }

            mCopiesEditText.setEnabled(false);

            mCopiesEditText.setFocusable(false);

            mMediaSizeSpinner.setEnabled(false);

            mColorModeSpinner.setEnabled(false);

            mDuplexModeSpinner.setEnabled(false);

            mOrientationSpinner.setEnabled(false);

            mRangeOptionsSpinner.setEnabled(false);

            mPageRangeEditText.setEnabled(false);

            mPrintButton.setVisibility(View.GONE);

            mMoreOptionsButton.setEnabled(false);

            disableOptionsUi();

            return;

        }



        // If no current printer, or it has no capabilities, or it is not

        // available, we disable all print options except the destination.

        if (mCurrentPrinter == null || !canPrint(mCurrentPrinter)) {

            mCopiesEditText.setEnabled(false);

            mCopiesEditText.setFocusable(false);

            mMediaSizeSpinner.setEnabled(false);

            mColorModeSpinner.setEnabled(false);

            mDuplexModeSpinner.setEnabled(false);

            mOrientationSpinner.setEnabled(false);

            mRangeOptionsSpinner.setEnabled(false);

            mPageRangeEditText.setEnabled(false);

            mPrintButton.setVisibility(View.GONE);

            mMoreOptionsButton.setEnabled(false);

            disableOptionsUi();

            return;

        }
@@ -1679,6 +1705,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            mCopiesEditText.setText(MIN_COPIES_STRING);

            mCopiesEditText.requestFocus();

        }



        if (mShowDestinationPrompt) {

            disableOptionsUi();

        }

    }



    private void updateSummary() {
@@ -1980,6 +2010,32 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        }

    }





    /**

     * Check if the user has ever printed a document

     *

     * @return true iff the user has ever printed a document

     */

    private boolean hasUserEverPrinted() {

        SharedPreferences preferences = getSharedPreferences(HAS_PRINTED_PREF, MODE_PRIVATE);



        return preferences.getBoolean(HAS_PRINTED_PREF, false);

    }



    /**

     * Remember that the user printed a document

     */

    private void setUserPrinted() {

        SharedPreferences preferences = getSharedPreferences(HAS_PRINTED_PREF, MODE_PRIVATE);



        if (!preferences.getBoolean(HAS_PRINTED_PREF, false)) {

            SharedPreferences.Editor edit = preferences.edit();



            edit.putBoolean(HAS_PRINTED_PREF, true);

            edit.apply();

        }

    }



    private final class DestinationAdapter extends BaseAdapter

            implements PrinterRegistry.OnPrintersChangeListener {

        private final List<PrinterHolder> mPrinterHolders = new ArrayList<>();
@@ -1988,6 +2044,11 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


        private boolean mHistoricalPrintersLoaded;



        /**

         * Has the {@link #mDestinationSpinner} ever used a view from printer_dropdown_prompt

         */

        private boolean hadPromptView;



        public DestinationAdapter() {

            mHistoricalPrintersLoaded = mPrinterRegistry.areHistoricalPrintersLoaded();

            if (mHistoricalPrintersLoaded) {
@@ -2098,10 +2159,21 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


        @Override

        public View getView(int position, View convertView, ViewGroup parent) {

            if (mShowDestinationPrompt) {

                if (convertView == null) {

                    convertView = getLayoutInflater().inflate(

                            R.layout.printer_dropdown_prompt, parent, false);

                    hadPromptView = true;

                }



                return convertView;

            } else {

                // We don't know if we got an recyled printer_dropdown_prompt, hence do not use it

                if (hadPromptView || convertView == null) {

                    convertView = getLayoutInflater().inflate(

                            R.layout.printer_dropdown_item, parent, false);

                }

            }



            CharSequence title = null;

            CharSequence subtitle = null;