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

Commit a2e8778c authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "cmfm: print support" into cm-11.0

parents 4276df4e bc60c88e

assets/fonts/Courier-Prime.ttf

0 → 100644
+95.9 KiB

File added.

No diff preview for this file type.

View file

res/menu/actions.xml

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ 
      android:id="@+id/mnu_actions_send"

      android:showAsAction="ifRoom"

      android:title="@string/actions_menu_send"/>

    <item

      android:id="@+id/mnu_actions_print"

      android:showAsAction="ifRoom"

      android:title="@string/actions_menu_print"/>

    <item

      android:id="@+id/mnu_actions_add_to_bookmarks"

      android:showAsAction="ifRoom"

res/values/dimen.xml

+5 −0
Original line number Diff line number Diff line
@@ -114,4 +114,9 @@ 
    <!-- Theme width/height -->

    <dimen name="theme_max_width">300dip</dimen>

    <dimen name="theme_max_height">600dip</dimen>



    <!-- Print text size -->

    <dimen name="print_text_size">6sp</dimen>

    <!-- Print page margins -->

    <dimen name="print_page_margins">5dp</dimen>

</resources>

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ 
    <string name="actions_menu_open_parent_folder">Open parent</string>

    <!-- Actions Dialog - Menu - Compute checksum -->

    <string name="actions_menu_compute_checksum">Compute checksum</string>

    <!-- Actions Dialog - Menu - Print -->

    <string name="actions_menu_print">Print</string>



    <!-- Actions - Ask user prior to do an undone operation. Dialog message -->

    <string name="actions_ask_undone_operation_msg">This action cannot be undone. Do you want to continue?</string>
@@ -723,6 +725,16 @@ 
    <string name="ash_quoted_string">Quoted string</string>

    <string name="ash_variable">Variable</string>



    <!-- Print messages -->

    <!-- Unsupported document format -->

    <string name="print_unsupported_document">Unsupported document format</string>

    <!-- Unsupported image format -->

    <string name="print_unsupported_image">Unsupported image format</string>

    <!-- Print header -->

    <string name="print_document_header">Document: <xliff:g id="document_name">%1$s</xliff:g></string>

    <!-- Print footer -->

    <string name="print_document_footer">Page <xliff:g id="page_number">%1$s</xliff:g></string>



    <!-- Security - Extract relative or absolute files -->

    <string name="security_warning_extract">Warning!\n\nExtracting an archive file with relative or absolute paths may cause damage to your device by overwriting system files.\n\nDo you want to continue?</string>

src/com/cyanogenmod/filemanager/activities/EditorActivity.java

+2 −20
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult; 
import com.cyanogenmod.filemanager.util.FileHelper;

import com.cyanogenmod.filemanager.util.MediaHelper;

import com.cyanogenmod.filemanager.util.ResourcesHelper;

import com.cyanogenmod.filemanager.util.StringHelper;



import java.io.BufferedReader;

import java.io.ByteArrayInputStream;
@@ -304,7 +305,7 @@ public class EditorActivity extends Activity implements TextWatcher { 
                // is read-only

                if (!EditorActivity.this.mReadOnly) {

                    for (int i = 0; i < partial.length-1; i++) {

                        if (!isPrintableCharacter((char)partial[i])) {

                        if (!StringHelper.isPrintableCharacter((char)partial[i])) {

                            EditorActivity.this.mBinary = true;

                            EditorActivity.this.mReadOnly = true;

                            break;
@@ -550,8 +551,6 @@ public class EditorActivity extends Activity implements TextWatcher { 
     */

    Handler mHandler;



    private static final char[] VALID_NON_PRINTABLE_CHARS = {' ', '\t', '\r', '\n'};



    /**

     * @hide

     */
@@ -1507,23 +1506,6 @@ public class EditorActivity extends Activity implements TextWatcher { 
        finish();

    }



    /**

     * Method that check if a character is valid printable character

     *

     * @param c The character to check

     * @return boolean If the character is printable

     * @hide

     */

    static boolean isPrintableCharacter(char c) {

        int cc = VALID_NON_PRINTABLE_CHARS.length;

        for (int i = 0; i < cc; i++) {

            if (c == VALID_NON_PRINTABLE_CHARS[i]) {

                return true;

            }

        }

        return TextUtils.isGraphic(c);

    }



    /**

     * Method that applies the current theme to the activity

     * @hide