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

Commit 7322527b authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

CMFM: Sync jellybean with upstream 

Added missing hungarian translation        Tamás Tóth       http://review.cyanogenmod.org/29947
CMFileManager: fixed typo in romanian tran Igor Sorocean    http://review.cyanogenmod.org/29974
CMFM: Fix typo                             Jorge Ruesga     http://review.cyanogenmod.org/29984
CMFM: Do not use cd and pwd commands       Jorge Ruesga     http://review.cyanogenmod.org/29921
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29801
CMFM: Ignore stderr from stat list command Jorge Ruesga     http://review.cyanogenmod.org/29920
CMFM: Fix race condition                   Jorge Ruesga     http://review.cyanogenmod.org/29919
CMFM: Read hidden files with new stat list Jorge Ruesga     http://review.cyanogenmod.org/29849
CMFM: Fix FC caused by accessing ui outsid Jorge Ruesga     http://review.cyanogenmod.org/29842
CMFM: Fix AsyncResultProgram deadlock      Jorge Ruesga     http://review.cyanogenmod.org/29841
CMFM: es_ES - update missing translations  Jorge Ruesga     http://review.cyanogenmod.org/29802
CMFM: Fix sync object                      Jorge Ruesga     http://review.cyanogenmod.org/29777
CMFM: Fix NPE when parent dir is null      Jorge Ruesga     http://review.cyanogenmod.org/29775
CMFM: Fix navigation view fade effect      Jorge Ruesga     http://review.cyanogenmod.org/29762
CMFM: Display new fso datetimes props      Jorge Ruesga     http://review.cyanogenmod.org/29757
CMFM: Use filesystem type instead of auto  Jorge Ruesga     http://review.cyanogenmod.org/29763
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29731
CMFM: Fix filesystem and fso dialog layout Jorge Ruesga     http://review.cyanogenmod.org/29738
CMFM: Fix name and parent for root directo Jorge Ruesga     http://review.cyanogenmod.org/29737
CMFM: Fixes and Improvements               Jorge Ruesga     http://review.cyanogenmod.org/29679
Update Russian Translation-CMFileManager-C Pavel Volkov     http://review.cyanogenmod.org/29644
Add mime type for exported settings of K9. Danny Baumann    http://review.cyanogenmod.org/29622
Fall back to showing all files for unknown Danny Baumann    http://review.cyanogenmod.org/29621
PT-BR: Fixes to translation                Gustavo Rosa     http://review.cyanogenmod.org/29612
CMFileManager: Updated menu strings to red Roman Barczynski http://review.cyanogenmod.org/29563
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29249
CMFileManager: Add RealVideo and Matroska  Jorge Ruesga     http://review.cyanogenmod.org/28968
Fix german translation for disk usage warn Danny Baumann    http://review.cyanogenmod.org/28914



Change-Id: Ie9681313bbc95ed0b6cb1e0000c5ae5b61e7b5d1
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent 995e39a7

res/drawable-xhdpi/ic_holo_light_history.png

100755 → 100644
(2.97 KiB)

File mode changed from 100755 to 100644.

View file

res/layout-sw600dp/theme_view.xml

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

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

-->



<com.cyanogenmod.filemanager.ui.preferences.ThemeView

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

    android:layout_width="1dp"

    android:layout_height="match_parent">



    <TextView

      android:id="@+id/theme_name"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_alignParentTop="true"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="true"

      android:textAppearance="@style/primary_text_appearance" />



    <TextView

      android:id="@+id/theme_author"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_below="@id/theme_name"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="true"

      android:textAppearance="@style/primary_text_appearance_nohighlight" />



    <TextView

      android:id="@+id/theme_desc"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_alignParentBottom="true"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="false"

      android:maxLines="2"

      android:textAppearance="@style/secondary_text_appearance" />



    <ImageView

      android:id="@+id/theme_preview"

      android:layout_width="match_parent"

      android:layout_height="match_parent"

      android:layout_above="@id/theme_desc"

      android:layout_below="@id/theme_author"

      android:padding="@dimen/extra_large_margin"

      android:layout_gravity="center"

      android:scaleType="centerInside"

      android:contentDescription="@null" />



</com.cyanogenmod.filemanager.ui.preferences.ThemeView>

res/layout-sw720dp/theme_view.xml

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

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

-->



<com.cyanogenmod.filemanager.ui.preferences.ThemeView

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

    android:layout_width="1dp"

    android:layout_height="match_parent">



    <TextView

      android:id="@+id/theme_name"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_alignParentTop="true"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="true"

      android:textAppearance="@style/primary_text_appearance" />



    <TextView

      android:id="@+id/theme_author"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_below="@id/theme_name"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="true"

      android:textAppearance="@style/primary_text_appearance_nohighlight" />



    <TextView

      android:id="@+id/theme_desc"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_alignParentBottom="true"

      android:gravity="center"

      android:ellipsize="end"

      android:singleLine="false"

      android:maxLines="2"

      android:textAppearance="@style/secondary_text_appearance" />



    <ImageView

      android:id="@+id/theme_preview"

      android:layout_width="match_parent"

      android:layout_height="match_parent"

      android:layout_above="@id/theme_desc"

      android:layout_below="@id/theme_author"

      android:padding="@dimen/extra_large_margin"

      android:layout_gravity="center"

      android:scaleType="centerInside"

      android:contentDescription="@null" />



</com.cyanogenmod.filemanager.ui.preferences.ThemeView>

res/layout/bookmarks_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

  android:layout_width="wrap_content"

  android:layout_height="@dimen/default_row_height"

  android:background="@drawable/holo_selector" >

  android:background="@drawable/holo_list_selector_deselected" >



  <ImageView

    android:id="@+id/bookmarks_item_icon"

res/layout/editor.xml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
      android:gravity="top|left"

      android:cursorVisible="true"

      android:background="@null"

      android:imeOptions="actionDone|flagNoFullscreen"

      android:inputType="textMultiLine|textImeMultiLine"

      android:text="@null"

      android:textAppearance="@style/secondary_text_appearance" />