From 81275a614e9c4aaff6a67baddccf650e2429f497 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Tue, 29 Sep 2015 16:02:21 -0700 Subject: Trebuchet : Update default workspace for cyngn dialer Change-Id: Ifdc122e999b1995f4e974e575f3c86dff808a693 --- res/xml/default_workspace_4x4.xml | 3 +++ res/xml/default_workspace_5x5.xml | 3 +++ res/xml/default_workspace_5x6.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml index 61ee48ad8..aab3645da 100644 --- a/res/xml/default_workspace_4x4.xml +++ b/res/xml/default_workspace_4x4.xml @@ -165,6 +165,9 @@ + diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml index e3d355a93..e8a7f536c 100644 --- a/res/xml/default_workspace_5x5.xml +++ b/res/xml/default_workspace_5x5.xml @@ -165,6 +165,9 @@ + diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml index 739714f57..a9c8a6b0e 100644 --- a/res/xml/default_workspace_5x6.xml +++ b/res/xml/default_workspace_5x6.xml @@ -165,6 +165,9 @@ + -- cgit v1.2.3 From af15b41e59de7600aacd86f122941617f23502db Mon Sep 17 00:00:00 2001 From: Danesh M Date: Tue, 29 Sep 2015 17:52:30 -0700 Subject: Trebuchet : Update grid + cancel drag on searchablesChanged Change-Id: Iaceebeebc03ab6e0dbd0fcac3a7e5e2265319c0c --- src/com/android/launcher3/Launcher.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 46b2ccb0b..1603200ef 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5247,7 +5247,10 @@ public class Launcher extends Activity mQsb = null; } mSearchDropTargetBar.setQsbSearchBar(getQsbBar()); - mGrid.layout(this); + if (mDragController.isDragging()) { + mDragController.cancelDrag(); + } + updateDynamicGrid(false); } /** -- cgit v1.2.3 From 1f9ba38cec29ae3dfcb3c3592389676c0f1a87ab Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Wed, 30 Sep 2015 08:56:24 -0700 Subject: App Drawer: fix insets on paddingTop Repro: - Use vertical app drawer - Hold scrubber and move to the top of the app list - Observe: white space above the first element in the list view Change-Id: If14b1e9668c88a42e1069e8096ddc04861397d07 --- src/com/android/launcher3/AppDrawerContainer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/AppDrawerContainer.java b/src/com/android/launcher3/AppDrawerContainer.java index f67bd9aa4..e87c6b8a4 100644 --- a/src/com/android/launcher3/AppDrawerContainer.java +++ b/src/com/android/launcher3/AppDrawerContainer.java @@ -8,8 +8,12 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; public class AppDrawerContainer extends InsettableFrameLayout { + + private int mScrubberHeight; + public AppDrawerContainer(Context context, AttributeSet attrs) { super(context, attrs); + mScrubberHeight = getResources().getDimensionPixelSize(R.dimen.scrubber_height); } @Override @@ -18,8 +22,8 @@ public class AppDrawerContainer extends InsettableFrameLayout { View view = findViewById(R.id.app_drawer_recyclerview); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) view.getLayoutParams(); - int paddingBottom = view.getPaddingBottom() + insets.bottom - mInsets.bottom; - int paddingTop = view.getPaddingTop() + insets.top - mInsets.top; + int paddingBottom = mScrubberHeight + insets.bottom - mInsets.bottom; + int paddingTop = insets.top - mInsets.top; view.setLayoutParams(lp); view.setPadding(view.getPaddingLeft(), paddingTop, view.getPaddingRight(), paddingBottom); -- cgit v1.2.3 From b5f1c45c02ef14443c88e50d1b0bffee76a75585 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Tue, 29 Sep 2015 20:34:09 -0700 Subject: Trebuchet : Ensure search bar doesn't show in hidden If the user is in the app drawer, or settings panel mode, a broadcast could cause a new search target bar to be added which would reset visibility. Ensure visibility is restored. Change-Id: I9eba1eb6ac36bc9873deab1b81e1bb00ee8d4999 --- src/com/android/launcher3/DeviceProfile.java | 11 +++++++---- src/com/android/launcher3/Launcher.java | 5 +---- src/com/android/launcher3/SearchDropTargetBar.java | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index d65b4759a..8bba13c9d 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -766,11 +766,9 @@ public class DeviceProfile { (visibleChildCount-1) * overviewModeBarSpacerWidthPx; } - public void layout(Launcher launcher) { + public void layoutSearchBar(Launcher launcher) { // Update search bar for live settings searchBarVisible = isSearchBarEnabled(launcher); - searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? - searchBarSpaceHeightPx - getSearchBarTopOffset() : 3 * edgeMarginPx); FrameLayout.LayoutParams lp; Resources res = launcher.getResources(); boolean hasVerticalBarLayout = isVerticalBarLayout(); @@ -818,10 +816,15 @@ public class DeviceProfile { vglp.height = LayoutParams.MATCH_PARENT; qsbBar.setLayoutParams(vglp); } + } + public void layout(Launcher launcher) { + layoutSearchBar(launcher); + Resources res = launcher.getResources(); + boolean hasVerticalBarLayout = isVerticalBarLayout(); // Layout the workspace PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace); - lp = (FrameLayout.LayoutParams) workspace.getLayoutParams(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) workspace.getLayoutParams(); lp.gravity = Gravity.CENTER; int orientation = isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT; Rect padding = getWorkspacePadding(orientation); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1603200ef..1dafd1245 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5247,10 +5247,7 @@ public class Launcher extends Activity mQsb = null; } mSearchDropTargetBar.setQsbSearchBar(getQsbBar()); - if (mDragController.isDragging()) { - mDragController.cancelDrag(); - } - updateDynamicGrid(false); + mGrid.layoutSearchBar(this); } /** diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index b58964b03..38daadd8a 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -80,8 +80,16 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D } public void setQsbSearchBar(View qsb) { + float alpha = 1f; + int visibility = View.VISIBLE; + if (mQSBSearchBar != null) { + alpha = mQSBSearchBar.getAlpha(); + visibility = mQSBSearchBar.getVisibility(); + } mQSBSearchBar = qsb; if (mQSBSearchBar != null) { + mQSBSearchBar.setAlpha(alpha); + mQSBSearchBar.setVisibility(visibility); if (mEnableDropDownDropTargets) { mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0, -mBarHeight); -- cgit v1.2.3 From b1f28ea34e66b59e281ec6b3f60d94485268b19e Mon Sep 17 00:00:00 2001 From: Linus Lee Date: Wed, 30 Sep 2015 17:56:15 -0700 Subject: Trebuchet: Use hardware layer for fading app drawer * Apparently this isn't a hardware layer by default, so performance can be really bad on certain devices. REF: CYNGNOS-1169 Change-Id: I0acc9d4f9bfb5defba902edefced08e035377f28 --- .../android/launcher3/AppDrawerListAdapter.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/com/android/launcher3/AppDrawerListAdapter.java b/src/com/android/launcher3/AppDrawerListAdapter.java index 50242c3e3..3639e11f4 100644 --- a/src/com/android/launcher3/AppDrawerListAdapter.java +++ b/src/com/android/launcher3/AppDrawerListAdapter.java @@ -256,17 +256,43 @@ public class AppDrawerListAdapter extends RecyclerView.Adapter Date: Wed, 30 Sep 2015 12:38:42 +0200 Subject: fix NPE when dragging icon to desktop, when QuickSearchBox is missing Change-Id: I82003c814a0f685d3d7781c79b6725cb49ec6530 --- src/com/android/launcher3/SearchDropTargetBar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 38daadd8a..66a85188e 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -217,7 +217,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D // Animate out the QSB search bar, and animate in the drop target bar prepareStartAnimation(mDropTargetBar); mDropTargetBarAnim.start(); - if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() > 0f)) { + if (!isAnyFolderOpen() && (!mIsSearchBarHidden || + (mQSBSearchBar != null && mQSBSearchBar.getAlpha() > 0f))) { prepareStartAnimation(mQSBSearchBar); mQSBSearchBarAnim.start(); } @@ -240,7 +241,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D // Restore the QSB search bar, and animate out the drop target bar prepareStartAnimation(mDropTargetBar); mDropTargetBarAnim.reverse(); - if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() < 1f)) { + if (!isAnyFolderOpen() && (!mIsSearchBarHidden || + (mQSBSearchBar != null && mQSBSearchBar.getAlpha() < 1f))) { if (mLauncher != null && mLauncher.shouldShowSearchBar() && mQSBSearchBar.getVisibility() != View.VISIBLE) { mQSBSearchBar.setVisibility(View.VISIBLE); -- cgit v1.2.3 From 14a18d5bb21661ab0acc2691832afb7b17d270ed Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Thu, 1 Oct 2015 21:54:01 +0200 Subject: trebuchet: protect against npe Change-Id: I14427057c4caf6e9d645944a4b1039343767d4d6 Signed-off-by: Jorge Ruesga --- src/com/android/launcher3/SearchDropTargetBar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 66a85188e..e17ac0e3d 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -243,7 +243,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D mDropTargetBarAnim.reverse(); if (!isAnyFolderOpen() && (!mIsSearchBarHidden || (mQSBSearchBar != null && mQSBSearchBar.getAlpha() < 1f))) { - if (mLauncher != null && mLauncher.shouldShowSearchBar() + if (mLauncher != null && mQSBSearchBar != null && mLauncher.shouldShowSearchBar() && mQSBSearchBar.getVisibility() != View.VISIBLE) { mQSBSearchBar.setVisibility(View.VISIBLE); } -- cgit v1.2.3 From 681ac55c62c4593036792bb3bf45dc5738ac2de4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 3 Oct 2015 00:22:44 +0300 Subject: Automatic translation import Change-Id: Ib9d1ead1ee52772acd34baed9773c0d03276ead3 --- res/values-af/cm_strings.xml | 1 - res/values-ar/cm_strings.xml | 1 - res/values-ast-rES/strings.xml | 3 --- res/values-az-rAZ/cm_strings.xml | 1 - res/values-ca/cm_strings.xml | 1 - res/values-cs/cm_strings.xml | 1 - res/values-da/cm_strings.xml | 1 - res/values-de/cm_strings.xml | 1 - res/values-el/cm_strings.xml | 1 - res/values-es/cm_strings.xml | 1 - res/values-et-rEE/cm_strings.xml | 1 - res/values-eu-rES/cm_strings.xml | 1 - res/values-fa/cm_strings.xml | 1 - res/values-fi/cm_strings.xml | 1 - res/values-fr/cm_strings.xml | 1 - res/values-hi/cm_strings.xml | 1 - res/values-hu/cm_strings.xml | 1 - res/values-in/cm_strings.xml | 1 - res/values-it/cm_strings.xml | 1 - res/values-iw/cm_strings.xml | 1 - res/values-ja/cm_strings.xml | 1 - res/values-kn-rIN/cm_strings.xml | 1 - res/values-ko/cm_strings.xml | 1 - res/values-ku/strings.xml | 3 --- res/values-lb/cm_strings.xml | 1 - res/values-lb/strings.xml | 3 --- res/values-lt/cm_strings.xml | 1 - res/values-nb/cm_strings.xml | 1 - res/values-nl/cm_strings.xml | 1 - res/values-pl/cm_strings.xml | 1 - res/values-pt-rBR/cm_strings.xml | 1 - res/values-pt-rPT/cm_strings.xml | 1 - res/values-ro/cm_strings.xml | 1 - res/values-ru/cm_strings.xml | 1 - res/values-sk/cm_strings.xml | 1 - res/values-sl/cm_strings.xml | 1 - res/values-sr/cm_strings.xml | 1 - res/values-th/cm_strings.xml | 1 - res/values-tr/cm_strings.xml | 1 - res/values-uk/cm_strings.xml | 1 - res/values-vi/cm_strings.xml | 1 - res/values-zh-rCN/cm_strings.xml | 1 - res/values-zh-rHK/cm_strings.xml | 1 - 43 files changed, 49 deletions(-) diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index e7529e4bd..f8ebfea6c 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -49,5 +49,4 @@ Bladsye Gedeaktiveer \'n Soektog aktiwiteit kon nie gevind word nie! - Program nie beskikbaar nie diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index 60e122f09..d9e85e56c 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -49,5 +49,4 @@ مقسم إلى صفحات معطل لا يمكن العثور على نشاط بحثي! - التطبيق غير متوافر diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml index 566e9e768..cf74ce20e 100644 --- a/res/values-ast-rES/strings.xml +++ b/res/values-ast-rES/strings.xml @@ -27,7 +27,6 @@ Widgets Amosar memoria Caltén primíu\'l widget que quieras esbillar. - Tienda %1$d \u00d7 %2$d Fallu al arrastrar l\'elementu a la pantalla d\'aniciu. Esbilla un widget p\'amestar @@ -55,8 +54,6 @@ Desaniciar Desinstalar Información de l\'aplicación - Guetar - Gueta por voz Aplicaciones Desaniciar Desinstalar anovamientu diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml index 75f1f12b4..9f5eb930b 100644 --- a/res/values-az-rAZ/cm_strings.xml +++ b/res/values-az-rAZ/cm_strings.xml @@ -49,5 +49,4 @@ Səhifəli LƏĞV EDİLDİ Axtarış fəaliyyəti tapılmadı! - Tətbiq mövcud deyil diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index 9e26a28c0..1dfea6512 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -49,5 +49,4 @@ Paginada DESHABILITAT No s\'ha pogut trobar una activitat de cerca! - Aplicació no disponible diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index 1cab1259f..b385b3f99 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -49,5 +49,4 @@ Stránkové ZAKÁZÁNO Vyhledávací aktivita nenalezena! - Aplikace není k dispozici diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index 005b64b96..b1bf8d429 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -49,5 +49,4 @@ Sideinddelt HANDICAPPET En funktion til søgning findes ikke! - App ikke tilgængelig diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index aec349004..f41903af7 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -49,5 +49,4 @@ Seiten DEAKTIVIERT Es konnte keine Suche-Aktivität gefunden werden! - APP nicht verfügbar diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index 5b327c1aa..9b8e98e68 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -49,5 +49,4 @@ Οριζόντια ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ Δεν βρέθηκε καμία δραστηριότητα αναζήτησης! - Η εφαρμογή δεν είναι διαθέσιμη diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index ad9b409cb..aaf703131 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -49,5 +49,4 @@ Paginado DESHABILITADO ¡No se pudo encontrar un asistente de búsqueda! - Aplicación no disponible diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml index afd4b7b80..d058cef9e 100644 --- a/res/values-et-rEE/cm_strings.xml +++ b/res/values-et-rEE/cm_strings.xml @@ -49,5 +49,4 @@ Leheküljed KEELATUD Otsimise tegevusala ei leitud! - Rakendus pole saadaval diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml index ceec41a7b..a2a1ed1e6 100644 --- a/res/values-eu-rES/cm_strings.xml +++ b/res/values-eu-rES/cm_strings.xml @@ -49,5 +49,4 @@ Orrialdeka EZGAITUTA Ezin izan da bilaketa aktibitaterik aurkitu! - Aplikazioa ez dago eskuragarri diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml index a3cd308e2..514261787 100644 --- a/res/values-fa/cm_strings.xml +++ b/res/values-fa/cm_strings.xml @@ -49,5 +49,4 @@ صفحه به صفحه غیرفعال عملگری برای جستجو یافت نشد! - برنامه در دسترس نیست diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index 70d314053..d1f8f0ffc 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -49,5 +49,4 @@ Vaaka POIS KÄYTÖSTÄ Hakuhistoriaa ei löytynyt! - Sovellus ei käytettävissä diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index 50c0dbafe..fceb33252 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -49,5 +49,4 @@ Paginée DÉSACTIVÉ Aucune recherche n\'a pu être trouvée ! - Application non disponible diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml index 962ace5aa..3cd30b32d 100644 --- a/res/values-hi/cm_strings.xml +++ b/res/values-hi/cm_strings.xml @@ -49,5 +49,4 @@ पृष्ठीय अक्षम एक खोज गतिविधि नहीं मिली। - ऐप उपलब्ध नहीं है diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index 4140f1e9d..8a783ac40 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -49,5 +49,4 @@ Lapozható LETILTVA Keresési tevékenység nem található! - Alkalmazás nem elérhető diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml index 89dbcef97..f4f14ae10 100644 --- a/res/values-in/cm_strings.xml +++ b/res/values-in/cm_strings.xml @@ -49,5 +49,4 @@ Berhalaman DINONAKTIFKAN Aktivitas pencarian tidak dapat ditemukan! - Aplikasi tidak tersedia diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index db524ea4e..22134dd56 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -49,5 +49,4 @@ Paginato DISATTIVATO Impossibile trovare un\'activity di ricerca! - App non disponibile diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 05fb8d01e..ec85c55a3 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -49,5 +49,4 @@ דפים כבוי לא ניתן היה למצוא פעולת חיפוש! - יישום לא זמין diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index cf701b28a..c1c76f813 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -49,5 +49,4 @@ ページ 無効 検索アクティビティが見つかりませんでした。 - アプリが利用できません diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml index 4989a8041..cd1ec624c 100644 --- a/res/values-kn-rIN/cm_strings.xml +++ b/res/values-kn-rIN/cm_strings.xml @@ -49,5 +49,4 @@ ಪುಟವಾದ ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ ಶೋಧನೆ ಚಟುವಟಿಕೆ ಪತ್ತೆಯಾಗಲಿಲ್ಲ! - ಆಪ್ ಲಭ್ಯವಿಲ್ಲ diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml index 19e5bda8b..e95bc71fc 100644 --- a/res/values-ko/cm_strings.xml +++ b/res/values-ko/cm_strings.xml @@ -49,5 +49,4 @@ 페이징 사용 안함 검색 작업을 찾아 낼 수 없습니다. - 앱을 사용할 수 없음 diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml index b4a54bbcf..28e8fc50a 100644 --- a/res/values-ku/strings.xml +++ b/res/values-ku/strings.xml @@ -26,7 +26,6 @@ ویدجێتەکان پیشاندانی بیرگە بیسوو & دەست ڕاگرە بۆ هەڵگرتنی ویجێتێک. - فرۆشگا %1$d \u00d7 %2$d نەیتوانی بڕگەکە فڕێداتە سەر ئەم ڕوونمایە. ویجێت هەڵبژێرە بۆ دروستکردن @@ -54,8 +53,6 @@ لابردن دامه‌زرانسڕینه‌وه‌ زانیاریی بەرنامە - گه‌ڕان - گەڕانی دەنگی بەرنامەکان لابردن دامه‌زرانسڕینه‌وه‌ی بەڕۆژکردنەوە diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml index f8736d70d..5ae11260d 100644 --- a/res/values-lb/cm_strings.xml +++ b/res/values-lb/cm_strings.xml @@ -49,5 +49,4 @@ Säiten DESAKTIVÉIEREN Eng Sichaktivitéit konnt net fonnt ginn! - App net disponibel diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index e6d38307f..f1ab541e5 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -27,7 +27,6 @@ Widgeten Späicher uweisen Drécken an halen, fir e Widget opzerafen. - Geschäft %1$d \u00d7 %2$d Konnt d\'Element net um Startschierm ofleeën. Widget auswielen den erstallt soll ginn @@ -55,8 +54,6 @@ Läschen Desinstalléieren App-Info - Sichen - Stëmmsich Appen Ewechhuelen Aktualiséierung desinstalléieren diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index db9997479..cfdfa6b6a 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -49,5 +49,4 @@ Puslapiai NELEIDŽIAMA Paieškos veikla negali būti rasta! - Programa nepasiekiama diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index 92f927512..6835349dd 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -49,5 +49,4 @@ Sidevekslet DEAKTIVERT Finner ikke en søkeaktivitet! - App ikke tilgjengelig diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index 51bbdbd28..685e329e2 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -49,5 +49,4 @@ Met pagina\'s UITGESCHAKELD Geen zoekactiviteit gevonden - App niet beschikbaar diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index 1c93eb9d3..1cc8d90e0 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -49,5 +49,4 @@ Strony WYŁĄCZONE Nie można odnaleźć aktywności związanej z wyszukiwaniem! - Aplikacja niedostępna diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index 8a1c181bc..daf50efde 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -49,5 +49,4 @@ Paginada DESATIVADO Uma atividade de pesquisa não pôde ser encontrada! - App não disponível diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 54bf2ec81..ac8b7f70e 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -49,5 +49,4 @@ Paginada DESATIVADO Não foi encontrada nenhuma atividade de pesquisa! - A aplicação não está disponível diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml index e4676b89e..c397e3c7b 100644 --- a/res/values-ro/cm_strings.xml +++ b/res/values-ro/cm_strings.xml @@ -49,5 +49,4 @@ Paginat DEZACTIVAT Imposibil de găsit o activitate de căutare! - Aplicația nu este disponibilă diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index 9b5c69d2b..78b65d10c 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -49,5 +49,4 @@ Постраничное НЕДОСТУПНО Невозможно запустить приложение поиска! - Приложение недоступно diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index 1f13b4597..3a8c2208b 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -49,5 +49,4 @@ Stránkované ZAKÁZANÉ Aktivita vyhľadávania sa nenašla! - Aplikácia nie je k dispozícii diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml index 74af9a763..ea99bd8cf 100644 --- a/res/values-sl/cm_strings.xml +++ b/res/values-sl/cm_strings.xml @@ -49,5 +49,4 @@ Po straneh ONEMOGOČENO Dejavnosti iskanja ni bilo mogoče najti! - Program ni na voljo diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index f7d5b65fd..baeab81bd 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -49,5 +49,4 @@ Поставка ОНЕМОГУЋЕНО Претрага активности не може бити пронађена! - Апликација није доступна diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml index a095bd27f..f4ef8d99a 100644 --- a/res/values-th/cm_strings.xml +++ b/res/values-th/cm_strings.xml @@ -49,5 +49,4 @@ หน้า ปิดการใช้งาน ไม่มีกิจกรรมที่ค้นหา! - ไม่สามารถใช้งานแอพได้ diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index d147e044b..3546f0485 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -49,5 +49,4 @@ Sayfalı DEVRE DIŞI Arama etkinliği bulunamadı! - Uyg. kullanılabilir değil diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 3a33eb592..f66e86869 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -49,5 +49,4 @@ Сторінками ВИМКНЕНО Діяльність з пошуку не виявлена! - Додаток недоступний diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml index 6767fc536..b9002e834 100644 --- a/res/values-vi/cm_strings.xml +++ b/res/values-vi/cm_strings.xml @@ -49,5 +49,4 @@ Đã đánh số trang ĐÃ TẮT Không tìm thấy hoạt động tìm kiếm! - Ứng dụng không sẵn có diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index dee4424ef..d0177c9b0 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -49,5 +49,4 @@ 分页 已禁用 无法找到搜索活动！ - 应用不可用 diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index 72fc28f5c..a9ec7bfba 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -47,5 +47,4 @@ 垂直 分頁 找不到搜尋活動！ - 應用程式不可用 -- cgit v1.2.3 From b69f0ee68b74501e1eec50df64f4b32814688d56 Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Mon, 5 Oct 2015 17:02:17 -0700 Subject: Update default workspace Change-Id: Idb555ab9f15a1683f684cfa4e227e7d421b45507 --- res/xml/default_workspace_5x5.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml index e8a7f536c..b3b064dba 100644 --- a/res/xml/default_workspace_5x5.xml +++ b/res/xml/default_workspace_5x5.xml @@ -141,7 +141,7 @@ launcher:packageName="com.cyanogenmod.eleven" launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity" launcher:screen="2" - launcher:x="0" + launcher:x="3" launcher:y="4" /> - \ No newline at end of file + -- cgit v1.2.3 From 769805b18f1627d0650b3126d5edcc68550bedec Mon Sep 17 00:00:00 2001 From: Danesh M Date: Wed, 7 Oct 2015 14:19:33 -0700 Subject: Trebuchet : Ensure workspace icon migration for dialer Ensure dialer workspace icon migration for c-apps package. CYNGNOS-1194 Change-Id: Id6535f5e8c5b16350666f75dda771311a49fe66b --- src/com/android/launcher3/LauncherProvider.java | 76 ++++++++++++++++++++++++- src/com/android/launcher3/Utilities.java | 10 ++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index dd2f48b18..753f6e746 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -56,12 +56,13 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.Set; public class LauncherProvider extends ContentProvider { private static final String TAG = "Launcher.LauncherProvider"; private static final boolean LOGD = false; - private static final int DATABASE_VERSION = 21; + private static final int DATABASE_VERSION = 22; static final String OLD_AUTHORITY = "com.android.launcher2.settings"; static final String AUTHORITY = ProviderConfig.AUTHORITY; @@ -936,6 +937,11 @@ public class LauncherProvider extends ContentProvider { version = 21; } + if (oldVersion < 22) { + updateDialtactsLauncher(db); + version = 22; + } + if (version != DATABASE_VERSION) { Log.w(TAG, "Destroying all old data."); db.execSQL("DROP TABLE IF EXISTS " + TABLE_FAVORITES); @@ -986,6 +992,74 @@ public class LauncherProvider extends ContentProvider { return true; } + private void updateDialtactsLauncher(SQLiteDatabase db) { + if (!Utilities.isPackageInstalled(mContext, "com.cyngn.dialer")) { + return; + } + + final String cyngnDialer = "com.cyngn.dialer"; + final String aospDialer = "com.android.dialer"; + final String dialtactsClass = "com.android.dialer.DialtactsActivity"; + + final String selectWhere = buildOrWhereString(Favorites.ITEM_TYPE, + new int[]{Favorites.ITEM_TYPE_SHORTCUT, Favorites.ITEM_TYPE_APPLICATION}); + Cursor c = null; + db.beginTransaction(); + + try { + // Select and iterate through each matching widget + c = db.query(TABLE_FAVORITES, + new String[] { Favorites._ID, Favorites.INTENT }, + selectWhere, null, null, null, null); + if (c == null) return; + + while (c.moveToNext()) { + long favoriteId = c.getLong(0); + final String intentUri = c.getString(1); + if (intentUri != null) { + try { + final Intent intent = Intent.parseUri(intentUri, 0); + final ComponentName componentName = intent.getComponent(); + final Set categories = intent.getCategories(); + + if (Intent.ACTION_MAIN.equals(intent.getAction()) && + componentName != null && + aospDialer.equals(componentName.getPackageName()) && + dialtactsClass.equals(componentName.getClassName()) && + categories != null && + categories.contains(Intent.CATEGORY_LAUNCHER)) { + + final ComponentName newName = new ComponentName(cyngnDialer, + componentName.getClassName()); + intent.setComponent(newName); + final ContentValues values = new ContentValues(); + values.put(Favorites.INTENT, intent.toUri(0)); + + String updateWhere = Favorites._ID + "=" + favoriteId; + db.update(TABLE_FAVORITES, values, updateWhere, null); + if (Log.isLoggable(TAG, Log.INFO)) { + Log.i(TAG, "Updated " + componentName + " to " + newName); + } + } + } catch (RuntimeException ex) { + Log.e(TAG, "Problem moving Dialtacts activity", ex); + } catch (URISyntaxException e) { + Log.e(TAG, "Problem moving Dialtacts activity", e); + } + } + } + + db.setTransactionSuccessful(); + } catch (SQLException ex) { + Log.w(TAG, "Problem while upgrading dialtacts icon", ex); + } finally { + db.endTransaction(); + if (c != null) { + c.close(); + } + } + } + private boolean updateContactsShortcuts(SQLiteDatabase db) { final String selectWhere = buildOrWhereString(Favorites.ITEM_TYPE, new int[] { Favorites.ITEM_TYPE_SHORTCUT }); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index cfadeaa5c..8fe2e841b 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -617,4 +617,14 @@ public final class Utilities { } return defaultWidgetForSearchPackage; } + + public static boolean isPackageInstalled(Context context, String pkg) { + PackageManager packageManager = context.getPackageManager(); + try { + PackageInfo pi = packageManager.getPackageInfo(pkg, 0); + return pi.applicationInfo.enabled; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } } -- cgit v1.2.3 From 486bcb308dd39e341250348fef68414c0015b656 Mon Sep 17 00:00:00 2001 From: Yvonne Wong Date: Fri, 9 Oct 2015 13:26:24 -0700 Subject: Trebuchet: make workspace layout configurable by prebundled mcc issue-id: PAELLA-42 Change-Id: Ice4f73ee6ebaa55e27c07a02f1cc5b989f91c59a --- res/values/cm_strings.xml | 1 + src/com/android/launcher3/LauncherAppState.java | 49 +++++++++++++++++++++- src/com/android/launcher3/LauncherProvider.java | 55 ++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 225e3358e..7602ac107 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -48,6 +48,7 @@ Google Play + Scroll effect diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index efa203769..c55adfcf6 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -23,12 +23,16 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.content.res.AssetManager; import android.content.res.Configuration; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Point; import android.os.Build; import android.os.Handler; +import android.os.SystemProperties; +import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; import android.view.Display; @@ -44,6 +48,8 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { private static final boolean DEBUG = false; + private static final String MCC_PROP_NAME = "ro.prebundled.mcc"; + private final AppFilter mAppFilter; private final BuildInfo mBuildInfo; private final LauncherModel mModel; @@ -210,13 +216,52 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { DisplayMetrics dm = new DisplayMetrics(); display.getMetrics(dm); + Resources resources = context.getResources(); + if (dynamicGrid == null) { Point smallestSize = new Point(); Point largestSize = new Point(); display.getCurrentSizeRange(smallestSize, largestSize); + String mcc = SystemProperties.get(MCC_PROP_NAME); + + if (!TextUtils.isEmpty(mcc)) { + Log.d(TAG, "mcc not empty: " + mcc); + + Configuration tempConfiguration = new Configuration(resources.getConfiguration()); + boolean shouldUseTempConfig = false; + + try { + tempConfiguration.mcc = Integer.parseInt(mcc); + shouldUseTempConfig = true; + } catch (NumberFormatException e) { + // not able to parse mcc, catch exception and exit out of this logic + e.printStackTrace(); + } + + if (shouldUseTempConfig) { + String publicSrcDir = null; + try { + String packageName = sContext.getPackageName(); + publicSrcDir = sContext.getPackageManager().getApplicationInfo(packageName, + 0).publicSourceDir; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + + AssetManager assetManager = new AssetManager(); + if (!TextUtils.isEmpty(publicSrcDir)) { + assetManager.addAssetPath(publicSrcDir); + } + + resources = new Resources(assetManager, new DisplayMetrics(), + tempConfiguration); + } + + } + dynamicGrid = new DynamicGrid(context, - context.getResources(), + resources, Math.min(smallestSize.x, smallestSize.y), Math.min(largestSize.x, largestSize.y), realSize.x, realSize.y, @@ -225,7 +270,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { // Update the icon size DeviceProfile grid = dynamicGrid.getDeviceProfile(); - grid.updateFromConfiguration(context, context.getResources(), + grid.updateFromConfiguration(context, resources, realSize.x, realSize.y, dm.widthPixels, dm.heightPixels); return dynamicGrid; diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 753f6e746..c754edb13 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -30,6 +30,9 @@ import android.content.Context; import android.content.Intent; import android.content.OperationApplicationException; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.res.AssetManager; +import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; import android.database.SQLException; @@ -40,8 +43,10 @@ import android.database.sqlite.SQLiteStatement; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; +import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; +import android.util.DisplayMetrics; import android.util.Log; import android.util.SparseArray; @@ -90,6 +95,8 @@ public class LauncherProvider extends ContentProvider { static final Uri CONTENT_APPWIDGET_RESET_URI = Uri.parse("content://" + AUTHORITY + "/appWidgetReset"); + private static final String MCC_PROP_NAME = "ro.prebundled.mcc"; + private DatabaseHelper mOpenHelper; private static boolean sJustLoadedFromOldDb; @@ -311,11 +318,57 @@ public class LauncherProvider extends ContentProvider { SharedPreferences sp = getContext().getSharedPreferences(spKey, Context.MODE_PRIVATE); if (sp.getBoolean(EMPTY_DATABASE_CREATED, false)) { - Log.d(TAG, "loading default workspace"); + if (LOGD) Log.d(TAG, "loading default workspace"); AutoInstallsLayout loader = AutoInstallsLayout.get(getContext(), mOpenHelper.mAppWidgetHost, mOpenHelper); + String mcc = SystemProperties.get(MCC_PROP_NAME); + + if (!TextUtils.isEmpty(mcc)) { + if (LOGD) Log.d(TAG, "mcc: " + mcc); + + Configuration tempConfiguration = new Configuration(getContext().getResources(). + getConfiguration()); + boolean shouldUseTempConfig = false; + + try { + tempConfiguration.mcc = Integer.parseInt(mcc); + shouldUseTempConfig = true; + } catch (NumberFormatException e) { + // not able to parse mcc, catch exception and exit out of this logic + e.printStackTrace(); + } + + if (shouldUseTempConfig) { + String publicSrcDir = null; + try { + String packageName = getContext().getPackageName(); + publicSrcDir = getContext().getPackageManager(). + getApplicationInfo(packageName, 0).publicSourceDir; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + + AssetManager assetManager = new AssetManager(); + if (!TextUtils.isEmpty(publicSrcDir)) { + assetManager.addAssetPath(publicSrcDir); + } + Resources customResources = new Resources(assetManager, new DisplayMetrics(), + tempConfiguration); + + int mccLayout = LauncherAppState.getInstance() + .getDynamicGrid().getDeviceProfile().defaultLayoutId; + + if (mccLayout != 0) { + if (LOGD) Log.d(TAG, "mcc layout id: " + mccLayout); + + loader = new DefaultLayoutParser(getContext(), mOpenHelper.mAppWidgetHost, + mOpenHelper, customResources, mccLayout); + } + } + } + if (loader == null) { final Partner partner = Partner.get(getContext().getPackageManager()); if (partner != null && partner.hasDefaultLayout()) { -- cgit v1.2.3 From b1b858f89e605bc6329c4ee843648713c32eff15 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 12 Oct 2015 17:18:13 +0300 Subject: Automatic translation import Change-Id: I7e7b4a6a7af94c88a64c627915a72a7145699d83 --- res/values-ast-rES/cm_strings.xml | 1 + res/values-lb/strings.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml index 41a828980..2c83f99a1 100644 --- a/res/values-ast-rES/cm_strings.xml +++ b/res/values-ast-rES/cm_strings.xml @@ -31,6 +31,7 @@ Condensáu Personalizar (%1$d \u00d7 %2$d) Esbilla\'l tamañu personalizáu + Reproducir Efeutu de desplazamientu Mou d\'ordenación Títulu diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index f1ab541e5..fdeb17381 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -22,7 +22,9 @@ Startschierm Kär-Appe vun Android D\'App ass net installéiert. + App ass net disponibel Erofgelueden App am séchere Modus desaktivéiert + Widgeten desaktivéiert am Sécherheetsmodus Widgeten Widgeten Späicher uweisen -- cgit v1.2.3