From 14f67edd3fd39137df072d66a6fb33a148786545 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Tue, 11 May 2010 14:02:43 -0700
Subject: Update Launcher2 to work with LLVM.

Change-Id: I992b812ec58d182e5df7ddad3ab8e7d9e7b88551
---
 res/raw/allapps.rs    | 330 ++++++++++++++++++++++++++++++++------------------
 res/raw/allapps_bc.bc | Bin 0 -> 11052 bytes
 2 files changed, 212 insertions(+), 118 deletions(-)
 create mode 100644 res/raw/allapps_bc.bc

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index af5abd3..0e278d9 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -1,41 +1,115 @@
 #pragma version(1)
-#pragma stateVertex(PV)
-#pragma stateFragment(PFTexNearest)
-#pragma stateStore(PSIcons)
+
+#include "../../../../../frameworks/base/libs/rs/scriptc/rs_types.rsh"
+#include "../../../../../frameworks/base/libs/rs/scriptc/rs_math.rsh"
+#include "../../../../../frameworks/base/libs/rs/scriptc/rs_graphics.rsh"
+//#pragma stateVertex(PV)
+//#pragma stateFragment(PFTexNearest)
+//#pragma stateStore(PSIcons)
 
 #define PI 3.14159f
 
-int g_SpecialHWWar;
+static int g_SpecialHWWar;
+
+
+// Constants from Java
+int COLUMNS_PER_PAGE_PORTRAIT;
+int ROWS_PER_PAGE_PORTRAIT;
+int COLUMNS_PER_PAGE_LANDSCAPE;
+int ROWS_PER_PAGE_LANDSCAPE;
+
+float gNewPositionX;
+int gNewTouchDown;
+float gFlingVelocity;
+int gIconCount;
+int gSelectedIconIndex;
+rs_allocation gSelectedIconTexture;
+float gZoomTarget;
+rs_allocation gHomeButton;
+float gTargetPos;
+
+rs_program_fragment gPFTexNearest;
+rs_program_fragment gPFTexMip;
+rs_program_fragment gPFTexMipAlpha;
+rs_program_vertex gPVCurve;
+rs_program_store gPS;
+rs_mesh gSMCell;
+
+rs_allocation *gIconIDs;
+rs_allocation *gLabelIDs;
+
+typedef struct VpConsts_s {
+    float4 Position;
+    float4 ScaleOffset;
+    float2 BendPos;
+    float2 ImgSize;
+} VpConsts_t;
+VpConsts_t *vpConstants;
+
+
+#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gNewPositionX, gNewTouchDown, gFlingVelocity, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gZoomTarget, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants)
+#pragma rs export_func(resetHWWar, move, moveTo, setZoom, fling)
+
+
+void debugAll()
+{
+    debugPi(1000, COLUMNS_PER_PAGE_PORTRAIT);
+    debugPi(1001, ROWS_PER_PAGE_PORTRAIT);
+    debugPi(1002, COLUMNS_PER_PAGE_LANDSCAPE);
+    debugPi(1003, ROWS_PER_PAGE_LANDSCAPE);
+
+    debugPf(1018, gNewPositionX);
+    debugPi(1019, gNewTouchDown);
+    debugPf(1020, gFlingVelocity);
+    debugPi(1021, gIconCount);
+    debugPi(1022, gSelectedIconIndex);
+    debugPi(1023, gSelectedIconTexture);
+    debugPf(1024, gZoomTarget);
+    debugPi(1025, gHomeButton);
+    debugPf(1026, gTargetPos);
+
+    debugPi(1027, gPFTexNearest);
+    debugPi(1028, gPFTexMip);
+    debugPi(1029, gPFTexMipAlpha);
+    debugPi(1030, gPVCurve);
+    debugPi(1031, gSMCell);
+
+    debugP(1032, gIconIDs);
+    debugP(1033, gLabelIDs);
+    debugP(1034, vpConstants);
+}
+
 
 // Attraction to center values from page edge to page center.
-float g_AttractionTable[9];
-float g_FrictionTable[9];
-float g_PhysicsTableSize;
-
-float g_PosPage;
-float g_PosVelocity;
-float g_LastPositionX;
-int g_LastTouchDown;
-float g_DT;
-int g_LastTime;
-int g_PosMax;
-float g_Zoom;
-float g_Animation;
-float g_OldPosPage;
-float g_OldPosVelocity;
-float g_OldZoom;
-float g_MoveToTotalTime;
-float g_MoveToTime;
-float g_MoveToOldPos;
-
-int g_Cols;
-int g_Rows;
+static float g_AttractionTable[9];
+static float g_FrictionTable[9];
+static float g_PhysicsTableSize;
+
+static float g_PosPage;
+static float g_PosVelocity;
+static float g_LastPositionX;
+static int g_LastTouchDown;
+static float g_DT;
+static int g_LastTime;
+static int g_PosMax;
+static float g_Zoom;
+static float g_Animation;
+static float g_OldPosPage;
+static float g_OldPosVelocity;
+static float g_OldZoom;
+static float g_MoveToTotalTime;
+static float g_MoveToTime;
+static float g_MoveToOldPos;
+
+static int g_Cols;
+static int g_Rows;
 
 // Drawing constants, should be parameters ======
 #define VIEW_ANGLE 1.28700222f
 
-int g_DrawLastFrame;
-int lastFrame(int draw) {
+static int g_DrawLastFrame;
+static int lastFrame(int draw) {
+    //debugPi(99, 13);
     // We draw one extra frame to work around the last frame post bug.
     // We also need to track if we drew the last frame to deal with large DT
     // in the physics.
@@ -44,11 +118,15 @@ int lastFrame(int draw) {
     return ret;  // should return draw instead.
 }
 
-void updateReadback() {
-    if ((g_OldPosPage != g_PosPage) ||
-        (g_OldPosVelocity != g_PosVelocity) ||
-        (g_OldZoom != g_Zoom)) {
+static void updateReadback() {
+    //debugPi(99, 12);
+    //if ((g_OldPosPage != g_PosPage) ||
+        //(g_OldPosVelocity != g_PosVelocity) ||
+        //(g_OldZoom != g_Zoom)) {
 
+    //debugPf(40, g_PosPage);
+    //debugPf(41, g_PosVelocity);
+    //debugPf(42, g_Zoom);
         g_OldPosPage = g_PosPage;
         g_OldPosVelocity = g_PosVelocity;
         g_OldZoom = g_Zoom;
@@ -58,10 +136,11 @@ void updateReadback() {
         i[1] = g_PosVelocity * (1 << 16);
         i[2] = g_OldZoom * (1 << 16);
         sendToClient(&i[0], 1, 12, 1);
-    }
+    //}
 }
 
-void setColor(float r, float g, float b, float a) {
+static void setColor(float r, float g, float b, float a) {
+    //debugPi(99, 11);
     if (g_SpecialHWWar) {
         color(0, 0, 0, 0.001f);
     } else {
@@ -70,6 +149,7 @@ void setColor(float r, float g, float b, float a) {
 }
 
 void init() {
+    //debugPi(99, 10);
     g_AttractionTable[0] = 20.0f;
     g_AttractionTable[1] = 20.0f;
     g_AttractionTable[2] = 20.0f;
@@ -103,26 +183,29 @@ void init() {
 }
 
 void resetHWWar() {
+    //debugPi(99, 9);
     g_SpecialHWWar = 1;
 }
 
 void move() {
+    //debugPi(99, 8);
     if (g_LastTouchDown) {
-        float dx = -(state->newPositionX - g_LastPositionX);
+        float dx = -(gNewPositionX - g_LastPositionX);
         g_PosVelocity = 0;
         g_PosPage += dx * 5.2f;
 
         float pmin = -0.49f;
         float pmax = g_PosMax + 0.49f;
-        g_PosPage = clampf(g_PosPage, pmin, pmax);
+        g_PosPage = clamp(g_PosPage, pmin, pmax);
     }
-    g_LastTouchDown = state->newTouchDown;
-    g_LastPositionX = state->newPositionX;
+    g_LastTouchDown = gNewTouchDown;
+    g_LastPositionX = gNewPositionX;
     g_MoveToTime = 0;
     //debugF("Move P", g_PosPage);
 }
 
 void moveTo() {
+    //debugPi(99, 7);
     g_MoveToTime = g_MoveToTotalTime;
     g_PosVelocity = 0;
     g_MoveToOldPos = g_PosPage;
@@ -131,18 +214,20 @@ void moveTo() {
 }
 
 void setZoom() {
-    g_Zoom = state->zoomTarget;
+    //debugPi(99, 6);
+    g_Zoom = gZoomTarget;
     g_DrawLastFrame = 1;
     updateReadback();
 }
 
 void fling() {
+    //debugPi(99, 5);
     g_LastTouchDown = 0;
-    g_PosVelocity = -state->flingVelocity * 4;
-    float av = fabsf(g_PosVelocity);
+    g_PosVelocity = -gFlingVelocity * 4;
+    float av = fabs(g_PosVelocity);
     float minVel = 3.5f;
 
-    minVel *= 1.f - (fabsf(fracf(g_PosPage + 0.5f) - 0.5f) * 0.45f);
+    minVel *= 1.f - (fabs(frac(g_PosPage + 0.5f) - 0.5f) * 0.45f);
 
     if (av < minVel && av > 0.2f) {
         if (g_PosVelocity > 0) {
@@ -153,59 +238,51 @@ void fling() {
     }
 
     if (g_PosPage <= 0) {
-        g_PosVelocity = maxf(0, g_PosVelocity);
+        g_PosVelocity = max(0.f, g_PosVelocity);
     }
     if (g_PosPage > g_PosMax) {
-        g_PosVelocity = minf(0, g_PosVelocity);
+        g_PosVelocity = min(0.f, g_PosVelocity);
     }
 }
 
-float
-modf(float x, float y)
-{
-    return x-(y*floorf(x/y));
+// Interpolates values in the range 0..1 to a curve that eases in
+// and out.
+static float getInterpolation(float input) {
+    //debugPi(99, 4);
+    return (cos((input + 1) * PI) * 0.5f) + 0.5f;
 }
 
 
-/*
- * Interpolates values in the range 0..1 to a curve that eases in
- * and out.
- */
-float
-getInterpolation(float input) {
-    return (cosf((input + 1) * PI) / 2.0f) + 0.5f;
-}
-
-
-void updatePos() {
+static void updatePos() {
+    //debugPi(99, 3);
     if (g_LastTouchDown) {
         return;
     }
 
-    float tablePosNorm = fracf(g_PosPage + 0.5f);
+    float tablePosNorm = frac(g_PosPage + 0.5f);
     float tablePosF = tablePosNorm * g_PhysicsTableSize;
     int tablePosI = tablePosF;
     float tablePosFrac = tablePosF - tablePosI;
-    float accel = lerpf(g_AttractionTable[tablePosI],
+    float accel = mix(g_AttractionTable[tablePosI],
                         g_AttractionTable[tablePosI + 1],
                         tablePosFrac) * g_DT;
-    float friction = lerpf(g_FrictionTable[tablePosI],
+    float friction = mix(g_FrictionTable[tablePosI],
                         g_FrictionTable[tablePosI + 1],
                         tablePosFrac) * g_DT;
 
     if (g_MoveToTime) {
         // New position is old posiition + (total distance) * (interpolated time)
-        g_PosPage = g_MoveToOldPos + (state->targetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime);
+        g_PosPage = g_MoveToOldPos + (gTargetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime);
         g_MoveToTime -= g_DT;
         if (g_MoveToTime <= 0) {
             g_MoveToTime = 0;
-            g_PosPage = state->targetPos;
+            g_PosPage = gTargetPos;
         }
         return;
     }
 
     // If our velocity is low OR acceleration is opposing it, apply it.
-    if (fabsf(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) {
+    if (fabs(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) {
         g_PosVelocity += accel;
     }
     //debugF("g_PosPage", g_PosPage);
@@ -216,18 +293,18 @@ void updatePos() {
     // Normal physics
     if (g_PosVelocity > 0) {
         g_PosVelocity -= friction;
-        g_PosVelocity = maxf(g_PosVelocity, 0);
+        g_PosVelocity = max(g_PosVelocity, 0.f);
     } else {
         g_PosVelocity += friction;
-        g_PosVelocity = minf(g_PosVelocity, 0);
+        g_PosVelocity = min(g_PosVelocity, 0.f);
     }
 
-    if ((friction > fabsf(g_PosVelocity)) && (friction > fabsf(accel))) {
+    if ((friction > fabs(g_PosVelocity)) && (friction > fabs(accel))) {
         // Special get back to center and overcome friction physics.
         float t = tablePosNorm - 0.5f;
-        if (fabsf(t) < (friction * g_DT)) {
+        if (fabs(t) < (friction * g_DT)) {
             // really close, just snap
-            g_PosPage = roundf(g_PosPage);
+            g_PosPage = round(g_PosPage);
             g_PosVelocity = 0;
         } else {
             if (t > 0) {
@@ -240,46 +317,51 @@ void updatePos() {
 
     // Check for out of boundry conditions.
     if (g_PosPage < 0 && g_PosVelocity < 0) {
-        float damp = 1.0 + (g_PosPage * 4);
-        damp = clampf(damp, 0.f, 0.9f);
+        float damp = 1.0f + (g_PosPage * 4);
+        damp = clamp(damp, 0.f, 0.9f);
         g_PosVelocity *= damp;
     }
     if (g_PosPage > g_PosMax && g_PosVelocity > 0) {
-        float damp = 1.0 - ((g_PosPage - g_PosMax) * 4);
-        damp = clampf(damp, 0.f, 0.9f);
+        float damp = 1.0f - ((g_PosPage - g_PosMax) * 4);
+        damp = clamp(damp, 0.f, 0.9f);
         g_PosVelocity *= damp;
     }
 
     g_PosPage += g_PosVelocity * g_DT;
-    g_PosPage = clampf(g_PosPage, -0.49, g_PosMax + 0.49);
-}
+    g_PosPage = clamp(g_PosPage, -0.49f, g_PosMax + 0.49f);
 
+    //debugPf(300, g_PosPage);
+}
 
-void
+static void
 draw_home_button()
 {
+    //debugPi(99, 2);
     setColor(1.0f, 1.0f, 1.0f, 1.0f);
-    bindTexture(NAMED_PFTexNearest, 0, state->homeButtonId);
+    bindTexture(gPFTexNearest, 0, gHomeButton);
 
     float w = getWidth();
     float h = getHeight();
+    float tw = allocGetDimX(gHomeButton);
+    float th = allocGetDimY(gHomeButton);
 
     float x;
     float y;
     if (getWidth() > getHeight()) {
-        x = w - (params->homeButtonTextureWidth * (1 - g_Animation)) + 20;
-        y = (h - params->homeButtonTextureHeight) * 0.5f;
+        x = w - (tw * (1 - g_Animation)) + 20;
+        y = (h - th) * 0.5f;
     } else {
-        x = (w - params->homeButtonTextureWidth) / 2;
-        y = -g_Animation * params->homeButtonTextureHeight;
+        x = (w - tw) / 2;
+        y = -g_Animation * th;
         y -= 30; // move the house to the edge of the screen as it doesn't fill the texture.
     }
 
-    drawSpriteScreenspace(x, y, 0, params->homeButtonTextureWidth, params->homeButtonTextureHeight);
+    drawSpriteScreenspace(x, y, 0, tw, th);
 }
 
-void drawFrontGrid(float rowOffset, float p)
+static void drawFrontGrid(float rowOffset, float p)
 {
+    //debugPi(99, 1);
     float h = getHeight();
     float w = getWidth();
 
@@ -289,6 +371,8 @@ void drawFrontGrid(float rowOffset, float p)
     float rowHeight = colWidth + 25.f;
     float yoff = 0.5f * h + 1.5f * rowHeight;
 
+    //debugPi(199, 1);
+
     int row, col;
     int colCount = 4;
     if (w > h) {
@@ -299,8 +383,7 @@ void drawFrontGrid(float rowOffset, float p)
 
     int iconNum = (intRowOffset - 5) * colCount;
 
-
-    bindProgramVertex(NAMED_PVCurve);
+    bindProgramVertex(gPVCurve);
 
     vpConstants->Position.z = p;
 
@@ -309,7 +392,7 @@ void drawFrontGrid(float rowOffset, float p)
         float y = yoff - ((-rowFrac + row) * rowHeight);
 
         for (col=0; col < colCount; col++) {
-            if (iconNum >= state->iconCount) {
+            if (iconNum >= gIconCount) {
                 return;
             }
 
@@ -317,28 +400,35 @@ void drawFrontGrid(float rowOffset, float p)
                 float x = colWidth * col + (colWidth / 2);
                 vpConstants->Position.x = x + 0.2f;
 
-                if (state->selectedIconIndex == iconNum && !p) {
-                    bindProgramFragment(NAMED_PFTexNearest);
-                    bindTexture(NAMED_PFTexNearest, 0, state->selectedIconTexture);
-                    vpConstants->ImgSize.x = SELECTION_TEXTURE_WIDTH_PX;
-                    vpConstants->ImgSize.y = SELECTION_TEXTURE_HEIGHT_PX;
-                    vpConstants->Position.y = y - (SELECTION_TEXTURE_HEIGHT_PX - ICON_TEXTURE_HEIGHT_PX) * 0.5f;
-                    drawSimpleMesh(NAMED_SMCell);
+                if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture) {
+                    bindProgramFragment(gPFTexNearest);
+                    bindTexture(gPFTexNearest, 0, gSelectedIconTexture);
+                    vpConstants->ImgSize.x = allocGetDimX(gSelectedIconTexture);
+                    vpConstants->ImgSize.y = allocGetDimY(gSelectedIconTexture);
+                    vpConstants->Position.y = y - (allocGetDimY(gSelectedIconTexture) - allocGetDimY(gIconIDs[iconNum])) * 0.5f;
+                    drawSimpleMesh(gSMCell);
                 }
 
-                bindProgramFragment(NAMED_PFTexMip);
-                vpConstants->ImgSize.x = ICON_TEXTURE_WIDTH_PX;
-                vpConstants->ImgSize.y = ICON_TEXTURE_HEIGHT_PX;
+                bindProgramFragment(gPFTexMip);
+                vpConstants->ImgSize.x = allocGetDimX(gIconIDs[iconNum]);
+                vpConstants->ImgSize.y = allocGetDimY(gIconIDs[iconNum]);
                 vpConstants->Position.y = y - 0.2f;
-                bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum));
-                drawSimpleMesh(NAMED_SMCell);
+                bindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
+                drawSimpleMesh(gSMCell);
+
+                //debugPf(202, vpConstants->ImgSize.x);
+                //debugPf(203, vpConstants->ImgSize.y);
+                //debugPf(204, vpConstants->Position.y);
+                //debugPi(205, gIconIDs[iconNum]);
+                //debugPi(206, gLabelIDs[iconNum]);
 
-                bindProgramFragment(NAMED_PFTexMipAlpha);
-                vpConstants->ImgSize.x = 120.f;
-                vpConstants->ImgSize.y = 64.f;
+
+                bindProgramFragment(gPFTexMipAlpha);
+                vpConstants->ImgSize.x = allocGetDimX(gLabelIDs[iconNum]);
+                vpConstants->ImgSize.y = allocGetDimY(gLabelIDs[iconNum]);
                 vpConstants->Position.y = y - 64.f - 0.2f;
-                bindTexture(NAMED_PFTexMipAlpha, 0, loadI32(ALLOC_LABEL_IDS, iconNum));
-                drawSimpleMesh(NAMED_SMCell);
+                bindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]);
+                drawSimpleMesh(gSMCell);
             }
             iconNum++;
         }
@@ -346,12 +436,14 @@ void drawFrontGrid(float rowOffset, float p)
 }
 
 
-int
-main(int launchID)
+int root()
 {
+    //debugAll();
+    bindProgramStore(gPS);
+
     // Compute dt in seconds.
     int newTime = uptimeMillis();
-    g_DT = (newTime - g_LastTime) / 1000.f;
+    g_DT = (newTime - g_LastTime) * 0.001f;
     g_LastTime = newTime;
 
     if (!g_DrawLastFrame) {
@@ -360,24 +452,25 @@ main(int launchID)
         g_DT = 0.033f;
     }
     // physics may break if DT is large.
-    g_DT = minf(g_DT, 0.2f);
+    g_DT = min(g_DT, 0.2f);
 
-    if (g_Zoom != state->zoomTarget) {
+    if (g_Zoom != gZoomTarget) {
         float dz = g_DT * 1.7f;
-        if (state->zoomTarget < 0.5f) {
+        if (gZoomTarget < 0.5f) {
             dz = -dz;
         }
-        if (fabsf(g_Zoom - state->zoomTarget) < fabsf(dz)) {
-            g_Zoom = state->zoomTarget;
+        if (fabs(g_Zoom - gZoomTarget) < fabs(dz)) {
+            g_Zoom = gZoomTarget;
         } else {
             g_Zoom += dz;
         }
         updateReadback();
     }
-    g_Animation = powf(1-g_Zoom, 3);
+    g_Animation = pow(1.f - g_Zoom, 3.f);
 
+    //debugPf(100, g_Zoom);
     // Set clear value to dim the background based on the zoom position.
-    if ((g_Zoom < 0.001f) && (state->zoomTarget < 0.001f) && !g_SpecialHWWar) {
+    if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f) && !g_SpecialHWWar) {
         pfClearColor(0.0f, 0.0f, 0.0f, 0.0f);
         // When we're zoomed out and not tracking motion events, reset the pos to 0.
         if (!g_LastTouchDown) {
@@ -385,11 +478,11 @@ main(int launchID)
         }
         return lastFrame(0);
     } else {
+        //debugPf(101, g_Zoom);
         pfClearColor(0.0f, 0.0f, 0.0f, g_Zoom);
     }
 
     // icons & labels
-    int iconCount = state->iconCount;
     if (getWidth() > getHeight()) {
         g_Cols = 6;
         g_Rows = 3;
@@ -397,7 +490,7 @@ main(int launchID)
         g_Cols = 4;
         g_Rows = 4;
     }
-    g_PosMax = ((iconCount + (g_Cols-1)) / g_Cols) - g_Rows;
+    g_PosMax = ((gIconCount + (g_Cols-1)) / g_Cols) - g_Rows;
     if (g_PosMax < 0) g_PosMax = 0;
 
     updatePos();
@@ -408,7 +501,7 @@ main(int launchID)
     // Draw the icons ========================================
     drawFrontGrid(g_PosPage, g_Animation);
 
-    bindProgramFragment(NAMED_PFTexNearest);
+    bindProgramFragment(gPFTexNearest);
     draw_home_button();
 
     // This is a WAR to do a rendering pass without drawing during init to
@@ -422,6 +515,7 @@ main(int launchID)
 
     // Bug workaround where the last frame is not always displayed
     // So we keep rendering until the bug is fixed.
-    return lastFrame((g_PosVelocity != 0) || fracf(g_PosPage) || g_Zoom != state->zoomTarget || (g_MoveToTime != 0));
+    return lastFrame((g_PosVelocity != 0) || frac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0));
 }
 
+
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
new file mode 100644
index 0000000..85d6805
Binary files /dev/null and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From ad1bdf02040924ed5044c4c41d4b71f6b6690db9 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Fri, 14 May 2010 17:54:50 -0700
Subject: Launcher2 cleanup. Will remove dead script functions once reflection
 is working.

Change-Id: Ieffcf55047b5e241a8cffb1852619d04e1a00d53
---
 res/raw/allapps.rs    | 155 +++++++++-----------------------------------------
 res/raw/allapps_bc.bc | Bin 11052 -> 10200 bytes
 2 files changed, 28 insertions(+), 127 deletions(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 0e278d9..9342943 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -3,15 +3,9 @@
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_types.rsh"
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_math.rsh"
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_graphics.rsh"
-//#pragma stateVertex(PV)
-//#pragma stateFragment(PFTexNearest)
-//#pragma stateStore(PSIcons)
 
 #define PI 3.14159f
 
-static int g_SpecialHWWar;
-
-
 // Constants from Java
 int COLUMNS_PER_PAGE_PORTRAIT;
 int ROWS_PER_PAGE_PORTRAIT;
@@ -53,53 +47,29 @@ VpConsts_t *vpConstants;
 
 void debugAll()
 {
-    debugPi(1000, COLUMNS_PER_PAGE_PORTRAIT);
-    debugPi(1001, ROWS_PER_PAGE_PORTRAIT);
-    debugPi(1002, COLUMNS_PER_PAGE_LANDSCAPE);
-    debugPi(1003, ROWS_PER_PAGE_LANDSCAPE);
-
-    debugPf(1018, gNewPositionX);
-    debugPi(1019, gNewTouchDown);
-    debugPf(1020, gFlingVelocity);
-    debugPi(1021, gIconCount);
-    debugPi(1022, gSelectedIconIndex);
-    debugPi(1023, gSelectedIconTexture);
-    debugPf(1024, gZoomTarget);
-    debugPi(1025, gHomeButton);
-    debugPf(1026, gTargetPos);
-
-    debugPi(1027, gPFTexNearest);
-    debugPi(1028, gPFTexMip);
-    debugPi(1029, gPFTexMipAlpha);
-    debugPi(1030, gPVCurve);
-    debugPi(1031, gSMCell);
-
-    debugP(1032, gIconIDs);
-    debugP(1033, gLabelIDs);
-    debugP(1034, vpConstants);
 }
 
 
 // Attraction to center values from page edge to page center.
-static float g_AttractionTable[9];
-static float g_FrictionTable[9];
-static float g_PhysicsTableSize;
-
-static float g_PosPage;
-static float g_PosVelocity;
-static float g_LastPositionX;
-static int g_LastTouchDown;
+static float g_AttractionTable[9] = {20.f, 20.f, 20.f, 10.f, -10.f, -20.f, -20.f, -20.f, -20.f};
+static float g_FrictionTable[9] = {10.f, 10.f, 11.f, 15.f, 15.f, 11.f, 10.f, 10.f, 10.f};
+static float g_PhysicsTableSize = 7;
+
+static float g_PosPage = 0.f;
+static float g_PosVelocity = 0.f;
+static float g_LastPositionX = 0.f;
+static int g_LastTouchDown = 0;
 static float g_DT;
 static int g_LastTime;
 static int g_PosMax;
-static float g_Zoom;
-static float g_Animation;
+static float g_Zoom = 0.f;
+static float g_Animation = 1.f;
 static float g_OldPosPage;
 static float g_OldPosVelocity;
 static float g_OldZoom;
-static float g_MoveToTotalTime;
-static float g_MoveToTime;
-static float g_MoveToOldPos;
+static float g_MoveToTotalTime = 0.2f;
+static float g_MoveToTime = 0.f;
+static float g_MoveToOldPos = 0.f;
 
 static int g_Cols;
 static int g_Rows;
@@ -109,24 +79,15 @@ static int g_Rows;
 
 static int g_DrawLastFrame;
 static int lastFrame(int draw) {
-    //debugPi(99, 13);
-    // We draw one extra frame to work around the last frame post bug.
-    // We also need to track if we drew the last frame to deal with large DT
-    // in the physics.
-    int ret = g_DrawLastFrame | draw;
     g_DrawLastFrame = draw;
-    return ret;  // should return draw instead.
+    return draw;
 }
 
 static void updateReadback() {
-    //debugPi(99, 12);
-    //if ((g_OldPosPage != g_PosPage) ||
-        //(g_OldPosVelocity != g_PosVelocity) ||
-        //(g_OldZoom != g_Zoom)) {
-
-    //debugPf(40, g_PosPage);
-    //debugPf(41, g_PosVelocity);
-    //debugPf(42, g_Zoom);
+    if ((g_OldPosPage != g_PosPage) ||
+        (g_OldPosVelocity != g_PosVelocity) ||
+        (g_OldZoom != g_Zoom)) {
+
         g_OldPosPage = g_PosPage;
         g_OldPosVelocity = g_PosVelocity;
         g_OldZoom = g_Zoom;
@@ -136,55 +97,17 @@ static void updateReadback() {
         i[1] = g_PosVelocity * (1 << 16);
         i[2] = g_OldZoom * (1 << 16);
         sendToClient(&i[0], 1, 12, 1);
-    //}
+    }
 }
 
-static void setColor(float r, float g, float b, float a) {
-    //debugPi(99, 11);
-    if (g_SpecialHWWar) {
-        color(0, 0, 0, 0.001f);
-    } else {
-        color(r, g, b, a);
-    }
+void setColor(float r, float g, float b, float a) {
 }
 
 void init() {
     //debugPi(99, 10);
-    g_AttractionTable[0] = 20.0f;
-    g_AttractionTable[1] = 20.0f;
-    g_AttractionTable[2] = 20.0f;
-    g_AttractionTable[3] = 10.0f;
-    g_AttractionTable[4] = -10.0f;
-    g_AttractionTable[5] = -20.0f;
-    g_AttractionTable[6] = -20.0f;
-    g_AttractionTable[7] = -20.0f;
-    g_AttractionTable[8] = -20.0f;  // dup 7 to avoid a clamp later
-    g_FrictionTable[0] = 10.0f;
-    g_FrictionTable[1] = 10.0f;
-    g_FrictionTable[2] = 11.0f;
-    g_FrictionTable[3] = 15.0f;
-    g_FrictionTable[4] = 15.0f;
-    g_FrictionTable[5] = 11.0f;
-    g_FrictionTable[6] = 10.0f;
-    g_FrictionTable[7] = 10.0f;
-    g_FrictionTable[8] = 10.0f;  // dup 7 to avoid a clamp later
-    g_PhysicsTableSize = 7;
-
-    g_PosVelocity = 0;
-    g_PosPage = 0;
-    g_LastTouchDown = 0;
-    g_LastPositionX = 0;
-    g_Zoom = 0;
-    g_Animation = 1.f;
-    g_SpecialHWWar = 1;
-    g_MoveToTime = 0;
-    g_MoveToOldPos = 0;
-    g_MoveToTotalTime = 0.2f; // Duration of scrolling 1 line
 }
 
 void resetHWWar() {
-    //debugPi(99, 9);
-    g_SpecialHWWar = 1;
 }
 
 void move() {
@@ -329,15 +252,13 @@ static void updatePos() {
 
     g_PosPage += g_PosVelocity * g_DT;
     g_PosPage = clamp(g_PosPage, -0.49f, g_PosMax + 0.49f);
-
-    //debugPf(300, g_PosPage);
 }
 
 static void
 draw_home_button()
 {
     //debugPi(99, 2);
-    setColor(1.0f, 1.0f, 1.0f, 1.0f);
+    color(1.0f, 1.0f, 1.0f, 1.0f);
     bindTexture(gPFTexNearest, 0, gHomeButton);
 
     float w = getWidth();
@@ -371,8 +292,6 @@ static void drawFrontGrid(float rowOffset, float p)
     float rowHeight = colWidth + 25.f;
     float yoff = 0.5f * h + 1.5f * rowHeight;
 
-    //debugPi(199, 1);
-
     int row, col;
     int colCount = 4;
     if (w > h) {
@@ -387,7 +306,7 @@ static void drawFrontGrid(float rowOffset, float p)
 
     vpConstants->Position.z = p;
 
-    setColor(1.0f, 1.0f, 1.0f, 1.0f);
+    color(1.0f, 1.0f, 1.0f, 1.0f);
     for (row = -5; row < 15; row++) {
         float y = yoff - ((-rowFrac + row) * rowHeight);
 
@@ -416,13 +335,6 @@ static void drawFrontGrid(float rowOffset, float p)
                 bindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
                 drawSimpleMesh(gSMCell);
 
-                //debugPf(202, vpConstants->ImgSize.x);
-                //debugPf(203, vpConstants->ImgSize.y);
-                //debugPf(204, vpConstants->Position.y);
-                //debugPi(205, gIconIDs[iconNum]);
-                //debugPi(206, gLabelIDs[iconNum]);
-
-
                 bindProgramFragment(gPFTexMipAlpha);
                 vpConstants->ImgSize.x = allocGetDimX(gLabelIDs[iconNum]);
                 vpConstants->ImgSize.y = allocGetDimY(gLabelIDs[iconNum]);
@@ -470,7 +382,7 @@ int root()
 
     //debugPf(100, g_Zoom);
     // Set clear value to dim the background based on the zoom position.
-    if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f) && !g_SpecialHWWar) {
+    if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f)) {
         pfClearColor(0.0f, 0.0f, 0.0f, 0.0f);
         // When we're zoomed out and not tracking motion events, reset the pos to 0.
         if (!g_LastTouchDown) {
@@ -484,12 +396,13 @@ int root()
 
     // icons & labels
     if (getWidth() > getHeight()) {
-        g_Cols = 6;
-        g_Rows = 3;
+        g_Cols = COLUMNS_PER_PAGE_LANDSCAPE;
+        g_Rows = ROWS_PER_PAGE_LANDSCAPE;
     } else {
-        g_Cols = 4;
-        g_Rows = 4;
+        g_Cols = COLUMNS_PER_PAGE_PORTRAIT;
+        g_Rows = ROWS_PER_PAGE_PORTRAIT;
     }
+
     g_PosMax = ((gIconCount + (g_Cols-1)) / g_Cols) - g_Rows;
     if (g_PosMax < 0) g_PosMax = 0;
 
@@ -503,18 +416,6 @@ int root()
 
     bindProgramFragment(gPFTexNearest);
     draw_home_button();
-
-    // This is a WAR to do a rendering pass without drawing during init to
-    // force the driver to preload and compile its shaders.
-    // Without this the first animation does not appear due to the time it
-    // takes to init the driver state.
-    if (g_SpecialHWWar) {
-        g_SpecialHWWar = 0;
-        return 1;
-    }
-
-    // Bug workaround where the last frame is not always displayed
-    // So we keep rendering until the bug is fixed.
     return lastFrame((g_PosVelocity != 0) || frac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0));
 }
 
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index 85d6805..d73db54 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From 5c1417acfc36499f40d7ffcb1949bc980281d103 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Tue, 18 May 2010 17:06:04 -0700
Subject: Fix regression in master.  The attempt to remove the last frame hack
 in all apps caused home to sometimes render black upon returning from an
 application.

Change-Id: I4444d7a6e62548f5a996c12b7e11aa46876d44e4
---
 res/raw/allapps.rs    |   6 +++++-
 res/raw/allapps_bc.bc | Bin 10200 -> 10212 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 9342943..7eb670a 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -79,8 +79,12 @@ static int g_Rows;
 
 static int g_DrawLastFrame;
 static int lastFrame(int draw) {
+    // We draw one extra frame to work around the last frame post bug.
+    // We also need to track if we drew the last frame to deal with large DT
+    // in the physics.
+    int ret = g_DrawLastFrame | draw;
     g_DrawLastFrame = draw;
-    return draw;
+    return ret;//draw;
 }
 
 static void updateReadback() {
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index d73db54..4cb3ecc 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From 13a75d5f1ecdd216f76cb1a165b6af45acb7eec3 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Wed, 19 May 2010 16:38:04 -0700
Subject: Update names and move clear to script.

Change-Id: I17af3cd027248f52ce6516f81968c6b3d976a09d
---
 res/raw/allapps.rs    | 109 +++++++++++++++++++++-----------------------------
 res/raw/allapps_bc.bc | Bin 10212 -> 10208 bytes
 2 files changed, 45 insertions(+), 64 deletions(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 7eb670a..6fa28e2 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -60,7 +60,7 @@ static float g_PosVelocity = 0.f;
 static float g_LastPositionX = 0.f;
 static int g_LastTouchDown = 0;
 static float g_DT;
-static int g_LastTime;
+static int64_t g_LastTime;
 static int g_PosMax;
 static float g_Zoom = 0.f;
 static float g_Animation = 1.f;
@@ -82,9 +82,8 @@ static int lastFrame(int draw) {
     // We draw one extra frame to work around the last frame post bug.
     // We also need to track if we drew the last frame to deal with large DT
     // in the physics.
-    int ret = g_DrawLastFrame | draw;
     g_DrawLastFrame = draw;
-    return ret;//draw;
+    return draw;
 }
 
 static void updateReadback() {
@@ -100,22 +99,18 @@ static void updateReadback() {
         i[0] = g_PosPage * (1 << 16);
         i[1] = g_PosVelocity * (1 << 16);
         i[2] = g_OldZoom * (1 << 16);
-        sendToClient(&i[0], 1, 12, 1);
+        rsSendToClient(&i[0], 1, 12, 1);
     }
 }
 
 void setColor(float r, float g, float b, float a) {
 }
-
 void init() {
-    //debugPi(99, 10);
 }
-
 void resetHWWar() {
 }
 
 void move() {
-    //debugPi(99, 8);
     if (g_LastTouchDown) {
         float dx = -(gNewPositionX - g_LastPositionX);
         g_PosVelocity = 0;
@@ -128,33 +123,27 @@ void move() {
     g_LastTouchDown = gNewTouchDown;
     g_LastPositionX = gNewPositionX;
     g_MoveToTime = 0;
-    //debugF("Move P", g_PosPage);
 }
 
 void moveTo() {
-    //debugPi(99, 7);
     g_MoveToTime = g_MoveToTotalTime;
     g_PosVelocity = 0;
     g_MoveToOldPos = g_PosPage;
-
-	// debugF("======= moveTo", state->targetPos);
 }
 
 void setZoom() {
-    //debugPi(99, 6);
     g_Zoom = gZoomTarget;
     g_DrawLastFrame = 1;
     updateReadback();
 }
 
 void fling() {
-    //debugPi(99, 5);
     g_LastTouchDown = 0;
     g_PosVelocity = -gFlingVelocity * 4;
     float av = fabs(g_PosVelocity);
     float minVel = 3.5f;
 
-    minVel *= 1.f - (fabs(frac(g_PosPage + 0.5f) - 0.5f) * 0.45f);
+    minVel *= 1.f - (fabs(rsFrac(g_PosPage + 0.5f) - 0.5f) * 0.45f);
 
     if (av < minVel && av > 0.2f) {
         if (g_PosVelocity > 0) {
@@ -175,18 +164,16 @@ void fling() {
 // Interpolates values in the range 0..1 to a curve that eases in
 // and out.
 static float getInterpolation(float input) {
-    //debugPi(99, 4);
     return (cos((input + 1) * PI) * 0.5f) + 0.5f;
 }
 
 
 static void updatePos() {
-    //debugPi(99, 3);
     if (g_LastTouchDown) {
         return;
     }
 
-    float tablePosNorm = frac(g_PosPage + 0.5f);
+    float tablePosNorm = rsFrac(g_PosPage + 0.5f);
     float tablePosF = tablePosNorm * g_PhysicsTableSize;
     int tablePosI = tablePosF;
     float tablePosFrac = tablePosF - tablePosI;
@@ -212,10 +199,10 @@ static void updatePos() {
     if (fabs(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) {
         g_PosVelocity += accel;
     }
-    //debugF("g_PosPage", g_PosPage);
-    //debugF("  g_PosVelocity", g_PosVelocity);
-    //debugF("  friction", friction);
-    //debugF("  accel", accel);
+    //RS_DEBUG(g_PosPage);
+    //RS_DEBUG(g_PosVelocity);
+    //RS_DEBUG(friction);
+    //RS_DEBUG(accel);
 
     // Normal physics
     if (g_PosVelocity > 0) {
@@ -261,18 +248,17 @@ static void updatePos() {
 static void
 draw_home_button()
 {
-    //debugPi(99, 2);
     color(1.0f, 1.0f, 1.0f, 1.0f);
-    bindTexture(gPFTexNearest, 0, gHomeButton);
+    rsgBindTexture(gPFTexNearest, 0, gHomeButton);
 
-    float w = getWidth();
-    float h = getHeight();
-    float tw = allocGetDimX(gHomeButton);
-    float th = allocGetDimY(gHomeButton);
+    float w = rsgGetWidth();
+    float h = rsgGetHeight();
+    float tw = rsAllocationGetDimX(gHomeButton);
+    float th = rsAllocationGetDimY(gHomeButton);
 
     float x;
     float y;
-    if (getWidth() > getHeight()) {
+    if (w > h) {
         x = w - (tw * (1 - g_Animation)) + 20;
         y = (h - th) * 0.5f;
     } else {
@@ -281,18 +267,17 @@ draw_home_button()
         y -= 30; // move the house to the edge of the screen as it doesn't fill the texture.
     }
 
-    drawSpriteScreenspace(x, y, 0, tw, th);
+    rsgDrawSpriteScreenspace(x, y, 0, tw, th);
 }
 
 static void drawFrontGrid(float rowOffset, float p)
 {
-    //debugPi(99, 1);
-    float h = getHeight();
-    float w = getWidth();
+    float h = rsgGetHeight();
+    float w = rsgGetWidth();
 
     int intRowOffset = rowOffset;
     float rowFrac = rowOffset - intRowOffset;
-    float colWidth = 120.f;//getWidth() / 4;
+    float colWidth = 120.f;//w / 4;
     float rowHeight = colWidth + 25.f;
     float yoff = 0.5f * h + 1.5f * rowHeight;
 
@@ -306,7 +291,7 @@ static void drawFrontGrid(float rowOffset, float p)
 
     int iconNum = (intRowOffset - 5) * colCount;
 
-    bindProgramVertex(gPVCurve);
+    rsgBindProgramVertex(gPVCurve);
 
     vpConstants->Position.z = p;
 
@@ -324,27 +309,28 @@ static void drawFrontGrid(float rowOffset, float p)
                 vpConstants->Position.x = x + 0.2f;
 
                 if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture) {
-                    bindProgramFragment(gPFTexNearest);
-                    bindTexture(gPFTexNearest, 0, gSelectedIconTexture);
-                    vpConstants->ImgSize.x = allocGetDimX(gSelectedIconTexture);
-                    vpConstants->ImgSize.y = allocGetDimY(gSelectedIconTexture);
-                    vpConstants->Position.y = y - (allocGetDimY(gSelectedIconTexture) - allocGetDimY(gIconIDs[iconNum])) * 0.5f;
-                    drawSimpleMesh(gSMCell);
+                    rsgBindProgramFragment(gPFTexNearest);
+                    rsgBindTexture(gPFTexNearest, 0, gSelectedIconTexture);
+                    vpConstants->ImgSize.x = rsAllocationGetDimX(gSelectedIconTexture);
+                    vpConstants->ImgSize.y = rsAllocationGetDimY(gSelectedIconTexture);
+                    vpConstants->Position.y = y - (rsAllocationGetDimY(gSelectedIconTexture)
+                                                - rsAllocationGetDimY(gIconIDs[iconNum])) * 0.5f;
+                    rsgDrawSimpleMesh(gSMCell);
                 }
 
-                bindProgramFragment(gPFTexMip);
-                vpConstants->ImgSize.x = allocGetDimX(gIconIDs[iconNum]);
-                vpConstants->ImgSize.y = allocGetDimY(gIconIDs[iconNum]);
+                rsgBindProgramFragment(gPFTexMip);
+                vpConstants->ImgSize.x = rsAllocationGetDimX(gIconIDs[iconNum]);
+                vpConstants->ImgSize.y = rsAllocationGetDimY(gIconIDs[iconNum]);
                 vpConstants->Position.y = y - 0.2f;
-                bindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
-                drawSimpleMesh(gSMCell);
+                rsgBindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
+                rsgDrawSimpleMesh(gSMCell);
 
-                bindProgramFragment(gPFTexMipAlpha);
-                vpConstants->ImgSize.x = allocGetDimX(gLabelIDs[iconNum]);
-                vpConstants->ImgSize.y = allocGetDimY(gLabelIDs[iconNum]);
+                rsgBindProgramFragment(gPFTexMipAlpha);
+                vpConstants->ImgSize.x = rsAllocationGetDimX(gLabelIDs[iconNum]);
+                vpConstants->ImgSize.y = rsAllocationGetDimY(gLabelIDs[iconNum]);
                 vpConstants->Position.y = y - 64.f - 0.2f;
-                bindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]);
-                drawSimpleMesh(gSMCell);
+                rsgBindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]);
+                rsgDrawSimpleMesh(gSMCell);
             }
             iconNum++;
         }
@@ -354,11 +340,8 @@ static void drawFrontGrid(float rowOffset, float p)
 
 int root()
 {
-    //debugAll();
-    bindProgramStore(gPS);
-
     // Compute dt in seconds.
-    int newTime = uptimeMillis();
+    int64_t newTime = rsUptimeMillis();
     g_DT = (newTime - g_LastTime) * 0.001f;
     g_LastTime = newTime;
 
@@ -384,22 +367,22 @@ int root()
     }
     g_Animation = pow(1.f - g_Zoom, 3.f);
 
-    //debugPf(100, g_Zoom);
     // Set clear value to dim the background based on the zoom position.
     if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f)) {
-        pfClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        rsgClearColor(0.0f, 0.0f, 0.0f, 0.0f);
         // When we're zoomed out and not tracking motion events, reset the pos to 0.
         if (!g_LastTouchDown) {
             g_PosPage = 0;
         }
         return lastFrame(0);
     } else {
-        //debugPf(101, g_Zoom);
-        pfClearColor(0.0f, 0.0f, 0.0f, g_Zoom);
+        rsgClearColor(0.0f, 0.0f, 0.0f, g_Zoom);
     }
 
+    rsgBindProgramStore(gPS);
+
     // icons & labels
-    if (getWidth() > getHeight()) {
+    if (rsgGetWidth() > rsgGetHeight()) {
         g_Cols = COLUMNS_PER_PAGE_LANDSCAPE;
         g_Rows = ROWS_PER_PAGE_LANDSCAPE;
     } else {
@@ -413,14 +396,12 @@ int root()
     updatePos();
     updateReadback();
 
-    //debugF("    draw g_PosPage", g_PosPage);
-
     // Draw the icons ========================================
     drawFrontGrid(g_PosPage, g_Animation);
 
-    bindProgramFragment(gPFTexNearest);
+    rsgBindProgramFragment(gPFTexNearest);
     draw_home_button();
-    return lastFrame((g_PosVelocity != 0) || frac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0));
+    return lastFrame((g_PosVelocity != 0) || rsFrac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0));
 }
 
 
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index 4cb3ecc..36e234c 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From c8149656bca97af8da015d89933d808b0888a5de Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Mon, 14 Jun 2010 11:46:11 -0700
Subject: Add pragma on java package name, for reflection purpose.

Change-Id: I30a3cc2177b320a76d093cd018216ae936e81150
---
 res/raw/allapps.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 6fa28e2..e1a762d 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -1,5 +1,7 @@
 #pragma version(1)
 
+#pragma rs java_package_name(com.android.launcher2)
+
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_types.rsh"
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_math.rsh"
 #include "../../../../../frameworks/base/libs/rs/scriptc/rs_graphics.rsh"
-- 
cgit v1.1


From 1aa4ff083ce792d886faeae3cb4abfc9f36e97ce Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Tue, 15 Jun 2010 14:59:57 -0700
Subject: Update AppApps to use reflected files. Previous files were hand
 written placeholders. This also fixed the physics bug where movement was
 right.

Change-Id: I98838084d60f0eaf22f7fbd148a80b2f73f9a14c
---
 res/raw/allapps.rs    |   6 +++---
 res/raw/allapps_bc.bc | Bin 10208 -> 11644 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index e1a762d..d947613 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -18,7 +18,7 @@ float gNewPositionX;
 int gNewTouchDown;
 float gFlingVelocity;
 int gIconCount;
-int gSelectedIconIndex;
+int gSelectedIconIndex = -1;
 rs_allocation gSelectedIconTexture;
 float gZoomTarget;
 rs_allocation gHomeButton;
@@ -34,7 +34,7 @@ rs_mesh gSMCell;
 rs_allocation *gIconIDs;
 rs_allocation *gLabelIDs;
 
-typedef struct VpConsts_s {
+typedef struct VpConsts {
     float4 Position;
     float4 ScaleOffset;
     float2 BendPos;
@@ -310,7 +310,7 @@ static void drawFrontGrid(float rowOffset, float p)
                 float x = colWidth * col + (colWidth / 2);
                 vpConstants->Position.x = x + 0.2f;
 
-                if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture) {
+                if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture.p) {
                     rsgBindProgramFragment(gPFTexNearest);
                     rsgBindTexture(gPFTexNearest, 0, gSelectedIconTexture);
                     vpConstants->ImgSize.x = rsAllocationGetDimX(gSelectedIconTexture);
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index 36e234c..3835d7d 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From 60a55bbf54998afe9a0b766781c1dfada0d53518 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Fri, 18 Jun 2010 15:11:19 -0700
Subject: Code cleanup possible with new reflected classes.

Change-Id: If9e79383722c0df997526717c52ded4921b6663e
---
 res/raw/allapps.rs    |  71 +++++++++++++++++++-------------------------------
 res/raw/allapps_bc.bc | Bin 11644 -> 11612 bytes
 2 files changed, 27 insertions(+), 44 deletions(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index d947613..1465308 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -14,15 +14,10 @@ int ROWS_PER_PAGE_PORTRAIT;
 int COLUMNS_PER_PAGE_LANDSCAPE;
 int ROWS_PER_PAGE_LANDSCAPE;
 
-float gNewPositionX;
-int gNewTouchDown;
-float gFlingVelocity;
 int gIconCount;
 int gSelectedIconIndex = -1;
 rs_allocation gSelectedIconTexture;
-float gZoomTarget;
 rs_allocation gHomeButton;
-float gTargetPos;
 
 rs_program_fragment gPFTexNearest;
 rs_program_fragment gPFTexMip;
@@ -43,13 +38,8 @@ typedef struct VpConsts {
 VpConsts_t *vpConstants;
 
 
-#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gNewPositionX, gNewTouchDown, gFlingVelocity, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gZoomTarget, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants)
-#pragma rs export_func(resetHWWar, move, moveTo, setZoom, fling)
-
-
-void debugAll()
-{
-}
+#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants)
+#pragma rs export_func(move, moveTo, setZoom, fling)
 
 
 // Attraction to center values from page edge to page center.
@@ -57,10 +47,12 @@ static float g_AttractionTable[9] = {20.f, 20.f, 20.f, 10.f, -10.f, -20.f, -20.f
 static float g_FrictionTable[9] = {10.f, 10.f, 11.f, 15.f, 15.f, 11.f, 10.f, 10.f, 10.f};
 static float g_PhysicsTableSize = 7;
 
+static float gZoomTarget;
+static float gTargetPos;
 static float g_PosPage = 0.f;
 static float g_PosVelocity = 0.f;
 static float g_LastPositionX = 0.f;
-static int g_LastTouchDown = 0;
+static bool g_LastTouchDown = false;
 static float g_DT;
 static int64_t g_LastTime;
 static int g_PosMax;
@@ -79,14 +71,6 @@ static int g_Rows;
 // Drawing constants, should be parameters ======
 #define VIEW_ANGLE 1.28700222f
 
-static int g_DrawLastFrame;
-static int lastFrame(int draw) {
-    // We draw one extra frame to work around the last frame post bug.
-    // We also need to track if we drew the last frame to deal with large DT
-    // in the physics.
-    g_DrawLastFrame = draw;
-    return draw;
-}
 
 static void updateReadback() {
     if ((g_OldPosPage != g_PosPage) ||
@@ -105,16 +89,12 @@ static void updateReadback() {
     }
 }
 
-void setColor(float r, float g, float b, float a) {
-}
 void init() {
 }
-void resetHWWar() {
-}
 
-void move() {
+void move(float newPos) {
     if (g_LastTouchDown) {
-        float dx = -(gNewPositionX - g_LastPositionX);
+        float dx = -(newPos - g_LastPositionX);
         g_PosVelocity = 0;
         g_PosPage += dx * 5.2f;
 
@@ -122,26 +102,34 @@ void move() {
         float pmax = g_PosMax + 0.49f;
         g_PosPage = clamp(g_PosPage, pmin, pmax);
     }
-    g_LastTouchDown = gNewTouchDown;
-    g_LastPositionX = gNewPositionX;
+    g_LastTouchDown = true;
+    g_LastPositionX = newPos;
     g_MoveToTime = 0;
 }
 
-void moveTo() {
+void moveTo(float targetPos) {
+    gTargetPos = targetPos;
     g_MoveToTime = g_MoveToTotalTime;
     g_PosVelocity = 0;
     g_MoveToOldPos = g_PosPage;
 }
 
-void setZoom() {
-    g_Zoom = gZoomTarget;
-    g_DrawLastFrame = 1;
+void setZoom(float z, /*bool*/ int animate) {
+    gZoomTarget = z;
+    if (gZoomTarget < 0.001f) {
+        gZoomTarget = 0;
+    }
+    if (!animate) {
+        g_Zoom = gZoomTarget;
+    }
     updateReadback();
 }
 
-void fling() {
-    g_LastTouchDown = 0;
-    g_PosVelocity = -gFlingVelocity * 4;
+void fling(float newPos, float vel) {
+    move(newPos);
+
+    g_LastTouchDown = false;
+    g_PosVelocity = -vel * 4;
     float av = fabs(g_PosVelocity);
     float minVel = 3.5f;
 
@@ -347,13 +335,8 @@ int root()
     g_DT = (newTime - g_LastTime) * 0.001f;
     g_LastTime = newTime;
 
-    if (!g_DrawLastFrame) {
-        // If we stopped rendering we cannot use DT.
-        // assume 30fps in this case.
-        g_DT = 0.033f;
-    }
     // physics may break if DT is large.
-    g_DT = min(g_DT, 0.2f);
+    g_DT = min(g_DT, 0.1f);
 
     if (g_Zoom != gZoomTarget) {
         float dz = g_DT * 1.7f;
@@ -376,7 +359,7 @@ int root()
         if (!g_LastTouchDown) {
             g_PosPage = 0;
         }
-        return lastFrame(0);
+        return 0;
     } else {
         rsgClearColor(0.0f, 0.0f, 0.0f, g_Zoom);
     }
@@ -403,7 +386,7 @@ int root()
 
     rsgBindProgramFragment(gPFTexNearest);
     draw_home_button();
-    return lastFrame((g_PosVelocity != 0) || rsFrac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0));
+    return (g_PosVelocity != 0) || rsFrac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0);
 }
 
 
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index 3835d7d..59b0afb 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From af44209bfa60da3c7ab49b7f508f9effd316ee41 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 10 Jun 2010 17:01:57 -0700
Subject: First cut at new home screen customization for xlarge displays.

- Add new layout for xlarge, removing hotseat, next/prev page, etc.
- Add a "+" button in top right which switches to customization mode
- Add a widget chooser which slides up from bottom of screen
- Initial support for dragging widgets onto home screen

Change-Id: I14e2e013ccceff4066fcb7c4492b4f6bef6595e7
---
 res/anim/widget_chooser_slide_up.xml |  23 +++++++++
 res/drawable/add_button.png          | Bin 0 -> 2372 bytes
 res/layout-xlarge/launcher.xml       |  92 +++++++++++++++++++++++++++++++++++
 res/layout/widget_item.xml           |  22 +++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 res/anim/widget_chooser_slide_up.xml
 create mode 100644 res/drawable/add_button.png
 create mode 100644 res/layout-xlarge/launcher.xml
 create mode 100644 res/layout/widget_item.xml

(limited to 'res')

diff --git a/res/anim/widget_chooser_slide_up.xml b/res/anim/widget_chooser_slide_up.xml
new file mode 100644
index 0000000..b43ec36
--- /dev/null
+++ b/res/anim/widget_chooser_slide_up.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0%p"
+    android:toXDelta="0%p"
+    android:fromYDelta="100%p"
+    android:toYDelta="0%p"
+
+    android:duration="500"
+    android:fillAfter="true" />
diff --git a/res/drawable/add_button.png b/res/drawable/add_button.png
new file mode 100644
index 0000000..0edcfa3
Binary files /dev/null and b/res/drawable/add_button.png differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
new file mode 100644
index 0000000..092e018
--- /dev/null
+++ b/res/layout-xlarge/launcher.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.android.launcher2.DragLayer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:id="@+id/drag_layer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/all_apps" />
+
+    <!-- The workspace contains 5 screens of cells -->
+    <com.android.launcher2.Workspace
+        android:id="@+id/workspace"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        launcher:defaultScreen="2">
+
+        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
+
+    </com.android.launcher2.Workspace>
+
+    <com.android.launcher2.DeleteZone
+        android:id="@+id/delete_zone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/delete_zone_padding"
+        android:layout_gravity="top|right"
+
+        android:scaleType="center"
+        android:src="@drawable/delete_zone_selector"
+        android:visibility="gone"
+        launcher:direction="horizontal"
+        />
+    <ImageView
+        android:id="@+id/add_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/delete_zone_padding"
+        android:layout_gravity="top|right"
+
+        android:scaleType="center"
+        android:src="@drawable/add_button"
+
+        android:onClick="onClickAddButton"
+        android:focusable="true"
+        android:clickable="true" />
+
+    <RelativeLayout
+        android:id="@+id/all_apps_button_cluster"
+        android:layout_width="@dimen/button_bar_height"
+        android:layout_height="@dimen/button_bar_height"
+        android:layout_gravity="top|left"
+        android:paddingTop="2dip"
+        >
+       <com.android.launcher2.HandleView
+           style="@style/HotseatButton"
+           android:id="@+id/all_apps_button"
+           android:layout_centerHorizontal="true"
+           android:layout_alignParentBottom="true"
+
+           android:src="@drawable/all_apps_button"
+           launcher:direction="horizontal"
+           />
+    </RelativeLayout>
+    <com.android.launcher2.WidgetChooser
+        android:id="@+id/widget_chooser"
+        android:layout_width="match_parent"
+        android:layout_height="100dip"
+        android:layout_gravity="bottom"
+        android:visibility="gone"
+        />
+</com.android.launcher2.DragLayer>
diff --git a/res/layout/widget_item.xml b/res/layout/widget_item.xml
new file mode 100644
index 0000000..c79bd31
--- /dev/null
+++ b/res/layout/widget_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?android:attr/galleryItemBackground"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:scaleType="fitXY"
+    android:focusable="true" />
-- 
cgit v1.1


From aafa03cbb925c74be1c13f8bb99d928be429e62f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 11 Jun 2010 17:34:16 -0700
Subject: Allow for NxM layout and in-place rotation of items on homescreen.

Currently, rotation is disabled as designs are still in flux, but the NxM grid is enabled (8x4).

Change-Id: I0026f88c674719e3d67de6d6d481d2d4cd606362
---
 res/layout-xlarge/launcher.xml         |  4 ++--
 res/layout-xlarge/workspace_screen.xml | 32 ++++++++++++++++++++++++++++++++
 res/values-xlarge/dimens.xml           | 20 ++++++++++++++++++++
 res/values-xlarge/styles.xml           | 30 ++++++++++++++++++++++++++++++
 res/values/attrs.xml                   |  4 ++++
 5 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 res/layout-xlarge/workspace_screen.xml
 create mode 100644 res/values-xlarge/dimens.xml
 create mode 100644 res/values-xlarge/styles.xml

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 092e018..17a5b84 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -29,14 +29,14 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        launcher:defaultScreen="2">
+        launcher:canonicalDeviceWidth="8"
+        launcher:canonicalDeviceHeight="4">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-
     </com.android.launcher2.Workspace>
 
     <com.android.launcher2.DeleteZone
diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml
new file mode 100644
index 0000000..aa892b9
--- /dev/null
+++ b/res/layout-xlarge/workspace_screen.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.android.launcher2.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:hapticFeedbackEnabled="false"
+
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:longAxisStartPadding="8dip"
+    launcher:longAxisEndPadding="8dip"
+    launcher:shortAxisStartPadding="8dip"
+    launcher:shortAxisEndPadding="8dip"
+    launcher:shortAxisCells="4"
+    launcher:longAxisCells="8" />
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
new file mode 100644
index 0000000..8279492
--- /dev/null
+++ b/res/values-xlarge/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<resources>
+    <dimen name="workspace_cell_width">76dip</dimen>
+    <dimen name="workspace_cell_height">76dip</dimen>
+</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
new file mode 100644
index 0000000..e4c047f
--- /dev/null
+++ b/res/values-xlarge/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 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.
+*/
+-->
+
+<resources>
+    <style name="WorkspaceIcon.Portrait">
+        <item name="android:drawablePadding">4dip</item>
+        <item name="android:paddingTop">1dip</item>
+    </style>
+
+    <style name="WorkspaceIcon.Landscape">
+        <item name="android:drawablePadding">4dip</item>
+        <item name="android:paddingTop">1dip</item>
+    </style>
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7839120..c977f97 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,6 +32,10 @@
     <declare-styleable name="Workspace">
         <!-- The first screen the workspace should display. -->
         <attr name="defaultScreen" format="integer"  />
+        <!-- The number of horizontal cells for the device in its natural orientation -->
+        <attr name="canonicalDeviceWidth" format="integer"  />
+        <!-- The number of vertical cells for the device in its natural orientation -->
+        <attr name="canonicalDeviceHeight" format="integer"  />
     </declare-styleable>
     
     <!-- CellLayout specific attributes. These attributes are used to customize
-- 
cgit v1.1


From 1bdb9d346779ff5fa7cb6b9bff512f3caa06a896 Mon Sep 17 00:00:00 2001
From: Alex Sakhartchouk <alexst@google.com>
Date: Thu, 1 Jul 2010 16:08:19 -0700
Subject: Switching allapps to use Mesh instead of SimpleMesh.

Change-Id: I678525439341d54e6841df3df2d7ab0c67c0b266
---
 res/raw/allapps.rs    |   6 +++---
 res/raw/allapps_bc.bc | Bin 11612 -> 11608 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 1465308..aaf7c10 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -305,7 +305,7 @@ static void drawFrontGrid(float rowOffset, float p)
                     vpConstants->ImgSize.y = rsAllocationGetDimY(gSelectedIconTexture);
                     vpConstants->Position.y = y - (rsAllocationGetDimY(gSelectedIconTexture)
                                                 - rsAllocationGetDimY(gIconIDs[iconNum])) * 0.5f;
-                    rsgDrawSimpleMesh(gSMCell);
+                    rsgDrawMesh(gSMCell);
                 }
 
                 rsgBindProgramFragment(gPFTexMip);
@@ -313,14 +313,14 @@ static void drawFrontGrid(float rowOffset, float p)
                 vpConstants->ImgSize.y = rsAllocationGetDimY(gIconIDs[iconNum]);
                 vpConstants->Position.y = y - 0.2f;
                 rsgBindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
-                rsgDrawSimpleMesh(gSMCell);
+                rsgDrawMesh(gSMCell);
 
                 rsgBindProgramFragment(gPFTexMipAlpha);
                 vpConstants->ImgSize.x = rsAllocationGetDimX(gLabelIDs[iconNum]);
                 vpConstants->ImgSize.y = rsAllocationGetDimY(gLabelIDs[iconNum]);
                 vpConstants->Position.y = y - 64.f - 0.2f;
                 rsgBindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]);
-                rsgDrawSimpleMesh(gSMCell);
+                rsgDrawMesh(gSMCell);
             }
             iconNum++;
         }
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
index 59b0afb..e2341bd 100644
Binary files a/res/raw/allapps_bc.bc and b/res/raw/allapps_bc.bc differ
-- 
cgit v1.1


From 0e26059548e429e5d1c973bebe4c561bead2926f Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 30 Jun 2010 17:07:39 -0700
Subject: Improving home screen customization

- Created a drawer with tabs for widgets, folders, shortcuts, wallpapers
(wallpapers are currently not implemented)
- Tapping outside the drawer dismisses it
- Moved the all apps icon to the upper right of the screen
- Adding a toast that says "No more space on screen" when dragging a widget to a full screen
- Fixed bug where you could stack two equal-sized widgets on top of each other on the homescreen (exposed by the new ability to drag widgets onto the home screen)

Change-Id: I03b65ce54a85d24328c94e0c06e249571de449ee
---
 res/anim/home_customization_drawer_slide_down.xml |  22 +++++
 res/anim/home_customization_drawer_slide_up.xml   |  22 +++++
 res/anim/widget_chooser_slide_up.xml              |  23 -----
 res/layout-xlarge/launcher.xml                    | 113 ++++++++++++++--------
 res/layout/home_customization_drawer_item.xml     |  24 +++++
 res/layout/widget_item.xml                        |  22 -----
 res/values/strings.xml                            |   5 +
 7 files changed, 144 insertions(+), 87 deletions(-)
 create mode 100644 res/anim/home_customization_drawer_slide_down.xml
 create mode 100644 res/anim/home_customization_drawer_slide_up.xml
 delete mode 100644 res/anim/widget_chooser_slide_up.xml
 create mode 100644 res/layout/home_customization_drawer_item.xml
 delete mode 100644 res/layout/widget_item.xml

(limited to 'res')

diff --git a/res/anim/home_customization_drawer_slide_down.xml b/res/anim/home_customization_drawer_slide_down.xml
new file mode 100644
index 0000000..b3041c7
--- /dev/null
+++ b/res/anim/home_customization_drawer_slide_down.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0%p"
+    android:toXDelta="0%p"
+    android:fromYDelta="0%p"
+    android:toYDelta="100%p"
+
+    android:duration="500" />
diff --git a/res/anim/home_customization_drawer_slide_up.xml b/res/anim/home_customization_drawer_slide_up.xml
new file mode 100644
index 0000000..3df2320
--- /dev/null
+++ b/res/anim/home_customization_drawer_slide_up.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0%p"
+    android:toXDelta="0%p"
+    android:fromYDelta="100%p"
+    android:toYDelta="0%p"
+
+    android:duration="500" />
diff --git a/res/anim/widget_chooser_slide_up.xml b/res/anim/widget_chooser_slide_up.xml
deleted file mode 100644
index b43ec36..0000000
--- a/res/anim/widget_chooser_slide_up.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromXDelta="0%p"
-    android:toXDelta="0%p"
-    android:fromYDelta="100%p"
-    android:toYDelta="0%p"
-
-    android:duration="500"
-    android:fillAfter="true" />
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 17a5b84..ce864c2 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -39,54 +39,83 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <com.android.launcher2.DeleteZone
-        android:id="@+id/delete_zone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/delete_zone_padding"
-        android:layout_gravity="top|right"
-
-        android:scaleType="center"
-        android:src="@drawable/delete_zone_selector"
-        android:visibility="gone"
-        launcher:direction="horizontal"
-        />
-    <ImageView
-        android:id="@+id/add_button"
+
+
+    <RelativeLayout
+        android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/delete_zone_padding"
-        android:layout_gravity="top|right"
+        android:layout_gravity="top|right">
+        <com.android.launcher2.HandleView
+            style="@style/HotseatButton"
+            android:id="@+id/all_apps_button"
+            android:layout_width="@dimen/button_bar_height"
 
-        android:scaleType="center"
-        android:src="@drawable/add_button"
+            android:src="@drawable/all_apps_button"
+            launcher:direction="horizontal"  />
+        <ImageView
+            android:id="@+id/add_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/all_apps_button"
 
-        android:onClick="onClickAddButton"
-        android:focusable="true"
-        android:clickable="true" />
+            android:layout_centerVertical="true"
+            android:scaleType="center"
+            android:src="@drawable/add_button"
 
-    <RelativeLayout
-        android:id="@+id/all_apps_button_cluster"
-        android:layout_width="@dimen/button_bar_height"
-        android:layout_height="@dimen/button_bar_height"
-        android:layout_gravity="top|left"
-        android:paddingTop="2dip"
-        >
-       <com.android.launcher2.HandleView
-           style="@style/HotseatButton"
-           android:id="@+id/all_apps_button"
-           android:layout_centerHorizontal="true"
-           android:layout_alignParentBottom="true"
-
-           android:src="@drawable/all_apps_button"
-           launcher:direction="horizontal"
-           />
+            android:onClick="onClickAddButton"
+            android:focusable="true"
+            android:clickable="true" />
+        <com.android.launcher2.DeleteZone
+            android:id="@+id/delete_zone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/delete_zone_padding"
+            android:layout_toRightOf="@id/all_apps_button"
+
+            android:scaleType="center"
+            android:src="@drawable/delete_zone_selector"
+            android:visibility="gone"
+            launcher:direction="horizontal" />
     </RelativeLayout>
-    <com.android.launcher2.WidgetChooser
-        android:id="@+id/widget_chooser"
+
+    <TabHost
+        android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="100dip"
+        android:layout_height="200dip"
         android:layout_gravity="bottom"
-        android:visibility="gone"
-        />
+        android:visibility="gone">
+      <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+         <TabWidget
+           android:id="@android:id/tabs"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content" />
+         <FrameLayout
+           android:id="@android:id/tabcontent"
+           android:background="#ff000000"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent">
+           <com.android.launcher2.WidgetChooser
+             android:id="@+id/widget_chooser"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
+           <com.android.launcher2.FolderChooser
+             android:id="@+id/folder_chooser"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
+           <com.android.launcher2.ShortcutChooser
+             android:id="@+id/shortcut_chooser"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
+           <TextView
+             android:id="@+id/wallpaperstab"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:text="@string/wallpapers_temp_tab_text" />
+          </FrameLayout>
+        </LinearLayout>
+    </TabHost>
 </com.android.launcher2.DragLayer>
diff --git a/res/layout/home_customization_drawer_item.xml b/res/layout/home_customization_drawer_item.xml
new file mode 100644
index 0000000..e3d20a1
--- /dev/null
+++ b/res/layout/home_customization_drawer_item.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:background="?android:attr/galleryItemBackground"
+    android:layout_width="200dip"
+    android:layout_height="match_parent"
+    android:padding="20dip"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|center_vertical|clip_vertical"
+    android:textAppearance="?android:attr/textAppearanceMedium" />
\ No newline at end of file
diff --git a/res/layout/widget_item.xml b/res/layout/widget_item.xml
deleted file mode 100644
index c79bd31..0000000
--- a/res/layout/widget_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?android:attr/galleryItemBackground"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:scaleType="fitXY"
-    android:focusable="true" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86c1b3c..f61871d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,6 +43,11 @@
     <string name="activity_not_found">Application is not installed on your phone.</string>
     <!-- List item for configuring the current wallpaper -->
     <string name="configure_wallpaper">Configure...</string>
+    <string name="widgets_tab_label">Widgets</string>
+    <string name="folders_tab_label">Folders</string>
+    <string name="shortcuts_tab_label">Shortcuts</string>
+    <string name="wallpapers_tab_label">Wallpapers</string>
+    <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
 
     <!-- Folders -->
     <skip />
-- 
cgit v1.1


From 4ab2f860e704b48a721b30095ebbdd353e3c00c4 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 12 Jul 2010 16:36:06 -0700
Subject: Fixed height of all apps icon in some configurations (running N1 with
 DPI set to 120)

---
 res/layout-xlarge/launcher.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index ce864c2..72cd796 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -49,6 +49,7 @@
         <com.android.launcher2.HandleView
             style="@style/HotseatButton"
             android:id="@+id/all_apps_button"
+            android:layout_height="@dimen/button_bar_height"
             android:layout_width="@dimen/button_bar_height"
 
             android:src="@drawable/all_apps_button"
-- 
cgit v1.1


From 6569f2c80e179c2f8ed73dae6b01d971ec20f005 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 12 Jul 2010 14:25:18 -0700
Subject: When dragging items on the home screen, visualize where they will
 drop.

Draw a rectangle around the area where an item will land if it is dropped.
If the area is vacant, the rectangle is green; otherwise, it is red.

Change-Id: I859b52514566fa55f8c7a04493b8088d12baa476
---
 res/drawable/rounded_rect_green.9.png | Bin 0 -> 361 bytes
 res/drawable/rounded_rect_red.9.png   | Bin 0 -> 342 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable/rounded_rect_green.9.png
 create mode 100644 res/drawable/rounded_rect_red.9.png

(limited to 'res')

diff --git a/res/drawable/rounded_rect_green.9.png b/res/drawable/rounded_rect_green.9.png
new file mode 100644
index 0000000..5787c3d
Binary files /dev/null and b/res/drawable/rounded_rect_green.9.png differ
diff --git a/res/drawable/rounded_rect_red.9.png b/res/drawable/rounded_rect_red.9.png
new file mode 100644
index 0000000..7a5fdee
Binary files /dev/null and b/res/drawable/rounded_rect_red.9.png differ
-- 
cgit v1.1


From 8f86ddcb90063a56c25c9c782316574bc4e5dd93 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Fri, 16 Jul 2010 13:55:32 -0700
Subject: Generate a default preview for widgets that don't have a
 previewImage.

Change-Id: I3a3c24543c925a50ab34fd3cbf7947544a5ac5c0
---
 res/drawable/default_widget_preview.9.png | Bin 0 -> 541 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable/default_widget_preview.9.png

(limited to 'res')

diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png
new file mode 100644
index 0000000..e966b1b
Binary files /dev/null and b/res/drawable/default_widget_preview.9.png differ
-- 
cgit v1.1


From afb81d4ac5a09f1de753c1be72457b16cab6e02d Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Mon, 19 Jul 2010 16:20:03 -0700
Subject: Ported Launcher2 to use the new Build system.

Change-Id: Ie24bb6520f9f6dfc24dde2b7810ec322bc7b3a1a
---
 res/raw/allapps.rs    | 392 --------------------------------------------------
 res/raw/allapps_bc.bc | Bin 11608 -> 0 bytes
 2 files changed, 392 deletions(-)
 delete mode 100644 res/raw/allapps.rs
 delete mode 100644 res/raw/allapps_bc.bc

(limited to 'res')

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
deleted file mode 100644
index aaf7c10..0000000
--- a/res/raw/allapps.rs
+++ /dev/null
@@ -1,392 +0,0 @@
-#pragma version(1)
-
-#pragma rs java_package_name(com.android.launcher2)
-
-#include "../../../../../frameworks/base/libs/rs/scriptc/rs_types.rsh"
-#include "../../../../../frameworks/base/libs/rs/scriptc/rs_math.rsh"
-#include "../../../../../frameworks/base/libs/rs/scriptc/rs_graphics.rsh"
-
-#define PI 3.14159f
-
-// Constants from Java
-int COLUMNS_PER_PAGE_PORTRAIT;
-int ROWS_PER_PAGE_PORTRAIT;
-int COLUMNS_PER_PAGE_LANDSCAPE;
-int ROWS_PER_PAGE_LANDSCAPE;
-
-int gIconCount;
-int gSelectedIconIndex = -1;
-rs_allocation gSelectedIconTexture;
-rs_allocation gHomeButton;
-
-rs_program_fragment gPFTexNearest;
-rs_program_fragment gPFTexMip;
-rs_program_fragment gPFTexMipAlpha;
-rs_program_vertex gPVCurve;
-rs_program_store gPS;
-rs_mesh gSMCell;
-
-rs_allocation *gIconIDs;
-rs_allocation *gLabelIDs;
-
-typedef struct VpConsts {
-    float4 Position;
-    float4 ScaleOffset;
-    float2 BendPos;
-    float2 ImgSize;
-} VpConsts_t;
-VpConsts_t *vpConstants;
-
-
-#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants)
-#pragma rs export_func(move, moveTo, setZoom, fling)
-
-
-// Attraction to center values from page edge to page center.
-static float g_AttractionTable[9] = {20.f, 20.f, 20.f, 10.f, -10.f, -20.f, -20.f, -20.f, -20.f};
-static float g_FrictionTable[9] = {10.f, 10.f, 11.f, 15.f, 15.f, 11.f, 10.f, 10.f, 10.f};
-static float g_PhysicsTableSize = 7;
-
-static float gZoomTarget;
-static float gTargetPos;
-static float g_PosPage = 0.f;
-static float g_PosVelocity = 0.f;
-static float g_LastPositionX = 0.f;
-static bool g_LastTouchDown = false;
-static float g_DT;
-static int64_t g_LastTime;
-static int g_PosMax;
-static float g_Zoom = 0.f;
-static float g_Animation = 1.f;
-static float g_OldPosPage;
-static float g_OldPosVelocity;
-static float g_OldZoom;
-static float g_MoveToTotalTime = 0.2f;
-static float g_MoveToTime = 0.f;
-static float g_MoveToOldPos = 0.f;
-
-static int g_Cols;
-static int g_Rows;
-
-// Drawing constants, should be parameters ======
-#define VIEW_ANGLE 1.28700222f
-
-
-static void updateReadback() {
-    if ((g_OldPosPage != g_PosPage) ||
-        (g_OldPosVelocity != g_PosVelocity) ||
-        (g_OldZoom != g_Zoom)) {
-
-        g_OldPosPage = g_PosPage;
-        g_OldPosVelocity = g_PosVelocity;
-        g_OldZoom = g_Zoom;
-
-        int i[3];
-        i[0] = g_PosPage * (1 << 16);
-        i[1] = g_PosVelocity * (1 << 16);
-        i[2] = g_OldZoom * (1 << 16);
-        rsSendToClient(&i[0], 1, 12, 1);
-    }
-}
-
-void init() {
-}
-
-void move(float newPos) {
-    if (g_LastTouchDown) {
-        float dx = -(newPos - g_LastPositionX);
-        g_PosVelocity = 0;
-        g_PosPage += dx * 5.2f;
-
-        float pmin = -0.49f;
-        float pmax = g_PosMax + 0.49f;
-        g_PosPage = clamp(g_PosPage, pmin, pmax);
-    }
-    g_LastTouchDown = true;
-    g_LastPositionX = newPos;
-    g_MoveToTime = 0;
-}
-
-void moveTo(float targetPos) {
-    gTargetPos = targetPos;
-    g_MoveToTime = g_MoveToTotalTime;
-    g_PosVelocity = 0;
-    g_MoveToOldPos = g_PosPage;
-}
-
-void setZoom(float z, /*bool*/ int animate) {
-    gZoomTarget = z;
-    if (gZoomTarget < 0.001f) {
-        gZoomTarget = 0;
-    }
-    if (!animate) {
-        g_Zoom = gZoomTarget;
-    }
-    updateReadback();
-}
-
-void fling(float newPos, float vel) {
-    move(newPos);
-
-    g_LastTouchDown = false;
-    g_PosVelocity = -vel * 4;
-    float av = fabs(g_PosVelocity);
-    float minVel = 3.5f;
-
-    minVel *= 1.f - (fabs(rsFrac(g_PosPage + 0.5f) - 0.5f) * 0.45f);
-
-    if (av < minVel && av > 0.2f) {
-        if (g_PosVelocity > 0) {
-            g_PosVelocity = minVel;
-        } else {
-            g_PosVelocity = -minVel;
-        }
-    }
-
-    if (g_PosPage <= 0) {
-        g_PosVelocity = max(0.f, g_PosVelocity);
-    }
-    if (g_PosPage > g_PosMax) {
-        g_PosVelocity = min(0.f, g_PosVelocity);
-    }
-}
-
-// Interpolates values in the range 0..1 to a curve that eases in
-// and out.
-static float getInterpolation(float input) {
-    return (cos((input + 1) * PI) * 0.5f) + 0.5f;
-}
-
-
-static void updatePos() {
-    if (g_LastTouchDown) {
-        return;
-    }
-
-    float tablePosNorm = rsFrac(g_PosPage + 0.5f);
-    float tablePosF = tablePosNorm * g_PhysicsTableSize;
-    int tablePosI = tablePosF;
-    float tablePosFrac = tablePosF - tablePosI;
-    float accel = mix(g_AttractionTable[tablePosI],
-                        g_AttractionTable[tablePosI + 1],
-                        tablePosFrac) * g_DT;
-    float friction = mix(g_FrictionTable[tablePosI],
-                        g_FrictionTable[tablePosI + 1],
-                        tablePosFrac) * g_DT;
-
-    if (g_MoveToTime) {
-        // New position is old posiition + (total distance) * (interpolated time)
-        g_PosPage = g_MoveToOldPos + (gTargetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime);
-        g_MoveToTime -= g_DT;
-        if (g_MoveToTime <= 0) {
-            g_MoveToTime = 0;
-            g_PosPage = gTargetPos;
-        }
-        return;
-    }
-
-    // If our velocity is low OR acceleration is opposing it, apply it.
-    if (fabs(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) {
-        g_PosVelocity += accel;
-    }
-    //RS_DEBUG(g_PosPage);
-    //RS_DEBUG(g_PosVelocity);
-    //RS_DEBUG(friction);
-    //RS_DEBUG(accel);
-
-    // Normal physics
-    if (g_PosVelocity > 0) {
-        g_PosVelocity -= friction;
-        g_PosVelocity = max(g_PosVelocity, 0.f);
-    } else {
-        g_PosVelocity += friction;
-        g_PosVelocity = min(g_PosVelocity, 0.f);
-    }
-
-    if ((friction > fabs(g_PosVelocity)) && (friction > fabs(accel))) {
-        // Special get back to center and overcome friction physics.
-        float t = tablePosNorm - 0.5f;
-        if (fabs(t) < (friction * g_DT)) {
-            // really close, just snap
-            g_PosPage = round(g_PosPage);
-            g_PosVelocity = 0;
-        } else {
-            if (t > 0) {
-                g_PosVelocity = -friction;
-            } else {
-                g_PosVelocity = friction;
-            }
-        }
-    }
-
-    // Check for out of boundry conditions.
-    if (g_PosPage < 0 && g_PosVelocity < 0) {
-        float damp = 1.0f + (g_PosPage * 4);
-        damp = clamp(damp, 0.f, 0.9f);
-        g_PosVelocity *= damp;
-    }
-    if (g_PosPage > g_PosMax && g_PosVelocity > 0) {
-        float damp = 1.0f - ((g_PosPage - g_PosMax) * 4);
-        damp = clamp(damp, 0.f, 0.9f);
-        g_PosVelocity *= damp;
-    }
-
-    g_PosPage += g_PosVelocity * g_DT;
-    g_PosPage = clamp(g_PosPage, -0.49f, g_PosMax + 0.49f);
-}
-
-static void
-draw_home_button()
-{
-    color(1.0f, 1.0f, 1.0f, 1.0f);
-    rsgBindTexture(gPFTexNearest, 0, gHomeButton);
-
-    float w = rsgGetWidth();
-    float h = rsgGetHeight();
-    float tw = rsAllocationGetDimX(gHomeButton);
-    float th = rsAllocationGetDimY(gHomeButton);
-
-    float x;
-    float y;
-    if (w > h) {
-        x = w - (tw * (1 - g_Animation)) + 20;
-        y = (h - th) * 0.5f;
-    } else {
-        x = (w - tw) / 2;
-        y = -g_Animation * th;
-        y -= 30; // move the house to the edge of the screen as it doesn't fill the texture.
-    }
-
-    rsgDrawSpriteScreenspace(x, y, 0, tw, th);
-}
-
-static void drawFrontGrid(float rowOffset, float p)
-{
-    float h = rsgGetHeight();
-    float w = rsgGetWidth();
-
-    int intRowOffset = rowOffset;
-    float rowFrac = rowOffset - intRowOffset;
-    float colWidth = 120.f;//w / 4;
-    float rowHeight = colWidth + 25.f;
-    float yoff = 0.5f * h + 1.5f * rowHeight;
-
-    int row, col;
-    int colCount = 4;
-    if (w > h) {
-        colCount = 6;
-        rowHeight -= 12.f;
-        yoff = 0.47f * h + 1.0f * rowHeight;
-    }
-
-    int iconNum = (intRowOffset - 5) * colCount;
-
-    rsgBindProgramVertex(gPVCurve);
-
-    vpConstants->Position.z = p;
-
-    color(1.0f, 1.0f, 1.0f, 1.0f);
-    for (row = -5; row < 15; row++) {
-        float y = yoff - ((-rowFrac + row) * rowHeight);
-
-        for (col=0; col < colCount; col++) {
-            if (iconNum >= gIconCount) {
-                return;
-            }
-
-            if (iconNum >= 0) {
-                float x = colWidth * col + (colWidth / 2);
-                vpConstants->Position.x = x + 0.2f;
-
-                if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture.p) {
-                    rsgBindProgramFragment(gPFTexNearest);
-                    rsgBindTexture(gPFTexNearest, 0, gSelectedIconTexture);
-                    vpConstants->ImgSize.x = rsAllocationGetDimX(gSelectedIconTexture);
-                    vpConstants->ImgSize.y = rsAllocationGetDimY(gSelectedIconTexture);
-                    vpConstants->Position.y = y - (rsAllocationGetDimY(gSelectedIconTexture)
-                                                - rsAllocationGetDimY(gIconIDs[iconNum])) * 0.5f;
-                    rsgDrawMesh(gSMCell);
-                }
-
-                rsgBindProgramFragment(gPFTexMip);
-                vpConstants->ImgSize.x = rsAllocationGetDimX(gIconIDs[iconNum]);
-                vpConstants->ImgSize.y = rsAllocationGetDimY(gIconIDs[iconNum]);
-                vpConstants->Position.y = y - 0.2f;
-                rsgBindTexture(gPFTexMip, 0, gIconIDs[iconNum]);
-                rsgDrawMesh(gSMCell);
-
-                rsgBindProgramFragment(gPFTexMipAlpha);
-                vpConstants->ImgSize.x = rsAllocationGetDimX(gLabelIDs[iconNum]);
-                vpConstants->ImgSize.y = rsAllocationGetDimY(gLabelIDs[iconNum]);
-                vpConstants->Position.y = y - 64.f - 0.2f;
-                rsgBindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]);
-                rsgDrawMesh(gSMCell);
-            }
-            iconNum++;
-        }
-    }
-}
-
-
-int root()
-{
-    // Compute dt in seconds.
-    int64_t newTime = rsUptimeMillis();
-    g_DT = (newTime - g_LastTime) * 0.001f;
-    g_LastTime = newTime;
-
-    // physics may break if DT is large.
-    g_DT = min(g_DT, 0.1f);
-
-    if (g_Zoom != gZoomTarget) {
-        float dz = g_DT * 1.7f;
-        if (gZoomTarget < 0.5f) {
-            dz = -dz;
-        }
-        if (fabs(g_Zoom - gZoomTarget) < fabs(dz)) {
-            g_Zoom = gZoomTarget;
-        } else {
-            g_Zoom += dz;
-        }
-        updateReadback();
-    }
-    g_Animation = pow(1.f - g_Zoom, 3.f);
-
-    // Set clear value to dim the background based on the zoom position.
-    if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f)) {
-        rsgClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        // When we're zoomed out and not tracking motion events, reset the pos to 0.
-        if (!g_LastTouchDown) {
-            g_PosPage = 0;
-        }
-        return 0;
-    } else {
-        rsgClearColor(0.0f, 0.0f, 0.0f, g_Zoom);
-    }
-
-    rsgBindProgramStore(gPS);
-
-    // icons & labels
-    if (rsgGetWidth() > rsgGetHeight()) {
-        g_Cols = COLUMNS_PER_PAGE_LANDSCAPE;
-        g_Rows = ROWS_PER_PAGE_LANDSCAPE;
-    } else {
-        g_Cols = COLUMNS_PER_PAGE_PORTRAIT;
-        g_Rows = ROWS_PER_PAGE_PORTRAIT;
-    }
-
-    g_PosMax = ((gIconCount + (g_Cols-1)) / g_Cols) - g_Rows;
-    if (g_PosMax < 0) g_PosMax = 0;
-
-    updatePos();
-    updateReadback();
-
-    // Draw the icons ========================================
-    drawFrontGrid(g_PosPage, g_Animation);
-
-    rsgBindProgramFragment(gPFTexNearest);
-    draw_home_button();
-    return (g_PosVelocity != 0) || rsFrac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0);
-}
-
-
diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc
deleted file mode 100644
index e2341bd..0000000
Binary files a/res/raw/allapps_bc.bc and /dev/null differ
-- 
cgit v1.1


From 558654c6ec6eefa260e5a1c1c44fc6e13ec20473 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Fri, 23 Jul 2010 16:48:11 -0700
Subject: Switched to tabbed version of AllApps2D on xlarge screens.

- add a temporary new zoom animation for all apps
- modify AllApps2D to allow it to be transparent
- other changes to dismiss the customization drawer when appropriate

Change-Id: I5660ab77f256ded299c1721c589983a1b30d56a4
---
 res/anim/all_apps_zoom_in.xml         | 33 ++++++++++++++++
 res/anim/all_apps_zoom_out.xml        | 33 ++++++++++++++++
 res/layout-land/all_apps_2d.xml       |  2 +-
 res/layout-port/all_apps_2d.xml       |  2 +-
 res/layout-xlarge/all_apps_tabbed.xml | 56 +++++++++++++++++++++++++++
 res/layout-xlarge/launcher.xml        | 73 ++++++++++++++++++-----------------
 6 files changed, 162 insertions(+), 37 deletions(-)
 create mode 100644 res/anim/all_apps_zoom_in.xml
 create mode 100644 res/anim/all_apps_zoom_out.xml
 create mode 100644 res/layout-xlarge/all_apps_tabbed.xml

(limited to 'res')

diff --git a/res/anim/all_apps_zoom_in.xml b/res/anim/all_apps_zoom_in.xml
new file mode 100644
index 0000000..644d1cf
--- /dev/null
+++ b/res/anim/all_apps_zoom_in.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:shareInterpolator="true">
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="0%p"
+        android:toXDelta="0%p"
+        android:fromYDelta="-20%p"
+        android:toYDelta="0%p"
+        android:duration="500" />
+    <scale
+        android:fromXScale="5.0"
+        android:toXScale="1.0"
+        android:fromYScale="5.0"
+        android:toYScale="1.0"
+        android:pivotX="50%"
+        android:pivotY="100%"
+        android:duration="500" />
+</set>
diff --git a/res/anim/all_apps_zoom_out.xml b/res/anim/all_apps_zoom_out.xml
new file mode 100644
index 0000000..23a8712
--- /dev/null
+++ b/res/anim/all_apps_zoom_out.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:shareInterpolator="true">
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="0%p"
+        android:toXDelta="0%p"
+        android:fromYDelta="0%p"
+        android:toYDelta="-20%p"
+        android:duration="500" />
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="5.0"
+        android:fromYScale="1.0"
+        android:toYScale="5.0"
+        android:pivotX="50%"
+        android:pivotY="100%"
+        android:duration="500" />
+</set>
diff --git a/res/layout-land/all_apps_2d.xml b/res/layout-land/all_apps_2d.xml
index a253b93..b7fcd45 100644
--- a/res/layout-land/all_apps_2d.xml
+++ b/res/layout-land/all_apps_2d.xml
@@ -22,7 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="2dip"
-    >
+    android:background="#FF000000">
 
     <GridView android:id="@+id/all_apps_2d_grid"
         android:tag="all_apps_2d_grid"
diff --git a/res/layout-port/all_apps_2d.xml b/res/layout-port/all_apps_2d.xml
index 0607d62..081cba2 100644
--- a/res/layout-port/all_apps_2d.xml
+++ b/res/layout-port/all_apps_2d.xml
@@ -22,7 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="2dip"
-    >
+    android:background="#FF000000">
 
     <GridView android:id="@+id/all_apps_2d_grid"
         android:tag="all_apps_2d_grid"
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
new file mode 100644
index 0000000..a5f3d6f
--- /dev/null
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.android.launcher2.AllApps2D
+                android:id="@+id/all_apps_2d"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="2dip">
+                <GridView android:id="@+id/all_apps_2d_grid"
+                    android:tag="all_apps_2d_grid"
+                    android:scrollbars="none"
+                    android:drawSelectorOnTop="false"
+                    android:listSelector="@drawable/grid_selector"
+                    android:verticalSpacing="10dip"
+                    android:numColumns="4"
+                    android:fadingEdgeLength="0dip"
+                    android:cacheColorHint="#00000000"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/button_bar_height"
+                    android:layout_marginTop="8dip"
+                    android:nextFocusDown="@+id/all_apps_2d_home"
+                    android:nextFocusUp="@null"
+                    android:nextFocusLeft="@null"
+                    android:nextFocusRight="@null" />
+            </com.android.launcher2.AllApps2D>
+        </FrameLayout>
+    </LinearLayout>
+</com.android.launcher2.AllAppsTabbed>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 72cd796..61457bf 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -22,7 +22,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/all_apps" />
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="500dip"
+        android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
@@ -39,8 +44,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-
-
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
@@ -86,37 +89,37 @@
         android:layout_height="200dip"
         android:layout_gravity="bottom"
         android:visibility="gone">
-      <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-         <TabWidget
-           android:id="@android:id/tabs"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content" />
-         <FrameLayout
-           android:id="@android:id/tabcontent"
-           android:background="#ff000000"
-           android:layout_width="match_parent"
-           android:layout_height="match_parent">
-           <com.android.launcher2.WidgetChooser
-             android:id="@+id/widget_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.FolderChooser
-             android:id="@+id/folder_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.ShortcutChooser
-             android:id="@+id/shortcut_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <TextView
-             android:id="@+id/wallpaperstab"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:text="@string/wallpapers_temp_tab_text" />
-          </FrameLayout>
-        </LinearLayout>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:background="#ff000000"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.android.launcher2.WidgetChooser
+                    android:id="@+id/widget_chooser"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+                    <com.android.launcher2.FolderChooser
+                        android:id="@+id/folder_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <com.android.launcher2.ShortcutChooser
+                        android:id="@+id/shortcut_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <TextView
+                        android:id="@+id/wallpaperstab"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/wallpapers_temp_tab_text" />
+             </FrameLayout>
+          </LinearLayout>
     </TabHost>
 </com.android.launcher2.DragLayer>
-- 
cgit v1.1


From dee0589388ba0f6373912e18bf86243282fb3b9b Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 27 Jul 2010 10:01:56 -0700
Subject: Home screen now shrinks while customizing

- added a shrink/fade animation on home screen when going into customization mode
- made items in the customization drawer larger

Change-Id: Iddbaf14aa5b1504fe94966971a1ab95c00f24331
---
 res/layout-xlarge/launcher.xml                | 2 +-
 res/layout/home_customization_drawer_item.xml | 2 +-
 res/values/dimens.xml                         | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 61457bf..3f56b45 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -86,7 +86,7 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="200dip"
+        android:layout_height="500dip"
         android:layout_gravity="bottom"
         android:visibility="gone">
         <LinearLayout
diff --git a/res/layout/home_customization_drawer_item.xml b/res/layout/home_customization_drawer_item.xml
index e3d20a1..2ef527d 100644
--- a/res/layout/home_customization_drawer_item.xml
+++ b/res/layout/home_customization_drawer_item.xml
@@ -16,7 +16,7 @@
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?android:attr/galleryItemBackground"
-    android:layout_width="200dip"
+    android:layout_width="600dip"
     android:layout_height="match_parent"
     android:padding="20dip"
     android:orientation="vertical"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 790f835..9bf6cdf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,4 +37,8 @@
     
     <!-- delete_zone_size_full - button_bar_height_portrait -->
     <dimen name="delete_zone_padding">14dip</dimen>
+
+    <!-- horizontal spacing between mini screen thumbnails ie. in all
+         apps and in customization mode -->
+    <dimen name="smallScreenSpacing">10dip</dimen>
 </resources>
-- 
cgit v1.1


From 213d96354e7407dba5c9715eb10d04bebd82c395 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 28 Jul 2010 11:29:25 -0700
Subject: Improved support for workspace screen thumbnails

- Shrinking workspace view in All Apps
- Added vertical margin for workspace screen thumnbnails
- Fixed bugs in a few of the Launcher state transitions (e.g. customization to all apps)

Change-Id: I9ad1c8861585d78fdb2e3bc986a614526b3cfe5f
---
 res/values/dimens.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9bf6cdf..38936ce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,4 +41,7 @@
     <!-- horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
     <dimen name="smallScreenSpacing">10dip</dimen>
+
+    <!-- vertical spacing between edge of screen and mini screen thumbnails -->
+    <dimen name="smallScreenVerticalMargin">20dip</dimen>
 </resources>
-- 
cgit v1.1


From 3d605d5bbef35e3b8aded44c5ef7fe3948f8f7d5 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Thu, 29 Jul 2010 13:59:29 -0700
Subject: Make tabs in all apps actually filter the list of apps.

---
 res/values/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f61871d..60cf9ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,11 +43,17 @@
     <string name="activity_not_found">Application is not installed on your phone.</string>
     <!-- List item for configuring the current wallpaper -->
     <string name="configure_wallpaper">Configure...</string>
+    <!--  Labels for the tabs in the customize drawer -->
     <string name="widgets_tab_label">Widgets</string>
     <string name="folders_tab_label">Folders</string>
     <string name="shortcuts_tab_label">Shortcuts</string>
     <string name="wallpapers_tab_label">Wallpapers</string>
     <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
+    <!--  Labels for the tabs in All Apps -->
+    <string name="all_apps_tab_all">All</string>
+    <string name="all_apps_tab_apps">Apps</string>
+    <string name="all_apps_tab_games">Games</string>
+    <string name="all_apps_tab_downloaded">Downloaded</string>
 
     <!-- Folders -->
     <skip />
-- 
cgit v1.1


From 54dd75463d0eb47c2f468e19063bdc4141dfdf74 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 30 Jul 2010 14:47:52 -0700
Subject: Tapping on mini-screen in All Apps view now goes back to home screen

- had to disable touch event swallowing in workspace in X-Large mode to get this to work
- also changed default screen in XLarge mode to 2 (the middle one)
---
 res/layout-xlarge/launcher.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3f56b45..f0564ca 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -34,6 +34,7 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        launcher:defaultScreen="2"
         launcher:canonicalDeviceWidth="8"
         launcher:canonicalDeviceHeight="4">
 
-- 
cgit v1.1


From 54f7ac30f2832120faa0c2dd45e5b216ac771efb Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 2 Aug 2010 13:56:46 -0700
Subject: Made some temporary aesthetic improvements

- icons in the customization drawer are now much
  more tightly spaced, and no longer use the
  default gallery styling
- wrapped some >100 char lines
- removed "Applications" from the shortcuts
  customization drawer
---
 res/layout/home_customization_drawer_item.xml   |  8 ++++----
 res/layout/home_customization_drawer_widget.xml | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/home_customization_drawer_widget.xml

(limited to 'res')

diff --git a/res/layout/home_customization_drawer_item.xml b/res/layout/home_customization_drawer_item.xml
index 2ef527d..4d61dbf 100644
--- a/res/layout/home_customization_drawer_item.xml
+++ b/res/layout/home_customization_drawer_item.xml
@@ -15,10 +15,10 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?android:attr/galleryItemBackground"
-    android:layout_width="600dip"
-    android:layout_height="match_parent"
+    android:layout_width="200dip"
+    android:layout_height="200dip"
     android:padding="20dip"
     android:orientation="vertical"
     android:gravity="center_horizontal|center_vertical|clip_vertical"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
\ No newline at end of file
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="#ffffffff" />
\ No newline at end of file
diff --git a/res/layout/home_customization_drawer_widget.xml b/res/layout/home_customization_drawer_widget.xml
new file mode 100644
index 0000000..1581308
--- /dev/null
+++ b/res/layout/home_customization_drawer_widget.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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="600dip"
+    android:layout_height="match_parent"
+    android:padding="20dip"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|center_vertical|clip_vertical"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="#ffffffff" />
\ No newline at end of file
-- 
cgit v1.1


From 921efb310af08579d5a97de7f5e350b78677c6d0 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Mon, 2 Aug 2010 15:12:10 -0700
Subject: Move pngs from drawable to drawable-mdpi in project
 packages/apps/Launcher2/

Change-Id: I2eeac742b5279705938c91dee597bea9e983ba50
---
 res/drawable-mdpi/add_button.png                       | Bin 0 -> 2372 bytes
 res/drawable-mdpi/default_widget_preview.9.png         | Bin 0 -> 541 bytes
 res/drawable-mdpi/pressed_application_background.9.png | Bin 0 -> 1091 bytes
 res/drawable-mdpi/rounded_rect_green.9.png             | Bin 0 -> 361 bytes
 res/drawable-mdpi/rounded_rect_red.9.png               | Bin 0 -> 342 bytes
 res/drawable/add_button.png                            | Bin 2372 -> 0 bytes
 res/drawable/default_widget_preview.9.png              | Bin 541 -> 0 bytes
 res/drawable/pressed_application_background.9.png      | Bin 1091 -> 0 bytes
 res/drawable/rounded_rect_green.9.png                  | Bin 361 -> 0 bytes
 res/drawable/rounded_rect_red.9.png                    | Bin 342 -> 0 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-mdpi/add_button.png
 create mode 100644 res/drawable-mdpi/default_widget_preview.9.png
 create mode 100644 res/drawable-mdpi/pressed_application_background.9.png
 create mode 100644 res/drawable-mdpi/rounded_rect_green.9.png
 create mode 100644 res/drawable-mdpi/rounded_rect_red.9.png
 delete mode 100644 res/drawable/add_button.png
 delete mode 100644 res/drawable/default_widget_preview.9.png
 delete mode 100644 res/drawable/pressed_application_background.9.png
 delete mode 100644 res/drawable/rounded_rect_green.9.png
 delete mode 100644 res/drawable/rounded_rect_red.9.png

(limited to 'res')

diff --git a/res/drawable-mdpi/add_button.png b/res/drawable-mdpi/add_button.png
new file mode 100644
index 0000000..0edcfa3
Binary files /dev/null and b/res/drawable-mdpi/add_button.png differ
diff --git a/res/drawable-mdpi/default_widget_preview.9.png b/res/drawable-mdpi/default_widget_preview.9.png
new file mode 100644
index 0000000..e966b1b
Binary files /dev/null and b/res/drawable-mdpi/default_widget_preview.9.png differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
new file mode 100644
index 0000000..b09f595
Binary files /dev/null and b/res/drawable-mdpi/pressed_application_background.9.png differ
diff --git a/res/drawable-mdpi/rounded_rect_green.9.png b/res/drawable-mdpi/rounded_rect_green.9.png
new file mode 100644
index 0000000..5787c3d
Binary files /dev/null and b/res/drawable-mdpi/rounded_rect_green.9.png differ
diff --git a/res/drawable-mdpi/rounded_rect_red.9.png b/res/drawable-mdpi/rounded_rect_red.9.png
new file mode 100644
index 0000000..7a5fdee
Binary files /dev/null and b/res/drawable-mdpi/rounded_rect_red.9.png differ
diff --git a/res/drawable/add_button.png b/res/drawable/add_button.png
deleted file mode 100644
index 0edcfa3..0000000
Binary files a/res/drawable/add_button.png and /dev/null differ
diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png
deleted file mode 100644
index e966b1b..0000000
Binary files a/res/drawable/default_widget_preview.9.png and /dev/null differ
diff --git a/res/drawable/pressed_application_background.9.png b/res/drawable/pressed_application_background.9.png
deleted file mode 100644
index b09f595..0000000
Binary files a/res/drawable/pressed_application_background.9.png and /dev/null differ
diff --git a/res/drawable/rounded_rect_green.9.png b/res/drawable/rounded_rect_green.9.png
deleted file mode 100644
index 5787c3d..0000000
Binary files a/res/drawable/rounded_rect_green.9.png and /dev/null differ
diff --git a/res/drawable/rounded_rect_red.9.png b/res/drawable/rounded_rect_red.9.png
deleted file mode 100644
index 7a5fdee..0000000
Binary files a/res/drawable/rounded_rect_red.9.png and /dev/null differ
-- 
cgit v1.1


From 48e4b2acef2d0a9d648ff709fa85020bab81caf6 Mon Sep 17 00:00:00 2001
From: Jim Shuma <jshuma@google.com>
Date: Tue, 3 Aug 2010 09:05:44 -0700
Subject: Revert "Move pngs from drawable to drawable-mdpi in project
 packages/apps/Launcher2/"

This reverts commit 921efb310af08579d5a97de7f5e350b78677c6d0.
---
 res/drawable-mdpi/add_button.png                       | Bin 2372 -> 0 bytes
 res/drawable-mdpi/default_widget_preview.9.png         | Bin 541 -> 0 bytes
 res/drawable-mdpi/pressed_application_background.9.png | Bin 1091 -> 0 bytes
 res/drawable-mdpi/rounded_rect_green.9.png             | Bin 361 -> 0 bytes
 res/drawable-mdpi/rounded_rect_red.9.png               | Bin 342 -> 0 bytes
 res/drawable/add_button.png                            | Bin 0 -> 2372 bytes
 res/drawable/default_widget_preview.9.png              | Bin 0 -> 541 bytes
 res/drawable/pressed_application_background.9.png      | Bin 0 -> 1091 bytes
 res/drawable/rounded_rect_green.9.png                  | Bin 0 -> 361 bytes
 res/drawable/rounded_rect_red.9.png                    | Bin 0 -> 342 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 res/drawable-mdpi/add_button.png
 delete mode 100644 res/drawable-mdpi/default_widget_preview.9.png
 delete mode 100644 res/drawable-mdpi/pressed_application_background.9.png
 delete mode 100644 res/drawable-mdpi/rounded_rect_green.9.png
 delete mode 100644 res/drawable-mdpi/rounded_rect_red.9.png
 create mode 100644 res/drawable/add_button.png
 create mode 100644 res/drawable/default_widget_preview.9.png
 create mode 100644 res/drawable/pressed_application_background.9.png
 create mode 100644 res/drawable/rounded_rect_green.9.png
 create mode 100644 res/drawable/rounded_rect_red.9.png

(limited to 'res')

diff --git a/res/drawable-mdpi/add_button.png b/res/drawable-mdpi/add_button.png
deleted file mode 100644
index 0edcfa3..0000000
Binary files a/res/drawable-mdpi/add_button.png and /dev/null differ
diff --git a/res/drawable-mdpi/default_widget_preview.9.png b/res/drawable-mdpi/default_widget_preview.9.png
deleted file mode 100644
index e966b1b..0000000
Binary files a/res/drawable-mdpi/default_widget_preview.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
deleted file mode 100644
index b09f595..0000000
Binary files a/res/drawable-mdpi/pressed_application_background.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/rounded_rect_green.9.png b/res/drawable-mdpi/rounded_rect_green.9.png
deleted file mode 100644
index 5787c3d..0000000
Binary files a/res/drawable-mdpi/rounded_rect_green.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/rounded_rect_red.9.png b/res/drawable-mdpi/rounded_rect_red.9.png
deleted file mode 100644
index 7a5fdee..0000000
Binary files a/res/drawable-mdpi/rounded_rect_red.9.png and /dev/null differ
diff --git a/res/drawable/add_button.png b/res/drawable/add_button.png
new file mode 100644
index 0000000..0edcfa3
Binary files /dev/null and b/res/drawable/add_button.png differ
diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png
new file mode 100644
index 0000000..e966b1b
Binary files /dev/null and b/res/drawable/default_widget_preview.9.png differ
diff --git a/res/drawable/pressed_application_background.9.png b/res/drawable/pressed_application_background.9.png
new file mode 100644
index 0000000..b09f595
Binary files /dev/null and b/res/drawable/pressed_application_background.9.png differ
diff --git a/res/drawable/rounded_rect_green.9.png b/res/drawable/rounded_rect_green.9.png
new file mode 100644
index 0000000..5787c3d
Binary files /dev/null and b/res/drawable/rounded_rect_green.9.png differ
diff --git a/res/drawable/rounded_rect_red.9.png b/res/drawable/rounded_rect_red.9.png
new file mode 100644
index 0000000..7a5fdee
Binary files /dev/null and b/res/drawable/rounded_rect_red.9.png differ
-- 
cgit v1.1


From d2b7193d4463da1c0fc23670a8896eb9a17efdba Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Tue, 3 Aug 2010 10:46:02 -0700
Subject: packages/apps/Launcher2 : added scaled hdpi version of assets that
 were moved to drawable-mdpi

Change-Id: I7225720c742dda03ce714d507f14ca4df8413990
---
 res/drawable-hdpi/add_button.png                       | Bin 0 -> 20921 bytes
 res/drawable-hdpi/default_widget_preview.9.png         | Bin 0 -> 12701 bytes
 res/drawable-hdpi/pressed_application_background.9.png | Bin 0 -> 46116 bytes
 res/drawable-hdpi/rounded_rect_green.9.png             | Bin 0 -> 6854 bytes
 res/drawable-hdpi/rounded_rect_red.9.png               | Bin 0 -> 6854 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-hdpi/add_button.png
 create mode 100644 res/drawable-hdpi/default_widget_preview.9.png
 create mode 100644 res/drawable-hdpi/pressed_application_background.9.png
 create mode 100644 res/drawable-hdpi/rounded_rect_green.9.png
 create mode 100644 res/drawable-hdpi/rounded_rect_red.9.png

(limited to 'res')

diff --git a/res/drawable-hdpi/add_button.png b/res/drawable-hdpi/add_button.png
new file mode 100644
index 0000000..7e60d81
Binary files /dev/null and b/res/drawable-hdpi/add_button.png differ
diff --git a/res/drawable-hdpi/default_widget_preview.9.png b/res/drawable-hdpi/default_widget_preview.9.png
new file mode 100644
index 0000000..6596f07
Binary files /dev/null and b/res/drawable-hdpi/default_widget_preview.9.png differ
diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png
new file mode 100644
index 0000000..a6cbe94
Binary files /dev/null and b/res/drawable-hdpi/pressed_application_background.9.png differ
diff --git a/res/drawable-hdpi/rounded_rect_green.9.png b/res/drawable-hdpi/rounded_rect_green.9.png
new file mode 100644
index 0000000..a846cbd
Binary files /dev/null and b/res/drawable-hdpi/rounded_rect_green.9.png differ
diff --git a/res/drawable-hdpi/rounded_rect_red.9.png b/res/drawable-hdpi/rounded_rect_red.9.png
new file mode 100644
index 0000000..21fd62c
Binary files /dev/null and b/res/drawable-hdpi/rounded_rect_red.9.png differ
-- 
cgit v1.1


From 2c3af5ffb21039a73107ef70723d2353146ab94a Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 3 Aug 2010 13:53:20 -0700
Subject: refreshed apps/configure button, added search button

- configure button now has a pressed state (as
  do the other two)
- also added a cast to getX() from float->int
  because of changes in the view property code

Change-Id: I57dc6e44838f4f4354f8977a3b542e93384b3d7d
---
 res/drawable-xlarge/all_apps_button.xml          |  20 ++++++++++++
 res/drawable-xlarge/all_apps_button_normal.png   | Bin 0 -> 3713 bytes
 res/drawable-xlarge/all_apps_button_pressed.png  | Bin 0 -> 3467 bytes
 res/drawable-xlarge/configure_button.xml         |  20 ++++++++++++
 res/drawable-xlarge/configure_button_normal.png  | Bin 0 -> 4228 bytes
 res/drawable-xlarge/configure_button_pressed.png | Bin 0 -> 3718 bytes
 res/drawable-xlarge/search_button.xml            |  20 ++++++++++++
 res/drawable-xlarge/search_button_normal.png     | Bin 0 -> 6234 bytes
 res/drawable-xlarge/search_button_pressed.png    | Bin 0 -> 5798 bytes
 res/drawable/add_button.png                      | Bin 2372 -> 0 bytes
 res/layout-xlarge/launcher.xml                   |  38 ++++++++++++++---------
 11 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100644 res/drawable-xlarge/all_apps_button.xml
 create mode 100644 res/drawable-xlarge/all_apps_button_normal.png
 create mode 100644 res/drawable-xlarge/all_apps_button_pressed.png
 create mode 100644 res/drawable-xlarge/configure_button.xml
 create mode 100644 res/drawable-xlarge/configure_button_normal.png
 create mode 100644 res/drawable-xlarge/configure_button_pressed.png
 create mode 100644 res/drawable-xlarge/search_button.xml
 create mode 100644 res/drawable-xlarge/search_button_normal.png
 create mode 100644 res/drawable-xlarge/search_button_pressed.png
 delete mode 100644 res/drawable/add_button.png

(limited to 'res')

diff --git a/res/drawable-xlarge/all_apps_button.xml b/res/drawable-xlarge/all_apps_button.xml
new file mode 100644
index 0000000..1e654f0
--- /dev/null
+++ b/res/drawable-xlarge/all_apps_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/all_apps_button_pressed" />
+    <item android:drawable="@drawable/all_apps_button_normal" />
+</selector>
diff --git a/res/drawable-xlarge/all_apps_button_normal.png b/res/drawable-xlarge/all_apps_button_normal.png
new file mode 100644
index 0000000..095ce63
Binary files /dev/null and b/res/drawable-xlarge/all_apps_button_normal.png differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.png b/res/drawable-xlarge/all_apps_button_pressed.png
new file mode 100644
index 0000000..50e4735
Binary files /dev/null and b/res/drawable-xlarge/all_apps_button_pressed.png differ
diff --git a/res/drawable-xlarge/configure_button.xml b/res/drawable-xlarge/configure_button.xml
new file mode 100644
index 0000000..b292652
--- /dev/null
+++ b/res/drawable-xlarge/configure_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/configure_button_pressed" />
+    <item android:drawable="@drawable/configure_button_normal" />
+</selector>
diff --git a/res/drawable-xlarge/configure_button_normal.png b/res/drawable-xlarge/configure_button_normal.png
new file mode 100644
index 0000000..066f492
Binary files /dev/null and b/res/drawable-xlarge/configure_button_normal.png differ
diff --git a/res/drawable-xlarge/configure_button_pressed.png b/res/drawable-xlarge/configure_button_pressed.png
new file mode 100644
index 0000000..536ed7c
Binary files /dev/null and b/res/drawable-xlarge/configure_button_pressed.png differ
diff --git a/res/drawable-xlarge/search_button.xml b/res/drawable-xlarge/search_button.xml
new file mode 100644
index 0000000..6d5d949
--- /dev/null
+++ b/res/drawable-xlarge/search_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/search_button_pressed" />
+    <item android:drawable="@drawable/search_button_normal" />
+</selector>
diff --git a/res/drawable-xlarge/search_button_normal.png b/res/drawable-xlarge/search_button_normal.png
new file mode 100644
index 0000000..3a3045a
Binary files /dev/null and b/res/drawable-xlarge/search_button_normal.png differ
diff --git a/res/drawable-xlarge/search_button_pressed.png b/res/drawable-xlarge/search_button_pressed.png
new file mode 100644
index 0000000..8ae6b16
Binary files /dev/null and b/res/drawable-xlarge/search_button_pressed.png differ
diff --git a/res/drawable/add_button.png b/res/drawable/add_button.png
deleted file mode 100644
index 0edcfa3..0000000
Binary files a/res/drawable/add_button.png and /dev/null differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index f0564ca..fa323fd 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,30 +45,38 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
+    <ImageView
+        android:id="@+id/search_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/search_button"
+
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:layout_gravity="top|left"/>
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right">
-        <com.android.launcher2.HandleView
-            style="@style/HotseatButton"
-            android:id="@+id/all_apps_button"
-            android:layout_height="@dimen/button_bar_height"
-            android:layout_width="@dimen/button_bar_height"
-
-            android:src="@drawable/all_apps_button"
-            launcher:direction="horizontal"  />
         <ImageView
-            android:id="@+id/add_button"
+            android:id="@+id/configure_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/all_apps_button"
+            android:src="@drawable/configure_button"
 
-            android:layout_centerVertical="true"
-            android:scaleType="center"
-            android:src="@drawable/add_button"
+            android:onClick="onClickConfigureButton"
+            android:focusable="true"
+            android:clickable="true" />
+        <ImageView
+            android:id="@+id/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/configure_button"
+            android:src="@drawable/all_apps_button"
 
-            android:onClick="onClickAddButton"
+            android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
         <com.android.launcher2.DeleteZone
@@ -76,7 +84,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/delete_zone_padding"
-            android:layout_toRightOf="@id/all_apps_button"
+            android:layout_toRightOf="@id/configure_button"
 
             android:scaleType="center"
             android:src="@drawable/delete_zone_selector"
-- 
cgit v1.1


From d22015cd37ea6ef53762eca5be57daca123ff607 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 26 Jul 2010 22:02:18 -0700
Subject: Cleaning up grid size specification in Launcher

This commit eliminates the notion of in-place rotations and a bunch of
associated complexities (including the notion of canonical coordinates).
Further, the number of x and y cells per workspace screen is now being stored
in a single location in the XML definition of Workspace. This fixes a couple
bugs where incorrect values were being used. Finally, eliminated the notion of
"shortAxis" and "longAxis" in terms of padding and cell count. These have been
translated to corresponding x and y axis values.

Change-Id: I30cfed66f82d739355b3f01730b28b6c0437989c
---
 res/layout-land/launcher.xml           |  6 ++++--
 res/layout-land/workspace_screen.xml   | 10 ++++------
 res/layout-port/launcher.xml           |  6 ++++--
 res/layout-port/workspace_screen.xml   | 10 ++++------
 res/layout-xlarge/launcher.xml         |  4 ++--
 res/layout-xlarge/workspace_screen.xml | 10 ++++------
 res/values/attrs.xml                   | 20 ++++++++------------
 7 files changed, 30 insertions(+), 36 deletions(-)

(limited to 'res')

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 1f13f1f..8d38a3d 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -24,14 +24,16 @@
 
     <include layout="@layout/all_apps" />
 
-    <!-- The workspace contains 3 screens of cells -->
+    <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="horizontal"
         android:fadeScrollbars="true"
-        launcher:defaultScreen="2">
+        launcher:defaultScreen="2"
+        launcher:cellCountX="4"
+        launcher:cellCountY="4">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
index 315e68b..9323f58 100644
--- a/res/layout-land/workspace_screen.xml
+++ b/res/layout-land/workspace_screen.xml
@@ -24,9 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:longAxisStartPadding="65dip"
-    launcher:longAxisEndPadding="65dip"
-    launcher:shortAxisStartPadding="0dip"
-    launcher:shortAxisEndPadding="0dip"
-    launcher:shortAxisCells="4"
-    launcher:longAxisCells="4" />
+    launcher:xAxisStartPadding="65dip"
+    launcher:xAxisEndPadding="65dip"
+    launcher:yAxisStartPadding="0dip"
+    launcher:yAxisEndPadding="0dip"/>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 8dc5092..c50dbca 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -24,12 +24,14 @@
 
     <include layout="@layout/all_apps" />
 
-    <!-- The workspace contains 3 screens of cells -->
+    <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        launcher:defaultScreen="2">
+        launcher:defaultScreen="2"
+        launcher:cellCountX="4"
+        launcher:cellCountY="4">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml
index 96df91b..f400c40 100644
--- a/res/layout-port/workspace_screen.xml
+++ b/res/layout-port/workspace_screen.xml
@@ -24,9 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:longAxisStartPadding="8dip"
-    launcher:longAxisEndPadding="@dimen/button_bar_height"
-    launcher:shortAxisStartPadding="0dip"
-    launcher:shortAxisEndPadding="0dip"
-    launcher:shortAxisCells="4"
-    launcher:longAxisCells="4" />
+    launcher:yAxisStartPadding="8dip"
+    launcher:yAxisEndPadding="@dimen/button_bar_height"
+    launcher:xAxisStartPadding="0dip"
+    launcher:xAxisEndPadding="0dip" />
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index fa323fd..0dd25d2 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -35,8 +35,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         launcher:defaultScreen="2"
-        launcher:canonicalDeviceWidth="8"
-        launcher:canonicalDeviceHeight="4">
+        launcher:cellCountX="8"
+        launcher:cellCountY="4">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml
index aa892b9..6a34975 100644
--- a/res/layout-xlarge/workspace_screen.xml
+++ b/res/layout-xlarge/workspace_screen.xml
@@ -24,9 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:longAxisStartPadding="8dip"
-    launcher:longAxisEndPadding="8dip"
-    launcher:shortAxisStartPadding="8dip"
-    launcher:shortAxisEndPadding="8dip"
-    launcher:shortAxisCells="4"
-    launcher:longAxisCells="8" />
+    launcher:yAxisStartPadding="8dip"
+    launcher:yAxisEndPadding="8dip"
+    launcher:xAxisStartPadding="8dip"
+    launcher:xAxisEndPadding="8dip"/>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c977f97..be27288 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,10 +32,10 @@
     <declare-styleable name="Workspace">
         <!-- The first screen the workspace should display. -->
         <attr name="defaultScreen" format="integer"  />
-        <!-- The number of horizontal cells for the device in its natural orientation -->
-        <attr name="canonicalDeviceWidth" format="integer"  />
-        <!-- The number of vertical cells for the device in its natural orientation -->
-        <attr name="canonicalDeviceHeight" format="integer"  />
+        <!-- The number of horizontal cells in the CellLayout -->
+        <attr name="cellCountX" format="integer"  />
+        <!-- The number of vertical cells in the CellLayout -->
+        <attr name="cellCountY" format="integer"  />
     </declare-styleable>
     
     <!-- CellLayout specific attributes. These attributes are used to customize
@@ -46,17 +46,13 @@
         <!-- The height of a single cell -->
         <attr name="cellHeight" format="dimension"  />
         <!-- Padding to apply at the start of the long axis -->
-        <attr name="longAxisStartPadding" format="dimension"  />
+        <attr name="xAxisStartPadding" format="dimension"  />
         <!-- Padding to apply at the end of the long axis -->
-        <attr name="longAxisEndPadding" format="dimension"  />
+        <attr name="xAxisEndPadding" format="dimension"  />
         <!-- Padding to apply at the start of the short axis -->
-        <attr name="shortAxisStartPadding" format="dimension"  />
+        <attr name="yAxisStartPadding" format="dimension"  />
         <!-- Padding to apply at the end of the short axis -->
-        <attr name="shortAxisEndPadding" format="dimension"  />
-        <!-- Number of cells on the short axis of the CellLayout -->
-        <attr name="shortAxisCells" format="integer" />
-        <!-- Number of cells on the long axis of the CellLayout -->
-        <attr name="longAxisCells" format="integer" />
+        <attr name="yAxisEndPadding" format="dimension"  />
     </declare-styleable>
 
     <!-- DeleteZone specific attributes. These attributes are used to customize
-- 
cgit v1.1


From 7247f6315baf16eacb3286f21bd80321385c1def Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 4 Aug 2010 16:02:59 -0700
Subject: Move all apps to the new animation framework, and some other all apps
 changes

Change-Id: Ib4c827966423d76e62db24036bbca0cd6ee46b95
---
 res/layout-xlarge/all_apps_tabbed.xml |  2 +-
 res/values-xlarge/config.xml          | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 res/values-xlarge/config.xml

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index a5f3d6f..c772706 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -38,7 +38,7 @@
                     android:drawSelectorOnTop="false"
                     android:listSelector="@drawable/grid_selector"
                     android:verticalSpacing="10dip"
-                    android:numColumns="4"
+                    android:numColumns="8"
                     android:fadingEdgeLength="0dip"
                     android:cacheColorHint="#00000000"
                     android:layout_width="match_parent"
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
new file mode 100644
index 0000000..2f94c40
--- /dev/null
+++ b/res/values-xlarge/config.xml
@@ -0,0 +1,18 @@
+<resources>
+    <!-- Duration in milliseconds of the all apps zoom-in animation. -->
+    <!-- NB: This should be less than the workspaceShrinkTime as they happen together. -->
+    <integer name="config_allAppsZoomInTime">350</integer>
+
+    <!-- Duration in milliseconds of the all apps zoom-out animation -->
+    <!-- NB: This should be less than the workspaceUnshrinkTime as they happen together. -->
+    <integer name="config_allAppsZoomOutTime">350</integer>
+
+    <!-- Scaling factor used in the all apps zooming animations -->
+    <integer name="config_allAppsZoomScaleFactor">5</integer>
+
+    <!-- Duration in milliseconds of the workspace shrink animation -->
+    <integer name="config_workspaceShrinkTime">700</integer>
+
+    <!-- Duration in milliseconds of the workspace unshrink animation -->
+    <integer name="config_workspaceUnshrinkTime">700</integer>
+</resources>
\ No newline at end of file
-- 
cgit v1.1


From d4ede5325bb7b0da58d8a03a6246d8daae31fb97 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 4 Aug 2010 18:14:08 -0700
Subject: improved comments in strings file

- also added/updated some copyright notices
---
 res/drawable-xlarge/search_button.xml |  2 +-
 res/values/strings.xml                | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/drawable-xlarge/search_button.xml b/res/drawable-xlarge/search_button.xml
index 6d5d949..8f18e67 100644
--- a/res/drawable-xlarge/search_button.xml
+++ b/res/drawable-xlarge/search_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60cf9ca..0a704f8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,14 +45,24 @@
     <string name="configure_wallpaper">Configure...</string>
     <!--  Labels for the tabs in the customize drawer -->
     <string name="widgets_tab_label">Widgets</string>
+    <!--  Title of tab containing all possible folders (ie standard Folders and Live Folders) that 
+          can be added to the home screen -->
     <string name="folders_tab_label">Folders</string>
+    <!--  Title of tab containing all possible shortcuts (eg Contacts, Bookmarks) that can be
+          added to the home screen -->
     <string name="shortcuts_tab_label">Shortcuts</string>
+    <!--  Title of tab for configuring wallpapers -->
     <string name="wallpapers_tab_label">Wallpapers</string>
+    <!--  Placeholder text, will be removed -->
     <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
     <!--  Labels for the tabs in All Apps -->
+    <!--  Title of the tab for all applications (includes games and non-games) -->
     <string name="all_apps_tab_all">All</string>
+    <!--  Title of the tab for all applications *except* games -->
     <string name="all_apps_tab_apps">Apps</string>
+    <!--  Title of the tab for applications labeled as games -->
     <string name="all_apps_tab_games">Games</string>
+    <!--  Tile of the tab for applications that were downloaded from market -->
     <string name="all_apps_tab_downloaded">Downloaded</string>
 
     <!-- Folders -->
-- 
cgit v1.1


From 976ebec9e31643d3513f9f0de2b433d9aa186ce9 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 4 Aug 2010 20:03:37 -0700
Subject: Fix incorrect offset in drag feedback, and other minor stuff.

- moved some dimens to -xlarge
- enlarge AllApps so that it's not clipped
---
 res/layout-xlarge/launcher.xml | 2 +-
 res/values-xlarge/dimens.xml   | 7 +++++++
 res/values/dimens.xml          | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 0dd25d2..fa9c881 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="500dip"
+        android:layout_height="550dip"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 8279492..9e98e46 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -17,4 +17,11 @@
 <resources>
     <dimen name="workspace_cell_width">76dip</dimen>
     <dimen name="workspace_cell_height">76dip</dimen>
+
+    <!-- horizontal spacing between mini screen thumbnails ie. in all
+         apps and in customization mode -->
+    <dimen name="smallScreenSpacing">10dip</dimen>
+
+    <!-- vertical spacing between edge of screen and mini screen thumbnails -->
+    <dimen name="smallScreenVerticalMargin">20dip</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 38936ce..790f835 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,11 +37,4 @@
     
     <!-- delete_zone_size_full - button_bar_height_portrait -->
     <dimen name="delete_zone_padding">14dip</dimen>
-
-    <!-- horizontal spacing between mini screen thumbnails ie. in all
-         apps and in customization mode -->
-    <dimen name="smallScreenSpacing">10dip</dimen>
-
-    <!-- vertical spacing between edge of screen and mini screen thumbnails -->
-    <dimen name="smallScreenVerticalMargin">20dip</dimen>
 </resources>
-- 
cgit v1.1


From ecf403f6de6ac232d148c869a7d7968fef615a6c Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Thu, 5 Aug 2010 16:06:27 -0700
Subject: Import revised translations.

Change-Id: I518526c93b6b13be68b2ab7fc4e249f770ded7d8
---
 res/values-cs/strings.xml     | 13 +++++++++++++
 res/values-da/strings.xml     | 13 +++++++++++++
 res/values-de/strings.xml     | 13 +++++++++++++
 res/values-el/strings.xml     | 13 +++++++++++++
 res/values-es-rUS/strings.xml | 13 +++++++++++++
 res/values-es/strings.xml     | 13 +++++++++++++
 res/values-fr/strings.xml     | 13 +++++++++++++
 res/values-it/strings.xml     | 13 +++++++++++++
 res/values-ja/strings.xml     | 13 +++++++++++++
 res/values-ko/strings.xml     | 13 +++++++++++++
 res/values-nb/strings.xml     | 13 +++++++++++++
 res/values-nl/strings.xml     | 13 +++++++++++++
 res/values-pl/strings.xml     | 13 +++++++++++++
 res/values-pt-rPT/strings.xml | 13 +++++++++++++
 res/values-pt/strings.xml     | 13 +++++++++++++
 res/values-ru/strings.xml     | 13 +++++++++++++
 res/values-sv/strings.xml     | 13 +++++++++++++
 res/values-tr/strings.xml     | 13 +++++++++++++
 res/values-zh-rCN/strings.xml | 13 +++++++++++++
 res/values-zh-rTW/strings.xml | 13 +++++++++++++
 20 files changed, 260 insertions(+)

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bad2730..011ea1e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Tapety"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Aplikace není v telefonu nainstalována."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurace..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgety"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Složky"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Zástupci"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Název složky"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Přejmenovat složku"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6ec1516..08ebc63 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Tapeter"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Programmet er ikke installeret på din telefon."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer ..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Genveje"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapeter"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er fanen for tapeter"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Omdøb mappe"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e4f705e..d1b5ae0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Hintergrundbilder"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Anwendung ist nicht auf dem Telefon installiert."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurieren..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Ordner"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Verknüpfungen"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergrundbilder"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergrundbilder\""</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Ordnername"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Ordner umbenennen"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6514964..eb8097f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Ταπετσαρίες"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Η εφαρμογή δεν έχει εγκατασταθεί στο τηλέφωνό σας."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Διαμόρφωση..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Γραφικά στοιχεία"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Φάκελοι"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Συντομεύσεις"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ταπετσαρίες"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Αυτή θα είναι η καρτέλα ταπετσαριών"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Όνομα φακέλου"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Μετονομασία φακέλου"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5f6b4e5..5a40e3a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Papeles tapiz"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"La aplicación no está instalada en tu computadora."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Accesos directos"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papeles tapiz"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ésta será la pestaña para los papeles tapiz"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
     <string name="rename_action" msgid="6016003384693240896">"Aceptar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5b46c59..9772526 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Fondos de pantalla"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"La aplicación no está instalada en el teléfono."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Accesos directos"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fondos de pantalla"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Será la carpeta de fondos de pantalla."</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
     <string name="rename_action" msgid="6016003384693240896">"Aceptar"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1fb440..6d2d638 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Fonds d\'écran"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurer..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Dossiers"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Raccourcis"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fonds d\'écran"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Onglet des fonds d\'écran"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nom du dossier"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renommer le dossier"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 950e15f..684226d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Sfondi"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Applicazione non installata sul telefono."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configura..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Cartelle"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Collegamenti"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome cartella"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Rinomina cartella"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 021b895..70e7852 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"壁紙"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"アプリケーションがインストールされていません。"</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"ウィジェット"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"フォルダ"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"ショートカット"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁紙"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ここが壁紙タブになります"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"フォルダ名"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"フォルダ名を変更"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 341c7ee..5c99a17 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"배경화면"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"휴대전화에 설치되어 있지 않은 애플리케이션입니다."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"구성..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"위젯"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"폴더"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"바로가기"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"배경화면"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"배경화면 탭이 됩니다."</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"폴더 이름"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"폴더 이름 바꾸기"</string>
     <string name="rename_action" msgid="6016003384693240896">"확인"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 54418e1..aa24d7a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Bakgrunner"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Applikasjonen er ikke installert."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer"</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Moduler"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Snarveier"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrunner"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er nå bakgrunnsfanen"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Gi nytt navn til mappe"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f5ac90e..0777dea 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Achtergronden"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Deze toepassing is niet geïnstalleerd op uw telefoon."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configureren..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Mappen"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Sneltoetsen"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Achtergronden"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit wordt het tabblad \'Achtergronden\'"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mapnaam"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Naam van map wijzigen"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d50a59a..33a9da7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Tapety"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Aplikacja nie jest zainstalowana w telefonie."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfiguruj..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widżety"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Foldery"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Skróty"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To będzie karta tapet"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nazwa folderu"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Zmień nazwę folderu"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index df63f30..bdee633 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Imagens de fundo"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"A aplicação não está instalada no telefone."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Atalhos"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagens de fundo"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Isto será o separador de imagens de fundo"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Mudar o nome da pasta"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b72f7e0..1386d35 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Papéis de parede"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"O aplicativo não está instalado no seu telefone."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Atalhos"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papéis de parede"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Esta será a guia de papéis de parede"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b151618..60e93de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Обои"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Приложение не установлено на телефоне."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Настроить..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Виджеты"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Папки"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Ярлыки"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Обои"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Это будет вкладка обоев"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Название папки"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Переименовать папку"</string>
     <string name="rename_action" msgid="6016003384693240896">"ОК"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9c29ef1..f27c401 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Bakgrundsbilder"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Programmet är inte installerat på din telefon."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurera..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widgetar"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Mappar"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Genvägar"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrundsbilder"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Det här kommer att vara fliken för bakgrundsbilder"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappnamn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Byt namn på mapp"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 43f7520..689c186 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"Duvar Kağıtları"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"Uygulama telefonunuza yüklenmemiş."</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"Yapılandır..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"Widget\'lar"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"Klasörler"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Kısayollar"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Duvar Kağıtları"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Bu duvar kağıdı sekmesi olacaktır"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Klasör adı"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Klasörü yeniden adlandır"</string>
     <string name="rename_action" msgid="6016003384693240896">"Tamam"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0705787..15543bc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"壁纸"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"您的手机上未安装应用程序。"</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"配置..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"窗口小部件"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"文件夹"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"快捷方式"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁纸"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"这将会成为壁纸标签"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"文件夹名称"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重命名文件夹"</string>
     <string name="rename_action" msgid="6016003384693240896">"确定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index de37e19..4783c74 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -27,6 +27,19 @@
     <string name="pick_wallpaper" msgid="5630222540525626723">"桌布"</string>
     <string name="activity_not_found" msgid="3571057450431950427">"應用程式未安裝到手機。"</string>
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
+    <string name="widgets_tab_label" msgid="9145860100000983599">"小工具"</string>
+    <string name="folders_tab_label" msgid="1145293785541489736">"資料夾"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"快速鍵"</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"暫時的桌布標籤"</string>
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"資料夾名稱"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重新命名資料夾"</string>
     <string name="rename_action" msgid="6016003384693240896">"確定"</string>
-- 
cgit v1.1


From 4bb4f735c80ba6baca6678f6508b3862da61313a Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 4 Aug 2010 18:46:01 -0700
Subject: small fixes to Launcher

- more robust unshrink animation
- catching a resource not found exception when
  making widget preview
- added more missing copyright headers
- hiding customization drawer when long press on widget
- long-pressing on widget is temporarily always
  springloaded to zoom in to workspace screen

Change-Id: I6c92877357e907d89840fecc4662f0700b96255b
---
 res/drawable-xlarge/all_apps_button.xml  | 2 +-
 res/drawable-xlarge/configure_button.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/drawable-xlarge/all_apps_button.xml b/res/drawable-xlarge/all_apps_button.xml
index 1e654f0..46bc632 100644
--- a/res/drawable-xlarge/all_apps_button.xml
+++ b/res/drawable-xlarge/all_apps_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
diff --git a/res/drawable-xlarge/configure_button.xml b/res/drawable-xlarge/configure_button.xml
index b292652..ac87290 100644
--- a/res/drawable-xlarge/configure_button.xml
+++ b/res/drawable-xlarge/configure_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
-- 
cgit v1.1


From 3ec8bdd576e23f6aa783d5377abecac6fda07374 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Fri, 6 Aug 2010 16:01:33 -0700
Subject: Refactor zooming animation, and apply it to customize drawer too.

Change-Id: I0bbd5a68adc82cea02dc583ac3d04e3de8c0346e
---
 res/layout-xlarge/all_apps_tabbed.xml | 2 +-
 res/layout-xlarge/launcher.xml        | 5 ++---
 res/values-xlarge/config.xml          | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index c772706..0842fd0 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -44,7 +44,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="@dimen/button_bar_height"
+                    android:layout_marginBottom="8dip"
                     android:layout_marginTop="8dip"
                     android:nextFocusDown="@+id/all_apps_2d_home"
                     android:nextFocusUp="@null"
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index fa9c881..395b048 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="550dip"
+        android:layout_height="500dip"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
@@ -96,8 +96,7 @@
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
         android:layout_height="500dip"
-        android:layout_gravity="bottom"
-        android:visibility="gone">
+        android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 2f94c40..1a9ecc6 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -10,6 +10,9 @@
     <!-- Scaling factor used in the all apps zooming animations -->
     <integer name="config_allAppsZoomScaleFactor">5</integer>
 
+    <!-- Duration in milliseconds of the camera pan animation b/w all apps & customize -->
+    <integer name="config_allAppsCameraPanTime">700</integer>
+
     <!-- Duration in milliseconds of the workspace shrink animation -->
     <integer name="config_workspaceShrinkTime">700</integer>
 
-- 
cgit v1.1


From cceb91c1e905f4898b36e8e6e7d933f4cf6a2f70 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Tue, 10 Aug 2010 12:12:27 -0700
Subject: Import revised translations.

Change-Id: Id7dec46f0fe6f9178dbd8ea2c0c82b843bbfaa3e
---
 res/values-de/strings.xml     | 4 ++--
 res/values-it/strings.xml     | 2 +-
 res/values-zh-rTW/strings.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d1b5ae0..e512dc5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -30,8 +30,8 @@
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Ordner"</string>
     <string name="shortcuts_tab_label" msgid="3312788893569416806">"Verknüpfungen"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergrundbilder"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergrundbilder\""</string>
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergründe"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergründe\""</string>
     <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
     <skip />
     <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 684226d..f3fffbe3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,7 +29,7 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configura..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Cartelle"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Collegamenti"</string>
+    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Scorciatorie"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
     <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4783c74..0467f3b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -31,7 +31,7 @@
     <string name="folders_tab_label" msgid="1145293785541489736">"資料夾"</string>
     <string name="shortcuts_tab_label" msgid="3312788893569416806">"快速鍵"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"暫時的桌布標籤"</string>
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"桌布標籤保留位"</string>
     <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
     <skip />
     <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
-- 
cgit v1.1


From 4cb3724a2c1e5f278e1531d643accc40fcd8e219 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 9 Aug 2010 21:05:32 -0700
Subject: workspace bug fixes

- fixed: pressing home sometimes left workspaces
in shrunken state
- fixed: position of delete zone (trash icon)
- fixed: workspace unshrink sometimes looked weird
when coming from all apps
- fixed: clicking power button and returning left
workspace in shrunken state

Change-Id: Ie974202926e6880ccda26ac9fe967fb587a9b7a3
---
 res/layout-xlarge/launcher.xml | 21 ++++++++++-----------
 res/values-xlarge/dimens.xml   |  3 +++
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 395b048..6eb9318 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -69,27 +69,26 @@
             android:onClick="onClickConfigureButton"
             android:focusable="true"
             android:clickable="true" />
-        <ImageView
-            android:id="@+id/all_apps_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/configure_button"
-            android:src="@drawable/all_apps_button"
-
-            android:onClick="onClickAllAppsButton"
-            android:focusable="true"
-            android:clickable="true" />
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/delete_zone_padding"
-            android:layout_toRightOf="@id/configure_button"
 
             android:scaleType="center"
             android:src="@drawable/delete_zone_selector"
             android:visibility="gone"
             launcher:direction="horizontal" />
+        <ImageView
+            android:id="@+id/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/configure_button"
+            android:src="@drawable/all_apps_button"
+
+            android:onClick="onClickAllAppsButton"
+            android:focusable="true"
+            android:clickable="true" />
     </RelativeLayout>
 
     <TabHost
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 9e98e46..c9bd836 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -24,4 +24,7 @@
 
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
     <dimen name="smallScreenVerticalMargin">20dip</dimen>
+
+    <!-- padding above the delete zone -->
+    <dimen name="delete_zone_padding">6dip</dimen>
 </resources>
-- 
cgit v1.1


From da4dc5edd82a40c3950fc8221c6363b9826204aa Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 10 Aug 2010 22:11:35 -0700
Subject: -> Set grid to 8x7 with proper spacing for landscape/portrait ->
 Added a button to the top left of Launcher which switches    between
 landscape and portrait. For testing purposes only.

Change-Id: I01f8cfcf92c8ba7727eeba0e59a0b8ff055598fe
---
 res/drawable-xlarge/rotate_button.xml         |  20 +++++++++++++++
 res/drawable-xlarge/rotate_button_normal.png  | Bin 0 -> 6252 bytes
 res/drawable-xlarge/rotate_button_pressed.png | Bin 0 -> 6388 bytes
 res/layout-xlarge-land/workspace_screen.xml   |  30 +++++++++++++++++++++++
 res/layout-xlarge-port/workspace_screen.xml   |  30 +++++++++++++++++++++++
 res/layout-xlarge/launcher.xml                |  34 ++++++++++++++++++++------
 res/layout-xlarge/workspace_screen.xml        |  30 -----------------------
 7 files changed, 106 insertions(+), 38 deletions(-)
 create mode 100644 res/drawable-xlarge/rotate_button.xml
 create mode 100644 res/drawable-xlarge/rotate_button_normal.png
 create mode 100644 res/drawable-xlarge/rotate_button_pressed.png
 create mode 100644 res/layout-xlarge-land/workspace_screen.xml
 create mode 100644 res/layout-xlarge-port/workspace_screen.xml
 delete mode 100644 res/layout-xlarge/workspace_screen.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/rotate_button.xml b/res/drawable-xlarge/rotate_button.xml
new file mode 100644
index 0000000..c29efa4
--- /dev/null
+++ b/res/drawable-xlarge/rotate_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/rotate_button_pressed" />
+    <item android:drawable="@drawable/rotate_button_normal" />
+</selector>
diff --git a/res/drawable-xlarge/rotate_button_normal.png b/res/drawable-xlarge/rotate_button_normal.png
new file mode 100644
index 0000000..fd014aa
Binary files /dev/null and b/res/drawable-xlarge/rotate_button_normal.png differ
diff --git a/res/drawable-xlarge/rotate_button_pressed.png b/res/drawable-xlarge/rotate_button_pressed.png
new file mode 100644
index 0000000..29fb8d9
Binary files /dev/null and b/res/drawable-xlarge/rotate_button_pressed.png differ
diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
new file mode 100644
index 0000000..15fc3b1
--- /dev/null
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.android.launcher2.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:hapticFeedbackEnabled="false"
+
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:yAxisStartPadding="40dip"
+    launcher:yAxisEndPadding="40dip"
+    launcher:xAxisStartPadding="256dip"
+    launcher:xAxisEndPadding="256dip" />
diff --git a/res/layout-xlarge-port/workspace_screen.xml b/res/layout-xlarge-port/workspace_screen.xml
new file mode 100644
index 0000000..eb7620c
--- /dev/null
+++ b/res/layout-xlarge-port/workspace_screen.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.android.launcher2.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:hapticFeedbackEnabled="false"
+
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:yAxisStartPadding="172dip"
+    launcher:yAxisEndPadding="172dip"
+    launcher:xAxisStartPadding="40dip"
+    launcher:xAxisEndPadding="40dip"/>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 6eb9318..a1879ef 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -36,7 +36,7 @@
         android:layout_height="match_parent"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
-        launcher:cellCountY="4">
+        launcher:cellCountY="7">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -45,21 +45,39 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
-        android:id="@+id/search_button"
+    <RelativeLayout
+        android:id="@+id/search_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/search_button"
+        android:layout_gravity="top|left">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/search_button"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
+        <ImageView
+            android:id="@+id/rotate_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/rotate_button"
+
+            android:onClick="onClickRotateButton"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_toRightOf="@id/search_button" />
+    </RelativeLayout>
 
-        android:onClick="onClickSearchButton"
-        android:focusable="true"
-        android:clickable="true"
-        android:layout_gravity="top|left"/>
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right">
+
         <ImageView
             android:id="@+id/configure_button"
             android:layout_width="wrap_content"
diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml
deleted file mode 100644
index 6a34975..0000000
--- a/res/layout-xlarge/workspace_screen.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.android.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="8dip"
-    launcher:yAxisEndPadding="8dip"
-    launcher:xAxisStartPadding="8dip"
-    launcher:xAxisEndPadding="8dip"/>
-- 
cgit v1.1


From 321e9ee68848d9e782fd557f69cc070308ffbc9c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 9 Aug 2010 13:37:56 -0700
Subject: Creating generic Workspace/CellLayout for paged views in Launcher.

Adding SimpleWorkspace, SimpleCellLayout and an AllApps implementation of the SimpleWorkspace.
Making SimpleWorkspace support content with smaller dimensions than the workspace dimensions
itself.  Temporary change to AllApps tabs styling until we get new assets for tabs in general.

Change-Id: Ibe3c56603223853d232816b6695e4ddd757857ba
---
 .../all_apps_paged_view_application.xml            | 29 ++++++++++++++++
 res/layout-xlarge/all_apps_tabbed.xml              | 39 ++++++++--------------
 res/values/attrs.xml                               |  9 +++++
 3 files changed, 51 insertions(+), 26 deletions(-)
 create mode 100644 res/layout-xlarge/all_apps_paged_view_application.xml

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
new file mode 100644
index 0000000..98c2737
--- /dev/null
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:id="@+id/name"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+
+    android:textColor="#FFFFFFFF"
+    android:shadowColor="#FF000000"
+    android:shadowDx="0.0"
+    android:shadowDy="1.0"
+
+    android:maxLines="2"
+    android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index 0842fd0..dbe192c 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -13,44 +13,31 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android">
+<com.android.launcher2.AllAppsTabbed
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="#30000000">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TabWidget
             android:id="@android:id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:tabStripEnabled="false"
+            android:paddingBottom="10dp" />
         <FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-
-            <com.android.launcher2.AllApps2D
-                android:id="@+id/all_apps_2d"
+            <com.android.launcher2.AllAppsPagedView
+                android:id="@+id/all_apps_paged_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="2dip">
-                <GridView android:id="@+id/all_apps_2d_grid"
-                    android:tag="all_apps_2d_grid"
-                    android:scrollbars="none"
-                    android:drawSelectorOnTop="false"
-                    android:listSelector="@drawable/grid_selector"
-                    android:verticalSpacing="10dip"
-                    android:numColumns="8"
-                    android:fadingEdgeLength="0dip"
-                    android:cacheColorHint="#00000000"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="8dip"
-                    android:layout_marginTop="8dip"
-                    android:nextFocusDown="@+id/all_apps_2d_home"
-                    android:nextFocusUp="@null"
-                    android:nextFocusLeft="@null"
-                    android:nextFocusRight="@null" />
-            </com.android.launcher2.AllApps2D>
+                cellCountX="8"
+                cellCountY="4">
+            </com.android.launcher2.AllAppsPagedView>
         </FrameLayout>
     </LinearLayout>
 </com.android.launcher2.AllAppsTabbed>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index be27288..09fb0da 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -55,6 +55,15 @@
         <attr name="yAxisEndPadding" format="dimension"  />
     </declare-styleable>
 
+    <!-- PagedView specific attributes. These attributes are used to customize
+         a PagedView view in XML files. -->
+    <declare-styleable name="PagedView">
+        <!-- The number of horizontal cells in a page -->
+        <attr name="cellCountX" />
+        <!-- The number of vertical cells in a page -->
+        <attr name="cellCountY" />
+    </declare-styleable>
+
     <!-- DeleteZone specific attributes. These attributes are used to customize
          a DeleteZone view in XML files. -->
     <declare-styleable name="DeleteZone">
-- 
cgit v1.1


From 80baf5a6b3c62a62265f626d43d1167783c94131 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 9 Aug 2010 16:03:15 -0700
Subject: Adding paging for the widget/shortcut/folder customization area and
 fixing bugs. Adding pages for customization drawer with initial
 implementation of proposed flow layout for widgets.  Fixes for keeping all
 apps, and widgets in sync with Launcher Model, optimizations for reloading
 all apps pages when invalidating.  Adding some animations for tab transitions
 and feedback when long pressing to add certain items.

Change-Id: I8d51749f3a91c964bed35681f3a9192200b0d93e
---
 res/anim/paged_view_click_feedback.xml             |  23 +++++++++++++++
 res/drawable/default_widget_preview.9.png          | Bin 541 -> 3976 bytes
 .../all_apps_paged_view_application.xml            |   3 +-
 res/layout-xlarge/customize_paged_view_item.xml    |  30 +++++++++++++++++++
 .../customize_paged_view_wallpaper_placeholder.xml |  32 +++++++++++++++++++++
 res/layout-xlarge/customize_paged_view_widget.xml  |  30 +++++++++++++++++++
 res/layout-xlarge/launcher.xml                     |  30 ++++++-------------
 7 files changed, 125 insertions(+), 23 deletions(-)
 create mode 100644 res/anim/paged_view_click_feedback.xml
 create mode 100644 res/layout-xlarge/customize_paged_view_item.xml
 create mode 100644 res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
 create mode 100644 res/layout-xlarge/customize_paged_view_widget.xml

(limited to 'res')

diff --git a/res/anim/paged_view_click_feedback.xml b/res/anim/paged_view_click_feedback.xml
new file mode 100644
index 0000000..786d974
--- /dev/null
+++ b/res/anim/paged_view_click_feedback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.65"
+    android:duration="100"
+    android:fillAfter="true"
+    android:repeatCount="1"
+    android:repeatMode="reverse" />
diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png
index e966b1b..b3ddada 100644
Binary files a/res/drawable/default_widget_preview.9.png and b/res/drawable/default_widget_preview.9.png differ
diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index 98c2737..7448765 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -18,12 +18,13 @@
     android:id="@+id/name"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
 
     android:textColor="#FFFFFFFF"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
+    android:shadowRadius="1.0"
 
     android:maxLines="2"
     android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml
new file mode 100644
index 0000000..7448765
--- /dev/null
+++ b/res/layout-xlarge/customize_paged_view_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:id="@+id/name"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+
+    android:textColor="#FFFFFFFF"
+    android:shadowColor="#FF000000"
+    android:shadowDx="0.0"
+    android:shadowDy="1.0"
+    android:shadowRadius="1.0"
+
+    android:maxLines="2"
+    android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
new file mode 100644
index 0000000..df73bcd
--- /dev/null
+++ b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:id="@+id/name"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+
+    android:textColor="#FFFFFFFF"
+    android:shadowColor="#FF000000"
+    android:shadowDx="0.0"
+    android:shadowDy="1.0"
+    android:shadowRadius="1.0"
+    android:drawableLeft="@drawable/ic_launcher_wallpaper"
+    android:drawablePadding="10dip"
+
+    android:maxLines="2"
+    android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
new file mode 100644
index 0000000..7448765
--- /dev/null
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:id="@+id/name"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+
+    android:textColor="#FFFFFFFF"
+    android:shadowColor="#FF000000"
+    android:shadowDx="0.0"
+    android:shadowDy="1.0"
+    android:shadowRadius="1.0"
+
+    android:maxLines="2"
+    android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index a1879ef..3e00381 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="500dip"
+        android:layout_height="550dip"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
@@ -112,38 +112,24 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="500dip"
+        android:layout_height="550dip"
         android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
+            android:background="#40000000"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <TabWidget
                 android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:tabStripEnabled="false"
+                android:paddingBottom="10dp" />
             <FrameLayout
                 android:id="@android:id/tabcontent"
-                android:background="#ff000000"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
-                <com.android.launcher2.WidgetChooser
-                    android:id="@+id/widget_chooser"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-                    <com.android.launcher2.FolderChooser
-                        android:id="@+id/folder_chooser"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-                    <com.android.launcher2.ShortcutChooser
-                        android:id="@+id/shortcut_chooser"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-                    <TextView
-                        android:id="@+id/wallpaperstab"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text="@string/wallpapers_temp_tab_text" />
              </FrameLayout>
           </LinearLayout>
     </TabHost>
-- 
cgit v1.1


From b2c838c2ebe8c05a5c031e6b202cb192f238ac38 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 16 Aug 2010 20:48:05 -0700
Subject: removed the temp screen rotation button

Change-Id: I26d5a840270065e43d4f66b3c53c7e9d52ce4200
---
 res/layout-xlarge/launcher.xml | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3e00381..8133853 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,32 +45,16 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <RelativeLayout
-        android:id="@+id/search_button_cluster"
+    <ImageView
+        android:id="@+id/search_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|left">
-
-        <ImageView
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/search_button"
-
-            android:onClick="onClickSearchButton"
-            android:focusable="true"
-            android:clickable="true"/>
-        <ImageView
-            android:id="@+id/rotate_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/rotate_button"
+        android:layout_gravity="top|left"
+        android:src="@drawable/search_button"
 
-            android:onClick="onClickRotateButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:layout_toRightOf="@id/search_button" />
-    </RelativeLayout>
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"/>
 
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
-- 
cgit v1.1


From 5bbc91bbbcba6cbcfff66b8d8dd510abb06bc076 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Wed, 18 Aug 2010 11:38:46 -0700
Subject: Add a default wallpaper for xlarge devices.

Change-Id: Icaf3fc953ca6d469d17620c0aec789e7f60c924e
---
 res/drawable-xlarge/wallpaper_leaf.jpg       | Bin 0 -> 938236 bytes
 res/drawable-xlarge/wallpaper_leaf_small.jpg | Bin 0 -> 21537 bytes
 res/values-xlarge/wallpapers.xml             |  22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 res/drawable-xlarge/wallpaper_leaf.jpg
 create mode 100644 res/drawable-xlarge/wallpaper_leaf_small.jpg
 create mode 100644 res/values-xlarge/wallpapers.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/wallpaper_leaf.jpg b/res/drawable-xlarge/wallpaper_leaf.jpg
new file mode 100644
index 0000000..afb0acc
Binary files /dev/null and b/res/drawable-xlarge/wallpaper_leaf.jpg differ
diff --git a/res/drawable-xlarge/wallpaper_leaf_small.jpg b/res/drawable-xlarge/wallpaper_leaf_small.jpg
new file mode 100644
index 0000000..48e9f3e
Binary files /dev/null and b/res/drawable-xlarge/wallpaper_leaf_small.jpg differ
diff --git a/res/values-xlarge/wallpapers.xml b/res/values-xlarge/wallpapers.xml
new file mode 100644
index 0000000..90a6af7
--- /dev/null
+++ b/res/values-xlarge/wallpapers.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2009 Google Inc.
+ *
+ * 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.
+ -->
+
+<resources>
+    <string-array name="wallpapers" translatable="false">
+        <item>wallpaper_leaf</item>
+    </string-array>
+</resources>
-- 
cgit v1.1


From fb5015dcccd2d43984e26f663bee82611ef27e0f Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 18 Aug 2010 16:26:33 -0700
Subject: Import Romansh translations.

Change-Id: Ib819d3f3673a8e941df24780db808cf82b146ab6
---
 res/values-rm/strings.xml | 85 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 res/values-rm/strings.xml

(limited to 'res')

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
new file mode 100644
index 0000000..505f7ca
--- /dev/null
+++ b/res/values-rm/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2008 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="application_name" msgid="8424725141379931883">"Lantschader"</string>
+    <string name="uid_name" msgid="3371120195364560632">"Applicaziuns da basa dad Android"</string>
+    <string name="folder_name" msgid="4588446541914685904">"Ordinatur"</string>
+    <string name="chooser_wallpaper" msgid="5988031014201479733">"Tscherner in fund davos"</string>
+    <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir in fund davos"</string>
+    <string name="pick_wallpaper" msgid="5630222540525626723">"Maletgs da fund davos"</string>
+    <string name="activity_not_found" msgid="3571057450431950427">"L\'applicaziun n\'è betg installada sin quest telefonin."</string>
+    <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar…"</string>
+    <!-- no translation found for widgets_tab_label (9145860100000983599) -->
+    <skip />
+    <!-- no translation found for folders_tab_label (1145293785541489736) -->
+    <skip />
+    <!-- no translation found for shortcuts_tab_label (3312788893569416806) -->
+    <skip />
+    <!-- no translation found for wallpapers_tab_label (1617804870364119879) -->
+    <skip />
+    <!-- no translation found for wallpapers_temp_tab_text (1660218201190495279) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <skip />
+    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <skip />
+    <string name="rename_folder_label" msgid="5646236631298452787">"Num da l\'ordinatur"</string>
+    <string name="rename_folder_title" msgid="4544573104191526550">"Renumnar l\'ordinatur"</string>
+    <string name="rename_action" msgid="6016003384693240896">"OK"</string>
+    <string name="cancel_action" msgid="3811860427489435048">"Interrumper"</string>
+    <string name="menu_item_add_item" msgid="6233177331075781114">"Agiuntar al visur da partenza"</string>
+    <string name="group_applications" msgid="4118484163419674240">"Applicaziuns"</string>
+    <string name="group_shortcuts" msgid="9133529424900391877">"Scursanidas"</string>
+    <string name="group_folder" msgid="5143593791798929193">"Nov ordinatur"</string>
+    <string name="group_live_folders" msgid="2664945399140647217">"Ordinatur"</string>
+    <string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
+    <string name="group_wallpapers" msgid="1568191644272224858">"Funds davos"</string>
+    <string name="add_folder" msgid="3521088587367839879">"Ordinatur"</string>
+    <string name="add_clock" msgid="2337943840175865746">"Ura"</string>
+    <string name="add_photo_frame" msgid="3154058437359487954">"Rom da maletgs"</string>
+    <string name="out_of_space" msgid="8365249326091984698">"Nagin spazi liber sin il visur da partenza."</string>
+    <string name="shortcut_installed" msgid="7071557296331322355">"Creà ina scursanida \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
+    <string name="shortcut_uninstalled" msgid="2129499669449749995">"La scursanida \"<xliff:g id="NAME">%s</xliff:g>\" è vegnida stizzada."</string>
+    <string name="shortcut_duplicate" msgid="4757756326465060694">"La scursanida \"<xliff:g id="NAME">%s</xliff:g>\" exista gia."</string>
+    <string name="title_select_shortcut" msgid="2858897527672831763">"Tscherner ina cumbinaziun da tastas"</string>
+    <string name="title_select_live_folder" msgid="3753447798805166749">"Tscherner l\'ordinatur"</string>
+    <string name="all_apps_button_label" msgid="3953036962111614813">"Tut las applicaziuns"</string>
+    <string name="all_apps_home_button_label" msgid="1022222300329398558">"Pagina da partenza"</string>
+    <string name="menu_add" msgid="3065046628354640854">"Agiuntar"</string>
+    <string name="menu_wallpaper" msgid="5837429080911269832">"Fund davos"</string>
+    <string name="menu_search" msgid="4826514464423239041">"Tschertgar"</string>
+    <string name="menu_notifications" msgid="6424587053194766192">"Avis"</string>
+    <string name="menu_gestures" msgid="514678675575912237">"Moviments"</string>
+    <string name="menu_settings" msgid="6233960148378443661">"Parameters"</string>
+    <string name="permlab_install_shortcut" msgid="1201690825493376489">"Installar scursanidas"</string>
+    <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Pussibilitescha ch\'ina applicaziun agiunta scursanidas senza l\'intervenziun da l\'utilisader."</string>
+    <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"deinstallar scursanidas"</string>
+    <string name="permdesc_uninstall_shortcut" msgid="959972195916090900">"Pussibilitescha ch\'ina applicaziun possia stizzar scursanidas senza ina intervenziun da l\'utilisader."</string>
+    <string name="permlab_read_settings" msgid="3452408290738106747">"Leger ils parameters e las scursanidas da la pagina da partenza"</string>
+    <string name="permdesc_read_settings" msgid="8377434937176025492">"Pussibilitescha ch\'ina applicaziun possia leger ils parameters e las scursanidas da la pagina da partenza."</string>
+    <string name="permlab_write_settings" msgid="1360567537236705628">"Definir ils parameters e las scursanidas per la pagina da partenza"</string>
+    <string name="permdesc_write_settings" msgid="1098648778383349818">"Pussibilitescha ch\'ina applicaziun possia midar ils parameters e las scursanidas sin la pagina da partenza."</string>
+    <string name="gadget_error_text" msgid="8359351016167075858">"Problems cun chargiar il widget"</string>
+</resources>
-- 
cgit v1.1


From 4ed6278e518cc6894cb150b606382e8e6a012599 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Tue, 17 Aug 2010 15:11:18 -0700
Subject: Implement button to get application info for an app shortcut.

For now, it's just a drag target like the delete zone. Once all apps
and the home screen support a selection mode, this (and delete) will
be implemented as buttons in the Contextual Action Bar.

Change-Id: I6bf43d03eefda672ea34c583a7021137da22b184
---
 res/drawable-xlarge/info_button.png | Bin 0 -> 1651 bytes
 res/layout-xlarge/launcher.xml      |  30 ++++++++++++++++++++++++------
 res/values-xlarge/colors.xml        |  21 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 res/drawable-xlarge/info_button.png
 create mode 100644 res/values-xlarge/colors.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/info_button.png b/res/drawable-xlarge/info_button.png
new file mode 100644
index 0000000..5080f6a
Binary files /dev/null and b/res/drawable-xlarge/info_button.png differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 8133853..4785b0c 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -63,34 +63,52 @@
         android:layout_gravity="top|right">
 
         <ImageView
-            android:id="@+id/configure_button"
+            android:id="@+id/all_apps_button"
+            android:src="@drawable/all_apps_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+
+            android:onClick="onClickAllAppsButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <ImageView
+            android:id="@+id/configure_button"
             android:src="@drawable/configure_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/all_apps_button"
 
             android:onClick="onClickConfigureButton"
             android:focusable="true"
             android:clickable="true" />
+
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/all_apps_button"
+            android:layout_alignTop="@id/all_apps_button"
             android:paddingTop="@dimen/delete_zone_padding"
 
             android:scaleType="center"
             android:src="@drawable/delete_zone_selector"
             android:visibility="gone"
             launcher:direction="horizontal" />
-        <ImageView
-            android:id="@+id/all_apps_button"
+
+        <com.android.launcher2.ApplicationInfoDropTarget
+            android:id="@+id/info_button"
+            android:src="@drawable/info_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/configure_button"
-            android:src="@drawable/all_apps_button"
+            android:layout_alignLeft="@id/configure_button"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
 
-            android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
+
     </RelativeLayout>
 
     <TabHost
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
new file mode 100644
index 0000000..a6cdd06
--- /dev/null
+++ b/res/values-xlarge/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2010, 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.
+*/
+-->
+<resources>
+    <color name="app_info_filter">#A50000FE</color>
+</resources>
\ No newline at end of file
-- 
cgit v1.1


From b3347bb9f4ccf41fb7043bca66c3a565bde1083b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 19 Aug 2010 14:51:28 -0700
Subject: Adding holographic outline for paged items (sans widgets). Fixing
 possible null ptr exception in Launcher.

Change-Id: Ie625a6503299cf122e5c22852846d59e66f77414
---
 res/layout-xlarge/all_apps_paged_view_application.xml            | 4 +++-
 res/layout-xlarge/customize_paged_view_item.xml                  | 4 +++-
 res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml | 2 ++
 res/layout-xlarge/customize_paged_view_widget.xml                | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index 7448765..55779e5 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -14,13 +14,15 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.PagedViewIcon xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/name"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
+    android:paddingTop="2dip"
 
     android:textColor="#FFFFFFFF"
+    android:textSize="14sp"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml
index 7448765..55779e5 100644
--- a/res/layout-xlarge/customize_paged_view_item.xml
+++ b/res/layout-xlarge/customize_paged_view_item.xml
@@ -14,13 +14,15 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.PagedViewIcon xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/name"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
+    android:paddingTop="2dip"
 
     android:textColor="#FFFFFFFF"
+    android:textSize="14sp"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
diff --git a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
index df73bcd..51f624a 100644
--- a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
+++ b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
@@ -19,8 +19,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
+    android:paddingTop="2dip"
 
     android:textColor="#FFFFFFFF"
+    android:textSize="14sp"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
index 7448765..da5342b 100644
--- a/res/layout-xlarge/customize_paged_view_widget.xml
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -19,8 +19,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
+    android:paddingTop="2dip"
 
     android:textColor="#FFFFFFFF"
+    android:textSize="14sp"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
-- 
cgit v1.1


From a63c452f5bd491ba9b28c332ccedc6c6c7e2f3cc Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 19 Aug 2010 13:52:27 -0700
Subject: added support for dragging widgets and app icons to mini screens

- gave mini screens a rounded rect background
- mini screens change color when dragged over
- added a way to specify the active region of dragged items, to allow for clipping of whitespace at borders
- fixed: feedback while dragging was often one cell off
- fixed: bug when adding to almost-full screen
- removed unused classes

Change-Id: I2fbd2aaaee6831b288cca8dec75e7b446068e8d1
---
 res/drawable-xlarge/mini_home_screen_bg.9.png       | Bin 0 -> 1851 bytes
 res/drawable-xlarge/mini_home_screen_bg_hover.9.png | Bin 0 -> 4940 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-xlarge/mini_home_screen_bg.9.png
 create mode 100644 res/drawable-xlarge/mini_home_screen_bg_hover.9.png

(limited to 'res')

diff --git a/res/drawable-xlarge/mini_home_screen_bg.9.png b/res/drawable-xlarge/mini_home_screen_bg.9.png
new file mode 100644
index 0000000..fd989c1
Binary files /dev/null and b/res/drawable-xlarge/mini_home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png
new file mode 100644
index 0000000..331ad54
Binary files /dev/null and b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png differ
-- 
cgit v1.1


From 6b509c1fd62a39916bb957eac07917161f549206 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 23 Aug 2010 15:08:16 -0700
Subject: Add a market button and add toolbar button animations.

Also clean up a lot of the animation code to be more centralized.
---
 res/drawable-xlarge/info_button.png    | Bin 1651 -> 2591 bytes
 res/drawable-xlarge/trashcan.png       | Bin 0 -> 3087 bytes
 res/drawable-xlarge/trashcan_hover.png | Bin 0 -> 4892 bytes
 res/layout-xlarge/launcher.xml         |  49 ++++++++++++++++++++-------------
 res/values-xlarge/config.xml           |  20 ++++++++++----
 res/values-xlarge/dimens.xml           |   5 ++--
 6 files changed, 47 insertions(+), 27 deletions(-)
 create mode 100644 res/drawable-xlarge/trashcan.png
 create mode 100644 res/drawable-xlarge/trashcan_hover.png

(limited to 'res')

diff --git a/res/drawable-xlarge/info_button.png b/res/drawable-xlarge/info_button.png
index 5080f6a..e3b27f4 100644
Binary files a/res/drawable-xlarge/info_button.png and b/res/drawable-xlarge/info_button.png differ
diff --git a/res/drawable-xlarge/trashcan.png b/res/drawable-xlarge/trashcan.png
new file mode 100644
index 0000000..284543c
Binary files /dev/null and b/res/drawable-xlarge/trashcan.png differ
diff --git a/res/drawable-xlarge/trashcan_hover.png b/res/drawable-xlarge/trashcan_hover.png
new file mode 100644
index 0000000..38695cd
Binary files /dev/null and b/res/drawable-xlarge/trashcan_hover.png differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 4785b0c..3add911 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,22 +45,23 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
-        android:id="@+id/search_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|left"
-        android:src="@drawable/search_button"
-
-        android:onClick="onClickSearchButton"
-        android:focusable="true"
-        android:clickable="true"/>
-
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|right">
+        android:layout_gravity="top"
+        android:padding="@dimen/toolbar_padding">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:src="@drawable/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
 
         <ImageView
             android:id="@+id/all_apps_button"
@@ -68,17 +69,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
 
+        <!-- The button to bring up the installed app market.
+             The icon for this button will be dynamically set. -->
+        <ImageView
+            android:id="@+id/market_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone"/>
+
         <ImageView
             android:id="@+id/configure_button"
             android:src="@drawable/configure_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/all_apps_button"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickConfigureButton"
             android:focusable="true"
@@ -86,14 +101,11 @@
 
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
+            android:src="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/all_apps_button"
-            android:layout_alignTop="@id/all_apps_button"
-            android:paddingTop="@dimen/delete_zone_padding"
 
-            android:scaleType="center"
-            android:src="@drawable/delete_zone_selector"
             android:visibility="gone"
             launcher:direction="horizontal" />
 
@@ -103,9 +115,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/configure_button"
-            android:layout_centerVertical="true"
-            android:visibility="gone"
 
+            android:visibility="gone"
             android:focusable="true"
             android:clickable="true" />
 
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 1a9ecc6..9b1bc0d 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -1,4 +1,6 @@
 <resources>
+    <!--  NOTE: Many of the all apps values here are also used for the customization drawer -->
+
     <!-- Duration in milliseconds of the all apps zoom-in animation. -->
     <!-- NB: This should be less than the workspaceShrinkTime as they happen together. -->
     <integer name="config_allAppsZoomInTime">350</integer>
@@ -10,12 +12,18 @@
     <!-- Scaling factor used in the all apps zooming animations -->
     <integer name="config_allAppsZoomScaleFactor">5</integer>
 
-    <!-- Duration in milliseconds of the camera pan animation b/w all apps & customize -->
-    <integer name="config_allAppsCameraPanTime">700</integer>
+    <!-- The extra distance off-screen that all apps appears from -->
+    <integer name="config_allAppsVerticalOffset">200</integer>
 
-    <!-- Duration in milliseconds of the workspace shrink animation -->
+    <!-- Duration in milliseconds of the animations between all apps, customize, & home.
+         NOTE: If these are changed, the toolbar animation times below should also be. -->
+    <integer name="config_allAppsCameraPanTime">700</integer>
     <integer name="config_workspaceShrinkTime">700</integer>
-
-    <!-- Duration in milliseconds of the workspace unshrink animation -->
     <integer name="config_workspaceUnshrinkTime">700</integer>
-</resources>
\ No newline at end of file
+
+    <!-- Duration in milliseconds toolbar fade in and fade out animations.
+         NOTE: Fade in and fade out time should together be less the transition
+         animations between all apps, customize, & the workspace. -->
+    <integer name="config_toolbarButtonFadeInTime">350</integer>
+    <integer name="config_toolbarButtonFadeOutTime">350</integer>
+</resources>
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index c9bd836..1010390 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -25,6 +25,7 @@
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
     <dimen name="smallScreenVerticalMargin">20dip</dimen>
 
-    <!-- padding above the delete zone -->
-    <dimen name="delete_zone_padding">6dip</dimen>
+    <dimen name="toolbar_padding">10dip</dimen>
+
+    <dimen name="toolbar_button_spacing">20dip</dimen>
 </resources>
-- 
cgit v1.1


From ceae05d573255a0143981888e5d257b5891e3925 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 30 Aug 2010 10:40:53 -0700
Subject: Add a market button to the toolbar.

We determine the default app market activity by resolving an intent,
and fetch the icon from the activity's meta-data.
---
 res/drawable-xlarge/app_market_generic.png | Bin 0 -> 2750 bytes
 res/layout-xlarge/launcher.xml             |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 res/drawable-xlarge/app_market_generic.png

(limited to 'res')

diff --git a/res/drawable-xlarge/app_market_generic.png b/res/drawable-xlarge/app_market_generic.png
new file mode 100644
index 0000000..0ceaeef
Binary files /dev/null and b/res/drawable-xlarge/app_market_generic.png differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3add911..3b39fd1 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -83,6 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/all_apps_button"
 
+            android:onClick="onClickAppMarketButton"
             android:focusable="false"
             android:clickable="false"
             android:visibility="gone"/>
-- 
cgit v1.1


From 39670182be72e981cc7c26d9099f6e9636d27411 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Fri, 3 Sep 2010 16:25:12 -0700
Subject: For now, just show a toast when user tries to delete a system app.

---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a704f8..392584c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -168,4 +168,6 @@
     <string name="default_browser_url" translatable="false">
         http://www.google.com/m?client=ms-{CID}&amp;source=android-home-hotseat</string>
 
+    <!--  Text to inform the user that they can't uninstall a system application -->
+    <string name="uninstall_system_app_text">This is a system application and cannot be uninstalled.</string>
 </resources>
-- 
cgit v1.1


From 9f7aec8d4317d0407a41e12f236c962b225cb4c3 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 6 Sep 2010 11:03:37 -0700
Subject: Implement selection mode for All Apps with delete and info actions.

---
 res/drawable-xlarge/info_button.png    | Bin 2591 -> 2315 bytes
 res/drawable-xlarge/trashcan.png       | Bin 3087 -> 2516 bytes
 res/drawable-xlarge/trashcan_hover.png | Bin 4892 -> 3582 bytes
 res/layout-xlarge/all_apps_tabbed.xml  |   3 ++-
 res/layout-xlarge/launcher.xml         |  18 +++++++++---------
 res/values-xlarge/styles.xml           |   5 +++++
 res/values/strings.xml                 |  11 +++++++++++
 res/values/styles.xml                  |   5 ++++-
 8 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'res')

diff --git a/res/drawable-xlarge/info_button.png b/res/drawable-xlarge/info_button.png
index e3b27f4..253cdf7 100644
Binary files a/res/drawable-xlarge/info_button.png and b/res/drawable-xlarge/info_button.png differ
diff --git a/res/drawable-xlarge/trashcan.png b/res/drawable-xlarge/trashcan.png
index 284543c..22134b4 100644
Binary files a/res/drawable-xlarge/trashcan.png and b/res/drawable-xlarge/trashcan.png differ
diff --git a/res/drawable-xlarge/trashcan_hover.png b/res/drawable-xlarge/trashcan_hover.png
index 38695cd..3ac6922 100644
Binary files a/res/drawable-xlarge/trashcan_hover.png and b/res/drawable-xlarge/trashcan_hover.png differ
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index dbe192c..5a43361 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -15,7 +15,8 @@
 -->
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="#30000000">
+    android:background="#30000000"
+    android:paddingTop="?android:attr/windowActionBarSize">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3b39fd1..7018b3e 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -34,6 +34,7 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingTop="?android:attr/windowActionBarSize"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7">
@@ -48,15 +49,14 @@
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:padding="@dimen/toolbar_padding">
+        android:layout_height="?android:attr/windowActionBarSize"
+        android:layout_gravity="top">
 
         <ImageView
             android:id="@+id/search_button"
             android:src="@drawable/search_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="left"
 
             android:onClick="onClickSearchButton"
@@ -67,7 +67,7 @@
             android:id="@+id/all_apps_button"
             android:src="@drawable/all_apps_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
@@ -80,7 +80,7 @@
         <ImageView
             android:id="@+id/market_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignLeft="@id/all_apps_button"
 
             android:onClick="onClickAppMarketButton"
@@ -92,7 +92,7 @@
             android:id="@+id/configure_button"
             android:src="@drawable/configure_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@id/all_apps_button"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
@@ -104,7 +104,7 @@
             android:id="@+id/delete_zone"
             android:src="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignLeft="@id/all_apps_button"
 
             android:visibility="gone"
@@ -114,7 +114,7 @@
             android:id="@+id/info_button"
             android:src="@drawable/info_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignLeft="@id/configure_button"
 
             android:visibility="gone"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index e4c047f..637b6ce 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -18,6 +18,11 @@
 -->
 
 <resources>
+    <style name="Theme" parent="Theme.Base">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionModeOverlay">true</item>
+    </style>
+
     <style name="WorkspaceIcon.Portrait">
         <item name="android:drawablePadding">4dip</item>
         <item name="android:paddingTop">1dip</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 392584c..a009863 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -133,6 +133,17 @@
     <!-- Noun, menu item used to show the system settings -->
     <string name="menu_settings">Settings</string>
 
+    <!--  Strings for the contextual action bar (CAB) in All Apps -->
+    <skip />
+    <!-- Describes the button for uninstalling the currently selected application.
+         Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] -->
+    <string name="cab_menu_delete_app">Uninstall application</string>
+    <!-- Describes the button for getting details/info about currently selected application.
+         Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] -->
+    <string name="cab_menu_app_info">Application details</string>
+    <!-- Appears in the CAB when an app is selected in All Apps. [CHAR_LIMIT=50] -->
+    <string name="cab_selection_text">1 application selected</string>
+
     <!-- Permissions: -->
     <skip />
     <!-- Permission short label -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c208211..a97b3c5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,7 +18,10 @@
 -->
 
 <resources>
-    <style name="Theme" parent="android:Theme.Wallpaper">
+    <style name="Theme.Base" parent="android:Theme.Wallpaper">
+    </style>
+
+    <style name="Theme" parent="Theme.Base">
         <item name="android:windowNoTitle">true</item>
     </style>
 
-- 
cgit v1.1


From 031e10649ac2d511b8f9fbe1177f852c78f86289 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 8 Sep 2010 14:30:17 -0700
Subject: Add CHAR_LIMIT to strings.

---
 res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a009863..3c1b79c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,13 +56,13 @@
     <!--  Placeholder text, will be removed -->
     <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
     <!--  Labels for the tabs in All Apps -->
-    <!--  Title of the tab for all applications (includes games and non-games) -->
+    <!--  Title of the tab for all applications (includes games and non-games) [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_all">All</string>
-    <!--  Title of the tab for all applications *except* games -->
+    <!--  Title of the tab for all applications *except* games [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_apps">Apps</string>
-    <!--  Title of the tab for applications labeled as games -->
+    <!--  Title of the tab for applications labeled as games [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_games">Games</string>
-    <!--  Tile of the tab for applications that were downloaded from market -->
+    <!--  Tile of the tab for applications that were downloaded from market [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_downloaded">Downloaded</string>
 
     <!-- Folders -->
-- 
cgit v1.1


From 5aa323f3c9cc8580335f5594ea8900fe33c00fbc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 8 Sep 2010 12:05:15 -0700
Subject: Updating assets for toolbar buttons, setting new default wallpaper.

Fixing small namespace issue where PagedView attributes weren't actually being respected.

Change-Id: Id260fae6278b616b446da1ce04ec18b11ed0bf45
---
 res/drawable-xlarge/all_apps_button_normal.png   | Bin 3713 -> 698 bytes
 res/drawable-xlarge/all_apps_button_pressed.png  | Bin 3467 -> 3606 bytes
 res/drawable-xlarge/configure_button_normal.png  | Bin 4228 -> 416 bytes
 res/drawable-xlarge/configure_button_pressed.png | Bin 3718 -> 2748 bytes
 res/drawable-xlarge/glow_wallpaper.png           | Bin 0 -> 782067 bytes
 res/drawable-xlarge/glow_wallpaper_small.png     | Bin 0 -> 11585 bytes
 res/drawable-xlarge/search_button_normal.png     | Bin 6234 -> 1067 bytes
 res/drawable-xlarge/search_button_pressed.png    | Bin 5798 -> 3706 bytes
 res/drawable-xlarge/trashcan.png                 | Bin 2516 -> 906 bytes
 res/drawable-xlarge/trashcan_hover.png           | Bin 3582 -> 542 bytes
 res/layout-xlarge/all_apps_tabbed.xml            |   5 +++--
 res/layout-xlarge/launcher.xml                   |   2 ++
 res/values-xlarge/wallpapers.xml                 |   2 +-
 13 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 res/drawable-xlarge/glow_wallpaper.png
 create mode 100644 res/drawable-xlarge/glow_wallpaper_small.png

(limited to 'res')

diff --git a/res/drawable-xlarge/all_apps_button_normal.png b/res/drawable-xlarge/all_apps_button_normal.png
index 095ce63..e1c8b7d 100644
Binary files a/res/drawable-xlarge/all_apps_button_normal.png and b/res/drawable-xlarge/all_apps_button_normal.png differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.png b/res/drawable-xlarge/all_apps_button_pressed.png
index 50e4735..9dcfaa5 100644
Binary files a/res/drawable-xlarge/all_apps_button_pressed.png and b/res/drawable-xlarge/all_apps_button_pressed.png differ
diff --git a/res/drawable-xlarge/configure_button_normal.png b/res/drawable-xlarge/configure_button_normal.png
index 066f492..b11c2a8 100644
Binary files a/res/drawable-xlarge/configure_button_normal.png and b/res/drawable-xlarge/configure_button_normal.png differ
diff --git a/res/drawable-xlarge/configure_button_pressed.png b/res/drawable-xlarge/configure_button_pressed.png
index 536ed7c..70db9b7 100644
Binary files a/res/drawable-xlarge/configure_button_pressed.png and b/res/drawable-xlarge/configure_button_pressed.png differ
diff --git a/res/drawable-xlarge/glow_wallpaper.png b/res/drawable-xlarge/glow_wallpaper.png
new file mode 100644
index 0000000..eb29449
Binary files /dev/null and b/res/drawable-xlarge/glow_wallpaper.png differ
diff --git a/res/drawable-xlarge/glow_wallpaper_small.png b/res/drawable-xlarge/glow_wallpaper_small.png
new file mode 100644
index 0000000..f83fc60
Binary files /dev/null and b/res/drawable-xlarge/glow_wallpaper_small.png differ
diff --git a/res/drawable-xlarge/search_button_normal.png b/res/drawable-xlarge/search_button_normal.png
index 3a3045a..b172074 100644
Binary files a/res/drawable-xlarge/search_button_normal.png and b/res/drawable-xlarge/search_button_normal.png differ
diff --git a/res/drawable-xlarge/search_button_pressed.png b/res/drawable-xlarge/search_button_pressed.png
index 8ae6b16..c2926c8 100644
Binary files a/res/drawable-xlarge/search_button_pressed.png and b/res/drawable-xlarge/search_button_pressed.png differ
diff --git a/res/drawable-xlarge/trashcan.png b/res/drawable-xlarge/trashcan.png
index 22134b4..839d4b8 100644
Binary files a/res/drawable-xlarge/trashcan.png and b/res/drawable-xlarge/trashcan.png differ
diff --git a/res/drawable-xlarge/trashcan_hover.png b/res/drawable-xlarge/trashcan_hover.png
index 3ac6922..cc2fde7 100644
Binary files a/res/drawable-xlarge/trashcan_hover.png and b/res/drawable-xlarge/trashcan_hover.png differ
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index 5a43361..10d99a0 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -15,6 +15,7 @@
 -->
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
     android:background="#30000000"
     android:paddingTop="?android:attr/windowActionBarSize">
     <LinearLayout
@@ -36,8 +37,8 @@
                 android:id="@+id/all_apps_paged_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                cellCountX="8"
-                cellCountY="4">
+                launcher:cellCountX="7"
+                launcher:cellCountY="4">
             </com.android.launcher2.AllAppsPagedView>
         </FrameLayout>
     </LinearLayout>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 7018b3e..3e13933 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -58,6 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="left"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickSearchButton"
             android:focusable="true"
@@ -70,6 +71,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
diff --git a/res/values-xlarge/wallpapers.xml b/res/values-xlarge/wallpapers.xml
index 90a6af7..f22654d 100644
--- a/res/values-xlarge/wallpapers.xml
+++ b/res/values-xlarge/wallpapers.xml
@@ -17,6 +17,6 @@
 
 <resources>
     <string-array name="wallpapers" translatable="false">
-        <item>wallpaper_leaf</item>
+        <item>glow_wallpaper</item>
     </string-array>
 </resources>
-- 
cgit v1.1


From a985e598f6071f4caca15ba3cb6b2cd3e38b217d Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 9 Sep 2010 11:23:48 -0700
Subject: Applying fake perspective transform to the home screen previews

Change-Id: I2092fd963804eceaf0117bcb6d118d83e0da3573
---
 res/values-xlarge/dimens.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 1010390..9c65897 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -18,9 +18,9 @@
     <dimen name="workspace_cell_width">76dip</dimen>
     <dimen name="workspace_cell_height">76dip</dimen>
 
-    <!-- horizontal spacing between mini screen thumbnails ie. in all
+    <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
-    <dimen name="smallScreenSpacing">10dip</dimen>
+    <dimen name="smallScreenExtraSpacing">0dip</dimen>
 
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
     <dimen name="smallScreenVerticalMargin">20dip</dimen>
-- 
cgit v1.1


From 4347705a09dc0de776073a2500cb3d695aee1b79 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 9 Sep 2010 12:09:25 -0700
Subject: making mini screen backgrounds dark, and temporarily disabling dimmed
 items on mini screens to work better with new dark wallpaper

---
 res/drawable-xlarge/mini_home_screen_bg.9.png       | Bin 1851 -> 7288 bytes
 res/drawable-xlarge/mini_home_screen_bg_hover.9.png | Bin 4940 -> 7069 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'res')

diff --git a/res/drawable-xlarge/mini_home_screen_bg.9.png b/res/drawable-xlarge/mini_home_screen_bg.9.png
index fd989c1..ecbbcb4 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg.9.png and b/res/drawable-xlarge/mini_home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png
index 331ad54..48af564 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png and b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png differ
-- 
cgit v1.1


From 201058d9c9866f3328291e495bcdfbeebe76d632 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 9 Sep 2010 17:57:26 -0700
Subject: Updated for framework changes in ActionBar style attributes

Change-Id: I8e9050a784b4b20398309e6d279ab17652a29ade
---
 res/layout-xlarge/all_apps_tabbed.xml | 2 +-
 res/layout-xlarge/launcher.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index 10d99a0..5aca954 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -17,7 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
     android:background="#30000000"
-    android:paddingTop="?android:attr/windowActionBarSize">
+    android:paddingTop="?android:attr/actionBarSize">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3e13933..a3c7558 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -34,7 +34,7 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="?android:attr/windowActionBarSize"
+        android:paddingTop="?android:attr/actionBarSize"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7">
@@ -49,7 +49,7 @@
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="fill_parent"
-        android:layout_height="?android:attr/windowActionBarSize"
+        android:layout_height="?android:attr/actionBarSize"
         android:layout_gravity="top">
 
         <ImageView
-- 
cgit v1.1


From 9d927315f0ee72bfa556868321be662c8b8ef012 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 10 Sep 2010 15:45:11 -0700
Subject: Import revised translations.

Change-Id: I79529f0bed3e5318b9d9a49da801ed1e6072bbda
---
 res/values-cs/strings.xml     | 8 ++++++++
 res/values-da/strings.xml     | 8 ++++++++
 res/values-de/strings.xml     | 8 ++++++++
 res/values-el/strings.xml     | 8 ++++++++
 res/values-es-rUS/strings.xml | 8 ++++++++
 res/values-es/strings.xml     | 8 ++++++++
 res/values-fr/strings.xml     | 8 ++++++++
 res/values-it/strings.xml     | 8 ++++++++
 res/values-ja/strings.xml     | 8 ++++++++
 res/values-ko/strings.xml     | 8 ++++++++
 res/values-nb/strings.xml     | 8 ++++++++
 res/values-nl/strings.xml     | 8 ++++++++
 res/values-pl/strings.xml     | 8 ++++++++
 res/values-pt-rPT/strings.xml | 8 ++++++++
 res/values-pt/strings.xml     | 8 ++++++++
 res/values-rm/strings.xml     | 8 ++++++++
 res/values-ru/strings.xml     | 8 ++++++++
 res/values-sv/strings.xml     | 8 ++++++++
 res/values-tr/strings.xml     | 8 ++++++++
 res/values-zh-rCN/strings.xml | 8 ++++++++
 res/values-zh-rTW/strings.xml | 8 ++++++++
 21 files changed, 168 insertions(+)

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 011ea1e..c091034 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Oznámení"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesta"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Nastavení"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalovat zástupce"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Povoluje aplikaci přidat zástupce bez zásahu uživatele."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"odinstalovat zástupce"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načtením widgetu"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 08ebc63..045b834 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Meddelelser"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestus"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Indstillinger"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installer genveje"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Tillader, at et program tilføjer genveje uden brugerindgriben."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"afinstaller genveje"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriv indstillinger og genveje for Start"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillader, at et program ændrer indstillingerne og genvejene i Start."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Der er problemer med indlæsning af widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e512dc5..a3367d2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Benachrichtigungen"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Bewegungen"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Einstellungen"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"Verknüpfungen installieren"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Ermöglicht einer Anwendung das Hinzufügen von Verknüpfungen ohne Eingriff des Nutzers."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"Verknüpfungen deinstallieren"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index eb8097f..609a193 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Ειδοποιήσεις"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Χειρονομίες"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ρυθμίσεις"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"εγκατάσταση συντομεύσεων"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Επιτρέπει σε μια εφαρμογή την προσθήκη συντομεύσεων χωρίς την παρέμβαση του χρήστη."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"κατάργηση εγκατάστασης συντομεύσεων"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Επιτρέπει σε μια εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5a40e3a..4f8b890 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Configuración"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite a una aplicación agregar accesos directos sin intervención del usuario."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar papel tapiz"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir configuración y accesos directos de la página principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9772526..f6c5cf7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ajustes"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que una aplicación añada accesos directos sin intervención del usuario."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar accesos directos"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir información de accesos directos y de configuración del escritorio"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que una aplicación modifique la configuración y los accesos directos de la página de inicio."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6d2d638..f1339fd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notifications"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestes"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Paramètres"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installer des raccourcis"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permet à une application d\'ajouter des raccourcis sans l\'intervention de l\'utilisateur."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"désinstaller les raccourcis"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problème lors du chargement du widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f3fffbe3..fa2624b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notifiche"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesti"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Impostazioni"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"aggiungere scorciatorie"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Consente a un\'applicazione di aggiungere scorciatoie automaticamente."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"eliminare scorciatoie"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"creare impostazioni e scorciatoie in Home"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Consente a un\'applicazione di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Errore durante il caricamento del widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 70e7852..09b23b7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"ジェスチャー"</string>
     <string name="menu_settings" msgid="6233960148378443661">"設定"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"ショートカットのインストール"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"ユーザー操作なしでショートカットの追加をアプリケーションに許可します。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"ショートカットのアンインストール"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5c99a17..b943f1c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"알림"</string>
     <string name="menu_gestures" msgid="514678675575912237">"동작"</string>
     <string name="menu_settings" msgid="6233960148378443661">"설정"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"바로가기 설치"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"애플리케이션이 사용자의 작업 없이 바로가기를 추가할 수 있도록 합니다."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"바로가기 제거"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"홈 설정 및 바로가기 쓰기"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"애플리케이션이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"위젯을 로드하는 중 문제가 발생했습니다."</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index aa24d7a..74ace88 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Varslinger"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Bevegelser"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Innstillinger"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installere snarveier"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Lar applikasjonen legge til snarveier uten å involvere brukeren."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"avinstallere snarveier"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skrive skrivebordsinnstillinger og -snarveier"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Lar applikasjonen endre innstillinger og snarveier på skrivebordet."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0777dea..42608e0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Meldingen"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gebaren"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Instellingen"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"snelkoppelingen installeren"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Een toepassing toestaan om snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"snelkoppelingen verwijderen"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"instellingen en snelkoppelingen voor de startpagina schrijven"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 33a9da7..ea51842 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Powiadomienia"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesty"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ustawienia"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"zainstaluj skróty"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Umożliwia aplikacji dodawanie skrótów bez interwencji użytkownika."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"odinstaluj skróty"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"zapisywanie ustawień i skrótów strony głównej"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem podczas ładowania widżetu"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index bdee633..b2d6c65 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Definições"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que uma aplicação adicione atalhos sem a intervenção do utilizador."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escrever definições e atalhos do ecrã principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que uma aplicação altere as definições e os atalhos do ecrã principal."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Erro ao carregar o widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1386d35..f3a7757 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Configurações"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que um aplicativo adicione os atalhos sem a intervenção do usuário."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que um aplicativo altere as configurações e atalhos na Página inicial."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 505f7ca..90a156b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -73,6 +73,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Avis"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Moviments"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Parameters"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"Installar scursanidas"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Pussibilitescha ch\'ina applicaziun agiunta scursanidas senza l\'intervenziun da l\'utilisader."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"deinstallar scursanidas"</string>
@@ -82,4 +88,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Definir ils parameters e las scursanidas per la pagina da partenza"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Pussibilitescha ch\'ina applicaziun possia midar ils parameters e las scursanidas sin la pagina da partenza."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problems cun chargiar il widget"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 60e93de..486c6d4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Жесты"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Настройки"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"устанавливать ярлыки"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Позволяет приложению добавлять ярлыки без вмешательства пользователя"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"удалять ярлыки"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"изменять настройки и ярлыки главного экрана"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f27c401..09258a9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Aviseringar"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gester"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Inställningar"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installera genvägar"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Tillåter att ett program lägger till genvägar utan åtgärd från användaren."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"avinstallera genvägar"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriva inställningar och genvägar för startsidan"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillåter att ett program ändrar inställningar och genvägar på startsidan."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Det gick inte att läsa in widgeten"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 689c186..e6922a5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Bildirimler"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Hareketler"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ayarlar"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"kısayolları yükle"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Bir uygulamaya, kısayolları kullanıcı müdahale etmeden ekleme izni verir."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"kısayolları kaldır"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Ana Sayfa ayarlarını ve kısayollarını yaz"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 15543bc..b1508dd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"手势"</string>
     <string name="menu_settings" msgid="6233960148378443661">"设置"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"安装快捷方式"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"允许应用程序在没有用户介入的情况下添加快捷方式。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"卸载快捷方式"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕的设置和快捷方式"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允许应用程序更改主屏幕的设置和快捷方式。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0467f3b..18cbfcb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -68,6 +68,12 @@
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"觸控動作"</string>
     <string name="menu_settings" msgid="6233960148378443661">"設定"</string>
+    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
+    <skip />
+    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
+    <skip />
+    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"安裝捷徑"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"允許應用程式自動新增快速鍵。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"解除安裝捷徑"</string>
@@ -77,4 +83,6 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"寫入首頁設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允許應用程式變更首頁中的設定和捷徑。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string>
+    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
+    <skip />
 </resources>
-- 
cgit v1.1


From 7f3f956bbb6c5c1775c72220d993248f66cbbfd5 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Sun, 12 Sep 2010 12:15:10 -0700
Subject: Remove unnecessary files.

Change-Id: I155aa203d5834569a99eaef439096178f9fb86bd
---
 res/drawable-xlarge/wallpaper_leaf.jpg       | Bin 938236 -> 0 bytes
 res/drawable-xlarge/wallpaper_leaf_small.jpg | Bin 21537 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 res/drawable-xlarge/wallpaper_leaf.jpg
 delete mode 100644 res/drawable-xlarge/wallpaper_leaf_small.jpg

(limited to 'res')

diff --git a/res/drawable-xlarge/wallpaper_leaf.jpg b/res/drawable-xlarge/wallpaper_leaf.jpg
deleted file mode 100644
index afb0acc..0000000
Binary files a/res/drawable-xlarge/wallpaper_leaf.jpg and /dev/null differ
diff --git a/res/drawable-xlarge/wallpaper_leaf_small.jpg b/res/drawable-xlarge/wallpaper_leaf_small.jpg
deleted file mode 100644
index 48e9f3e..0000000
Binary files a/res/drawable-xlarge/wallpaper_leaf_small.jpg and /dev/null differ
-- 
cgit v1.1


From 5f1c509d5ad1954a7e38e77db4d5f27c7345fd39 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 3 Sep 2010 14:15:02 -0700
Subject: supporting swipable home screens on xlarge devices

- icons and widgets on home screens can be "dimmed"
- celllayout no longer renders a dimmed version of itself, but instead its children make dimmed versions of themselves
- celllayout no longer always takes up full size of workspace, in landscape mode
neighboring screens (celllayouts) are visible
- on xlarge devices, in landscape mode side screens are "dimmed"
- moved holographic outline helper to its own file
- fixed bug where mini-screens were still able to scroll left/right

Change-Id: I9e85ab4147edfae1e7525c3d11d42be3fabf4f6d
---
 res/layout-land/application.xml             | 4 ++--
 res/layout-port/application.xml             | 2 +-
 res/layout-xlarge-land/workspace_screen.xml | 8 ++++----
 res/layout-xlarge-port/workspace_screen.xml | 8 ++++----
 res/values-xlarge/colors.xml                | 1 +
 5 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'res')

diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 6de5658..846c81c 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- 	style="@style/WorkspaceIcon.Landscape" />
+<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+   style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index f904a66..ec66976 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
  	style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
index 15fc3b1..f358443 100644
--- a/res/layout-xlarge-land/workspace_screen.xml
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -18,13 +18,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:hapticFeedbackEnabled="false"
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
     launcher:yAxisStartPadding="40dip"
     launcher:yAxisEndPadding="40dip"
-    launcher:xAxisStartPadding="256dip"
-    launcher:xAxisEndPadding="256dip" />
+    launcher:xAxisStartPadding="40dip"
+    launcher:xAxisEndPadding="40dip" />
diff --git a/res/layout-xlarge-port/workspace_screen.xml b/res/layout-xlarge-port/workspace_screen.xml
index eb7620c..7314e60 100644
--- a/res/layout-xlarge-port/workspace_screen.xml
+++ b/res/layout-xlarge-port/workspace_screen.xml
@@ -18,13 +18,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:hapticFeedbackEnabled="false"
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="172dip"
-    launcher:yAxisEndPadding="172dip"
+    launcher:yAxisStartPadding="40dip"
+    launcher:yAxisEndPadding="40dip"
     launcher:xAxisStartPadding="40dip"
     launcher:xAxisEndPadding="40dip"/>
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index a6cdd06..d4c6fad 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -18,4 +18,5 @@
 -->
 <resources>
     <color name="app_info_filter">#A50000FE</color>
+    <color name="dimmed_view_color">#FF7F7F7F</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.1


From 1ff706b8c03063740ca74868fea46fa47d71bb27 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 14 Sep 2010 17:35:20 -0700
Subject: fix two crashes

* fix crash where Workspace gets an ACTION_MOVE
but didn't get the ACTION_DOWN before it
* fix crash in DimmableBubbleTextView on
non-xlarge devices (buganizer bug#3001211)

Change-Id: I419b4a9fd3c95df9949f1d46746845ad2dc4b831
---
 res/layout-land/application.xml        |  2 +-
 res/layout-port/application.xml        |  8 ++++----
 res/layout-xlarge-land/application.xml | 18 ++++++++++++++++++
 res/layout-xlarge-port/application.xml | 18 ++++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 res/layout-xlarge-land/application.xml
 create mode 100644 res/layout-xlarge-port/application.xml

(limited to 'res')

diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 846c81c..6e8c31e 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index ec66976..32c1510 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -4,9 +4,9 @@
      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.
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- 	style="@style/WorkspaceIcon.Portrait" />
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+   style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-xlarge-land/application.xml b/res/layout-xlarge-land/application.xml
new file mode 100644
index 0000000..d0c8d9b
--- /dev/null
+++ b/res/layout-xlarge-land/application.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+   style="@style/WorkspaceIcon.Landscape" />
\ No newline at end of file
diff --git a/res/layout-xlarge-port/application.xml b/res/layout-xlarge-port/application.xml
new file mode 100644
index 0000000..ec66976
--- /dev/null
+++ b/res/layout-xlarge-port/application.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ 	style="@style/WorkspaceIcon.Portrait" />
-- 
cgit v1.1


From e3193b93ad7bf33e2e45319084a99b9fc986622b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 10 Sep 2010 11:44:42 -0700
Subject: Initital changes for new customization drawer/widget tab design.

Change-Id: I160c8777fe2657ab303acfa20934f2e90f9e953e
---
 res/drawable/default_widget_preview.9.png         | Bin 3976 -> 634 bytes
 res/drawable/widget_divider.png                   | Bin 0 -> 115 bytes
 res/layout-xlarge-land/customization_drawer.xml   |  22 +++++++
 res/layout-xlarge-port/customization_drawer.xml   |  22 +++++++
 res/layout-xlarge/customize_paged_view_widget.xml |  74 +++++++++++++++++-----
 res/layout-xlarge/launcher.xml                    |   2 +-
 res/values-xlarge/dimens.xml                      |   2 +-
 res/values/attrs.xml                              |   7 ++
 8 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 res/drawable/widget_divider.png
 create mode 100644 res/layout-xlarge-land/customization_drawer.xml
 create mode 100644 res/layout-xlarge-port/customization_drawer.xml

(limited to 'res')

diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png
index b3ddada..5fedcc8 100644
Binary files a/res/drawable/default_widget_preview.9.png and b/res/drawable/default_widget_preview.9.png differ
diff --git a/res/drawable/widget_divider.png b/res/drawable/widget_divider.png
new file mode 100644
index 0000000..1b453c5
Binary files /dev/null and b/res/drawable/widget_divider.png differ
diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
new file mode 100644
index 0000000..4fcf761
--- /dev/null
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.CustomizePagedView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:widgetCellCountX="16" />
\ No newline at end of file
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
new file mode 100644
index 0000000..6e4bc4c
--- /dev/null
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.CustomizePagedView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:widgetCellCountX="12" />
\ No newline at end of file
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
index da5342b..4d70a12 100644
--- a/res/layout-xlarge/customize_paged_view_widget.xml
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -13,20 +13,62 @@
      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:id="@+id/name"
-    android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:paddingTop="2dip"
-
-    android:textColor="#FFFFFFFF"
-    android:textSize="14sp"
-    android:shadowColor="#FF000000"
-    android:shadowDx="0.0"
-    android:shadowDy="1.0"
-    android:shadowRadius="1.0"
-
-    android:maxLines="2"
-    android:fadingEdge="horizontal" />
+    android:paddingLeft="12.5dp"
+    android:paddingRight="12.5dp"
+    android:paddingTop="40dp"
+    android:paddingBottom="50dp"
+    android:gravity="top"
+    android:orientation="vertical">
+
+    <!-- The icon of the widget. -->
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.0"
+        android:scaleType="fitStart" />
+
+    <!-- The divider image. -->
+    <ImageView
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:src="@drawable/widget_divider" />
+
+    <!-- The name of the widget. -->
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+
+        android:textColor="#FFFFFFFF"
+        android:textSize="14sp"
+        android:shadowColor="#FF000000"
+        android:shadowDx="0.0"
+        android:shadowDy="1.0"
+        android:shadowRadius="1.0"
+
+        android:maxLines="2"
+        android:fadingEdge="horizontal" />
+
+    <!-- The original dimensions of the widget (can't be the same text as above due to different
+         style. -->
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/dims"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+
+        android:textColor="#FF999999"
+        android:textSize="14sp"
+        android:shadowColor="#99000000"
+        android:shadowDx="0.0"
+        android:shadowDy="1.0"
+        android:shadowRadius="1.0" />
+</LinearLayout>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index a3c7558..c6acec3 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -128,7 +128,7 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="550dip"
+        android:layout_height="500dip"
         android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 9c65897..4662aad 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -23,7 +23,7 @@
     <dimen name="smallScreenExtraSpacing">0dip</dimen>
 
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
-    <dimen name="smallScreenVerticalMargin">20dip</dimen>
+    <dimen name="smallScreenVerticalMargin">60dip</dimen>
 
     <dimen name="toolbar_padding">10dip</dimen>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 09fb0da..8aa6efb 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -64,6 +64,13 @@
         <attr name="cellCountY" />
     </declare-styleable>
 
+    <!-- CustomizePagedView specific attributes. These attributes are used to customize
+         a CustomizePagedView view in XML files. -->
+    <declare-styleable name="CustomizePagedView">
+        <!-- The number of horizontal cells for the widget tab -->
+        <attr name="widgetCellCountX" format="integer" />
+    </declare-styleable>
+
     <!-- DeleteZone specific attributes. These attributes are used to customize
          a DeleteZone view in XML files. -->
     <declare-styleable name="DeleteZone">
-- 
cgit v1.1


From 3a476786986278ee81de41c0b548bf0c1af6f8b6 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 15 Sep 2010 15:21:55 -0700
Subject: Extracting format string properly into xml strings.

Change-Id: I4766ee48bef6a08c6a9809f8df29d4d2343014c4
---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3c1b79c..00febfe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -65,6 +65,10 @@
     <!--  Tile of the tab for applications that were downloaded from market [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_downloaded">Downloaded</string>
 
+    <!-- Customization Drawer -->
+    <!-- The format string for the dimensions of a widget in the drawer -->
+    <string name="widget_dims_format">%1$d x %2$d</string>
+
     <!-- Folders -->
     <skip />
     <!-- Label of Folder name field in Rename folder dialog box -->
-- 
cgit v1.1


From 64a3cd4f204dd5f3676249d50aa0881b2e279b1f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 17 Sep 2010 16:47:33 -0700
Subject: Changing the holographic outline algorithm to match designs.

Change-Id: Ibb9668514c7c3ce56473cf041051245b9c19c793
---
 res/layout-xlarge/all_apps_paged_view_application.xml | 10 +++++++++-
 res/values/attrs.xml                                  | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index 55779e5..bee13d6 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -14,7 +14,15 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.PagedViewIcon
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    launcher:blurColor="#FF6B8CF0"
+    launcher:outlineColor="#FF8CD2FF"
+    launcher:checkedBlurColor="#FFBBE83C"
+    launcher:checkedOutlineColor="#FF8CD2FF"
+
     android:id="@+id/name"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8aa6efb..3ef26fb 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -55,6 +55,19 @@
         <attr name="yAxisEndPadding" format="dimension"  />
     </declare-styleable>
 
+    <!-- PagedViewIcon specific attributes. These attributes are used to customize
+         a PagedViewIcon view in XML files. -->
+    <declare-styleable name="PagedViewIcon">
+        <!-- The blur color of the holographic outline -->
+        <attr name="blurColor" format="color" />
+        <!-- The outline color of the holographic outline -->
+        <attr name="outlineColor" format="color" />
+        <!-- The checked blur color of the holographic outline -->
+        <attr name="checkedBlurColor" format="color" />
+        <!-- The checked outline color of the holographic outline -->
+        <attr name="checkedOutlineColor" format="color" />
+    </declare-styleable>
+
     <!-- PagedView specific attributes. These attributes are used to customize
          a PagedView view in XML files. -->
     <declare-styleable name="PagedView">
-- 
cgit v1.1


From dea9e93e4a7b78ae48f27ac0d5d117f6b393bba0 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 22 Sep 2010 15:04:29 -0700
Subject: Fix misaligned drop targets in the all apps CAB

---
 res/layout-xlarge/launcher.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index c6acec3..9ed2dc5 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
-- 
cgit v1.1


From 5ffd8eafeb2ef0554ecb38f6e81cf48b674856d9 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 23 Sep 2010 18:40:29 -0700
Subject: Initial changes to add Applications tab in the customization drawer
 for usability testing.

- Also adding padding attributes for the dynamic layouts created for each page.

Change-Id: I76a7b6b8f4d83329c506fd6055f910575d0c200f
---
 res/layout-xlarge-land/all_apps_tabbed.xml      | 49 +++++++++++++++++++++++++
 res/layout-xlarge-land/customization_drawer.xml |  8 +++-
 res/layout-xlarge-port/all_apps_tabbed.xml      | 49 +++++++++++++++++++++++++
 res/layout-xlarge-port/customization_drawer.xml |  8 +++-
 res/layout-xlarge/all_apps_tabbed.xml           | 45 -----------------------
 res/values/attrs.xml                            |  5 +++
 res/values/strings.xml                          |  4 +-
 7 files changed, 120 insertions(+), 48 deletions(-)
 create mode 100644 res/layout-xlarge-land/all_apps_tabbed.xml
 create mode 100644 res/layout-xlarge-port/all_apps_tabbed.xml
 delete mode 100644 res/layout-xlarge/all_apps_tabbed.xml

(limited to 'res')

diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
new file mode 100644
index 0000000..4f573f8
--- /dev/null
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.AllAppsTabbed
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:background="#30000000"
+    android:paddingTop="?android:attr/actionBarSize">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:tabStripEnabled="false"
+            android:paddingBottom="10dp" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <com.android.launcher2.AllAppsPagedView
+                android:id="@+id/all_apps_paged_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                launcher:cellCountX="7"
+                launcher:cellCountY="4"
+                launcher:pageLayoutPaddingTop="10dp"
+                launcher:pageLayoutPaddingBottom="15dp"
+                launcher:pageLayoutPaddingLeft="20dp"
+                launcher:pageLayoutPaddingRight="20dp">
+            </com.android.launcher2.AllAppsPagedView>
+        </FrameLayout>
+    </LinearLayout>
+</com.android.launcher2.AllAppsTabbed>
diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
index 4fcf761..7ad9132 100644
--- a/res/layout-xlarge-land/customization_drawer.xml
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -19,4 +19,10 @@
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    launcher:widgetCellCountX="16" />
\ No newline at end of file
+    launcher:widgetCellCountX="16"
+    launcher:cellCountX="7"
+    launcher:cellCountY="4"
+    launcher:pageLayoutPaddingTop="10dp"
+    launcher:pageLayoutPaddingBottom="15dp"
+    launcher:pageLayoutPaddingLeft="20dp"
+    launcher:pageLayoutPaddingRight="20dp" />
\ No newline at end of file
diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml
new file mode 100644
index 0000000..2ff0447
--- /dev/null
+++ b/res/layout-xlarge-port/all_apps_tabbed.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.AllAppsTabbed
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:background="#30000000"
+    android:paddingTop="?android:attr/actionBarSize">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:tabStripEnabled="false"
+            android:paddingBottom="10dp" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <com.android.launcher2.AllAppsPagedView
+                android:id="@+id/all_apps_paged_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                launcher:cellCountX="7"
+                launcher:cellCountY="4"
+                launcher:pageLayoutPaddingTop="10dp"
+                launcher:pageLayoutPaddingBottom="10dp"
+                launcher:pageLayoutPaddingLeft="0dp"
+                launcher:pageLayoutPaddingRight="0dp">
+            </com.android.launcher2.AllAppsPagedView>
+        </FrameLayout>
+    </LinearLayout>
+</com.android.launcher2.AllAppsTabbed>
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index 6e4bc4c..db264b2 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -19,4 +19,10 @@
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    launcher:widgetCellCountX="12" />
\ No newline at end of file
+    launcher:widgetCellCountX="12"
+    launcher:cellCountX="7"
+    launcher:cellCountY="4"
+    launcher:pageLayoutPaddingTop="10dp"
+    launcher:pageLayoutPaddingBottom="15dp"
+    launcher:pageLayoutPaddingLeft="0dp"
+    launcher:pageLayoutPaddingRight="0dp" />
\ No newline at end of file
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
deleted file mode 100644
index 5aca954..0000000
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.android.launcher2.AllAppsTabbed
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:background="#30000000"
-    android:paddingTop="?android:attr/actionBarSize">
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TabWidget
-            android:id="@android:id/tabs"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:tabStripEnabled="false"
-            android:paddingBottom="10dp" />
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <com.android.launcher2.AllAppsPagedView
-                android:id="@+id/all_apps_paged_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                launcher:cellCountX="7"
-                launcher:cellCountY="4">
-            </com.android.launcher2.AllAppsPagedView>
-        </FrameLayout>
-    </LinearLayout>
-</com.android.launcher2.AllAppsTabbed>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3ef26fb..bb1b85f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -75,6 +75,11 @@
         <attr name="cellCountX" />
         <!-- The number of vertical cells in a page -->
         <attr name="cellCountY" />
+        <!-- The padding of the pages that are dynamically created per page -->
+        <attr name="pageLayoutPaddingTop" format="dimension" />
+        <attr name="pageLayoutPaddingBottom" format="dimension" />
+        <attr name="pageLayoutPaddingLeft" format="dimension" />
+        <attr name="pageLayoutPaddingRight" format="dimension" />
     </declare-styleable>
 
     <!-- CustomizePagedView specific attributes. These attributes are used to customize
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00febfe..4d88a33 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,9 +50,11 @@
     <string name="folders_tab_label">Folders</string>
     <!--  Title of tab containing all possible shortcuts (eg Contacts, Bookmarks) that can be
           added to the home screen -->
-    <string name="shortcuts_tab_label">Shortcuts</string>
+    <string name="shortcuts_tab_label">More</string>
     <!--  Title of tab for configuring wallpapers -->
     <string name="wallpapers_tab_label">Wallpapers</string>
+    <!--  Title of tab for configuring applications -->
+    <string name="applications_tab_label">App Shortcuts</string>
     <!--  Placeholder text, will be removed -->
     <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
     <!--  Labels for the tabs in All Apps -->
-- 
cgit v1.1


From 04e37ed86c9fc90bbf16cffd9f95d9079e7eb92d Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 24 Sep 2010 12:27:12 -0700
Subject: Import revised translations.

Change-Id: Iaf9b3853897f35638910edf4275245a868725cf7
---
 res/values-cs/strings.xml     | 20 ++++++++++----------
 res/values-da/strings.xml     | 20 ++++++++++----------
 res/values-de/strings.xml     | 20 ++++++++++----------
 res/values-el/strings.xml     | 20 ++++++++++----------
 res/values-es-rUS/strings.xml | 20 ++++++++++----------
 res/values-es/strings.xml     | 20 ++++++++++----------
 res/values-fr/strings.xml     | 20 ++++++++++----------
 res/values-it/strings.xml     | 22 +++++++++++-----------
 res/values-ja/strings.xml     | 20 ++++++++++----------
 res/values-ko/strings.xml     | 20 ++++++++++----------
 res/values-nb/strings.xml     | 20 ++++++++++----------
 res/values-nl/strings.xml     | 20 ++++++++++----------
 res/values-pl/strings.xml     | 20 ++++++++++----------
 res/values-pt-rPT/strings.xml | 20 ++++++++++----------
 res/values-pt/strings.xml     | 20 ++++++++++----------
 res/values-rm/strings.xml     | 12 ++++++++----
 res/values-ru/strings.xml     | 20 ++++++++++----------
 res/values-sv/strings.xml     | 20 ++++++++++----------
 res/values-tr/strings.xml     | 20 ++++++++++----------
 res/values-zh-rCN/strings.xml | 20 ++++++++++----------
 res/values-zh-rTW/strings.xml | 20 ++++++++++----------
 21 files changed, 209 insertions(+), 205 deletions(-)

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c091034..b127e1e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurace..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgety"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Složky"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Zástupci"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Vše"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikace"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Hry"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Stažené"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Název složky"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Přejmenovat složku"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načtením widgetu"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 045b834..c3b069e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer ..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Genveje"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapeter"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er fanen for tapeter"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapeter"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er fanen for tapeter"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spil"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Downloadet"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Omdøb mappe"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriv indstillinger og genveje for Start"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillader, at et program ændrer indstillingerne og genvejene i Start."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Der er problemer med indlæsning af widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram, som ikke kan afinstalleres."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a3367d2..6b5401f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurieren..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Ordner"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Verknüpfungen"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergründe"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergründe\""</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergründe"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergründe\""</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Anwendungen"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spiele"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Heruntergeladen"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Ordnername"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Ordner umbenennen"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 609a193..9326a93 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Διαμόρφωση..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Γραφικά στοιχεία"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Φάκελοι"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Συντομεύσεις"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ταπετσαρίες"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Αυτή θα είναι η καρτέλα ταπετσαριών"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ταπετσαρίες"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Αυτή θα είναι η καρτέλα ταπετσαριών"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Κάθε ηλικία"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Εφαρμογές"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Παιχνίδια"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Η λήψη ολοκληρώθηκε"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Όνομα φακέλου"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Μετονομασία φακέλου"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Επιτρέπει σε μια εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Αυτή είναι εφαρμογή του συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4f8b890..b4e65d0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Accesos directos"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papeles tapiz"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ésta será la pestaña para los papeles tapiz"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papeles tapiz"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ésta será la pestaña para los papeles tapiz"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Google Apps"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Descargado"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir configuración y accesos directos de la página principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Esta es una aplicación de sistema y no puede desinstalarse."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f6c5cf7..ecbe8af 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Accesos directos"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fondos de pantalla"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Será la carpeta de fondos de pantalla."</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fondos de pantalla"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Será la carpeta de fondos de pantalla."</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas las aplicaciones"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicaciones"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Descargadas"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir información de accesos directos y de configuración del escritorio"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que una aplicación modifique la configuración y los accesos directos de la página de inicio."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Se trata de una aplicación del sistema y no se puede desinstalar."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1339fd..c6d530d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurer..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Dossiers"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Raccourcis"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fonds d\'écran"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Onglet des fonds d\'écran"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fonds d\'écran"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Onglet des fonds d\'écran"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Toutes"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applications"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jeux"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Téléchargées"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nom du dossier"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renommer le dossier"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problème lors du chargement du widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Il s\'agit d\'une application système que vous ne pouvez pas désinstaller."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fa2624b..f25156a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configura..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Cartelle"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Scorciatorie"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Tutte"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applicazioni"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Giochi"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Scaricate"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome cartella"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Rinomina cartella"</string>
@@ -74,7 +75,7 @@
     <skip />
     <!-- no translation found for cab_selection_text (8712157849499378915) -->
     <skip />
-    <string name="permlab_install_shortcut" msgid="1201690825493376489">"aggiungere scorciatorie"</string>
+    <string name="permlab_install_shortcut" msgid="1201690825493376489">"aggiungere scorciatoie"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Consente a un\'applicazione di aggiungere scorciatoie automaticamente."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"eliminare scorciatoie"</string>
     <string name="permdesc_uninstall_shortcut" msgid="959972195916090900">"Consente a un\'applicazione di rimuovere scorciatoie automaticamente."</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"creare impostazioni e scorciatoie in Home"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Consente a un\'applicazione di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Errore durante il caricamento del widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Questa è un\'applicazione di sistema e non può essere disinstallata."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 09b23b7..98f042b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"ウィジェット"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"フォルダ"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"ショートカット"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁紙"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ここが壁紙タブになります"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁紙"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ここが壁紙タブになります"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"すべて"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"アプリ"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"ゲーム"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"ダウンロード済み"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"フォルダ名"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"フォルダ名を変更"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"このシステムアプリケーションはアンインストールできません。"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b943f1c..5213326 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"구성..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"위젯"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"폴더"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"바로가기"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"배경화면"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"배경화면 탭이 됩니다."</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"배경화면"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"배경화면 탭이 됩니다."</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"모두"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"애플리케이션"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"게임"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"다운로드앱"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"폴더 이름"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"폴더 이름 바꾸기"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"홈 설정 및 바로가기 쓰기"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"애플리케이션이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"위젯을 로드하는 중 문제가 발생했습니다."</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"시스템 애플리케이션은 제거할 수 없습니다."</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 74ace88..0d24eb9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer"</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Moduler"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Snarveier"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrunner"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er nå bakgrunnsfanen"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrunner"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er nå bakgrunnsfanen"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spill"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Nedlastet"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Gi nytt navn til mappe"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skrive skrivebordsinnstillinger og -snarveier"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Lar applikasjonen endre innstillinger og snarveier på skrivebordet."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram og kan ikke avinstalleres."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 42608e0..5a2a269 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configureren..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mappen"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Sneltoetsen"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Achtergronden"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit wordt het tabblad \'Achtergronden\'"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Achtergronden"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit wordt het tabblad \'Achtergronden\'"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Toepassingen"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Games"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Gedownload"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mapnaam"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Naam van map wijzigen"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"instellingen en snelkoppelingen voor de startpagina schrijven"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is een systeemtoepassing die niet kan worden verwijderd."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ea51842..0c8e91b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfiguruj..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widżety"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Foldery"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Skróty"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To będzie karta tapet"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To będzie karta tapet"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Wszystkie"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikacje"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Gry"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Pobrane"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nazwa folderu"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Zmień nazwę folderu"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"zapisywanie ustawień i skrótów strony głównej"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem podczas ładowania widżetu"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"To jest aplikacja systemowa i nie można jej odinstalować."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b2d6c65..cdff3bf 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Atalhos"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagens de fundo"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Isto será o separador de imagens de fundo"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagens de fundo"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Isto será o separador de imagens de fundo"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicações"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Transferidas"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Mudar o nome da pasta"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"escrever definições e atalhos do ecrã principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que uma aplicação altere as definições e os atalhos do ecrã principal."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Erro ao carregar o widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"É uma aplicação de sistema e não pode ser desinstalada."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f3a7757..bdebb87 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Atalhos"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papéis de parede"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Esta será a guia de papéis de parede"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papéis de parede"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Esta será a guia de papéis de parede"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicativos"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Download concluído"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que um aplicativo altere as configurações e atalhos na Página inicial."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Este é um aplicativo do sistema e não pode ser desinstalado."</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 90a156b..0e4e4da 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -31,10 +31,12 @@
     <skip />
     <!-- no translation found for folders_tab_label (1145293785541489736) -->
     <skip />
-    <!-- no translation found for shortcuts_tab_label (3312788893569416806) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
     <!-- no translation found for wallpapers_tab_label (1617804870364119879) -->
     <skip />
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
+    <skip />
     <!-- no translation found for wallpapers_temp_tab_text (1660218201190495279) -->
     <skip />
     <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
@@ -45,6 +47,8 @@
     <skip />
     <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
     <skip />
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Num da l\'ordinatur"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renumnar l\'ordinatur"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
@@ -60,9 +64,9 @@
     <string name="add_clock" msgid="2337943840175865746">"Ura"</string>
     <string name="add_photo_frame" msgid="3154058437359487954">"Rom da maletgs"</string>
     <string name="out_of_space" msgid="8365249326091984698">"Nagin spazi liber sin il visur da partenza."</string>
-    <string name="shortcut_installed" msgid="7071557296331322355">"Creà ina scursanida \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
-    <string name="shortcut_uninstalled" msgid="2129499669449749995">"La scursanida \"<xliff:g id="NAME">%s</xliff:g>\" è vegnida stizzada."</string>
-    <string name="shortcut_duplicate" msgid="4757756326465060694">"La scursanida \"<xliff:g id="NAME">%s</xliff:g>\" exista gia."</string>
+    <string name="shortcut_installed" msgid="7071557296331322355">"\"Creà ina scursanida \"\"<xliff:g id="NAME">%s</xliff:g>\"\".\""</string>
+    <string name="shortcut_uninstalled" msgid="2129499669449749995">"\"La scursanida \"\"<xliff:g id="NAME">%s</xliff:g>\"\" è vegnida stizzada.\""</string>
+    <string name="shortcut_duplicate" msgid="4757756326465060694">"\"La scursanida \"\"<xliff:g id="NAME">%s</xliff:g>\"\" exista gia.\""</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Tscherner ina cumbinaziun da tastas"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Tscherner l\'ordinatur"</string>
     <string name="all_apps_button_label" msgid="3953036962111614813">"Tut las applicaziuns"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 486c6d4..bb87445 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Настроить..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Виджеты"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Папки"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Ярлыки"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Обои"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Это будет вкладка обоев"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Обои"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Это будет вкладка обоев"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Все"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Приложения"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Игры"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Загруженные"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Название папки"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Переименовать папку"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"изменять настройки и ярлыки главного экрана"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Это системное приложение. Удалить его невозможно."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 09258a9..be6ee7f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurera..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgetar"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mappar"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Genvägar"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrundsbilder"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Det här kommer att vara fliken för bakgrundsbilder"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrundsbilder"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Det här kommer att vara fliken för bakgrundsbilder"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alla"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Program"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spel"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Hämtade"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappnamn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Byt namn på mapp"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriva inställningar och genvägar för startsidan"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillåter att ett program ändrar inställningar och genvägar på startsidan."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Det gick inte att läsa in widgeten"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Det här är ett systemprogram och kan inte avinstalleras."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e6922a5..59c816d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Yapılandır..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widget\'lar"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Klasörler"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"Kısayollar"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Duvar Kağıtları"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Bu duvar kağıdı sekmesi olacaktır"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"Duvar Kağıtları"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Bu duvar kağıdı sekmesi olacaktır"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"Tümü"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Uygulamalar"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"Oyunlar"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"İndirilenler"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Klasör adı"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Klasörü yeniden adlandır"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"Ana Sayfa ayarlarını ve kısayollarını yaz"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Bu bir sistem uygulamasıdır ve kaldırılamaz."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b1508dd..58f6178 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"配置..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"窗口小部件"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"文件夹"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"快捷方式"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁纸"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"这将会成为壁纸标签"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁纸"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"这将会成为壁纸标签"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"应用程序"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"游戏"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"已下载"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"文件夹名称"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重命名文件夹"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕的设置和快捷方式"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允许应用程序更改主屏幕的设置和快捷方式。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"这是系统应用程序，无法卸载。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 18cbfcb..a7cd098 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,16 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"小工具"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"資料夾"</string>
-    <string name="shortcuts_tab_label" msgid="3312788893569416806">"快速鍵"</string>
-    <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
-    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"桌布標籤保留位"</string>
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
+    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
     <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
+    <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
+    <!-- no translation found for applications_tab_label (9046797126882613707) -->
     <skip />
-    <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
+    <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"桌布標籤保留位"</string>
+    <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"應用程式"</string>
+    <string name="all_apps_tab_games" msgid="1855736784923494918">"遊戲"</string>
+    <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"下載內容"</string>
+    <!-- no translation found for widget_dims_format (412876472704567784) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"資料夾名稱"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重新命名資料夾"</string>
@@ -83,6 +84,5 @@
     <string name="permlab_write_settings" msgid="1360567537236705628">"寫入首頁設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允許應用程式變更首頁中的設定和捷徑。"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string>
-    <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->
-    <skip />
+    <string name="uninstall_system_app_text" msgid="7488523163288397451">"這是系統應用程式，無法將其解除安裝。"</string>
 </resources>
-- 
cgit v1.1


From d0d43010c7a091b6ade407d30e490527a8d16120 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 26 Sep 2010 17:26:45 -0700
Subject: Adding tap-to-add behaviour to the customization drawer.

Change-Id: I5a0863a8df2a0b4855112eb29b40b6e7dd550db9
---
 res/layout-xlarge/all_apps_paged_view_application.xml  |  2 +-
 res/layout-xlarge/customize_paged_view_item.xml        | 12 ++++++++++--
 .../customize_paged_view_wallpaper_placeholder.xml     |  6 ++++--
 res/layout-xlarge/customize_paged_view_widget.xml      | 18 ++++++++++++------
 res/values/attrs.xml                                   |  9 +++++++++
 5 files changed, 36 insertions(+), 11 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index bee13d6..8e53e06 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -23,7 +23,7 @@
     launcher:checkedBlurColor="#FFBBE83C"
     launcher:checkedOutlineColor="#FF8CD2FF"
 
-    android:id="@+id/name"
+    android:id="@+id/application_icon"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml
index 55779e5..e427345 100644
--- a/res/layout-xlarge/customize_paged_view_item.xml
+++ b/res/layout-xlarge/customize_paged_view_item.xml
@@ -14,8 +14,16 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/name"
+<com.android.launcher2.PagedViewIcon
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    launcher:blurColor="#FF6B8CF0"
+    launcher:outlineColor="#FF8CD2FF"
+    launcher:checkedBlurColor="#FFBBE83C"
+    launcher:checkedOutlineColor="#FF8CD2FF"
+
+    android:id="@+id/customize_icon"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
diff --git a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
index 51f624a..6112532 100644
--- a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
+++ b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/name"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:id="@+id/wallpaper_icon"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
index 4d70a12..e8f4ac9 100644
--- a/res/layout-xlarge/customize_paged_view_widget.xml
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -13,7 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.PagedViewWidgetIcon
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:paddingLeft="12.5dp"
@@ -21,11 +24,14 @@
     android:paddingTop="40dp"
     android:paddingBottom="50dp"
     android:gravity="top"
-    android:orientation="vertical">
+    android:orientation="vertical"
+
+    launcher:checkedBlurColor="#FFDAFF71"
+    launcher:checkedOutlineColor="#FFCFFF9C">
 
     <!-- The icon of the widget. -->
     <ImageView
-        android:id="@+id/icon"
+        android:id="@+id/widget_preview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1.0"
@@ -42,7 +48,7 @@
 
     <!-- The name of the widget. -->
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/name"
+        android:id="@+id/widget_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="left"
@@ -60,7 +66,7 @@
     <!-- The original dimensions of the widget (can't be the same text as above due to different
          style. -->
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/dims"
+        android:id="@+id/widget_dims"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="left"
@@ -71,4 +77,4 @@
         android:shadowDx="0.0"
         android:shadowDy="1.0"
         android:shadowRadius="1.0" />
-</LinearLayout>
+</com.android.launcher2.PagedViewWidgetIcon>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index bb1b85f..3e2a8e9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -68,6 +68,15 @@
         <attr name="checkedOutlineColor" format="color" />
     </declare-styleable>
 
+    <!-- PagedViewWidgetIcon specific attributes. These attributes are used to
+         customize a PagedViewWidgetIcon view in XML files. -->
+    <declare-styleable name="PagedViewWidgetIcon">
+        <!-- The checked blur color of the holographic outline -->
+        <attr name="checkedBlurColor" />
+        <!-- The checked outline color of the holographic outline -->
+        <attr name="checkedOutlineColor" />
+    </declare-styleable>
+
     <!-- PagedView specific attributes. These attributes are used to customize
          a PagedView view in XML files. -->
     <declare-styleable name="PagedView">
-- 
cgit v1.1


From 3125d9dec8709a6c95039c7b35d27494da46eaab Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 27 Sep 2010 11:30:20 -0700
Subject: Making the CAB text match the type of item selected in customization
 mode.

---
 res/values/strings.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d88a33..04aea87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -147,8 +147,14 @@
     <!-- Describes the button for getting details/info about currently selected application.
          Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] -->
     <string name="cab_menu_app_info">Application details</string>
-    <!-- Appears in the CAB when an app is selected in All Apps. [CHAR_LIMIT=50] -->
-    <string name="cab_selection_text">1 application selected</string>
+    <!-- Appears in the CAB when an app is selected in All Apps or Customize mode. [CHAR_LIMIT=50] -->
+    <string name="cab_app_selection_text">1 application selected</string>
+    <!-- Appears in the CAB when a widget is selected in Customize mode. [CHAR_LIMIT=50] -->
+    <string name="cab_widget_selection_text">1 widget selected</string>
+    <!-- Appears in the CAB when a folder is selected in Customize mode. [CHAR_LIMIT=50] -->
+    <string name="cab_folder_selection_text">1 folder selected</string>
+    <!-- Appears in the CAB when a shortcut is selected in Customize mode. [CHAR_LIMIT=50] -->
+    <string name="cab_shortcut_selection_text">1 shortcut selected</string>
 
     <!-- Permissions: -->
     <skip />
-- 
cgit v1.1


From 821856b67e1045038686bf10d009e802c941b2c9 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 27 Sep 2010 16:39:26 -0700
Subject: adding hardware acceleration flag to config.xml

(later, this will let us turn on HW acceleration
via a device-specific overlay)

Change-Id: I33c957911db7ac730770b71d6644568fbfa86adf
---
 res/values/config.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/values/config.xml b/res/values/config.xml
index 15ec05b..f532fd6 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -3,4 +3,5 @@
     <integer name="config_allAppsFadeOutTime">700</integer>
     <integer name="config_allAppsBatchLoadDelay">0</integer>
     <integer name="config_allAppsBatchSize">0</integer>
+    <integer name="config_hardwareAccelerated">0</integer>
 </resources>
-- 
cgit v1.1


From 163c9c0236b7824673d4ead9dbf664bf38ec047e Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 28 Sep 2010 15:24:13 -0700
Subject: cleaning up hardware acceleration XML value a bit (switch from
 integer -> bool)

---
 res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/config.xml b/res/values/config.xml
index f532fd6..7811882 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -3,5 +3,5 @@
     <integer name="config_allAppsFadeOutTime">700</integer>
     <integer name="config_allAppsBatchLoadDelay">0</integer>
     <integer name="config_allAppsBatchSize">0</integer>
-    <integer name="config_hardwareAccelerated">0</integer>
+    <bool name="config_hardwareAccelerated">false</bool>
 </resources>
-- 
cgit v1.1


From 9415d87eda0cf28b8df1eccde39b0ca1646be3b9 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 13 Sep 2010 14:49:43 -0700
Subject: -Added 3D effect to home screen scrolling -Added background outline
 fade in / out -Modified the feel of scrolling: now using quintic 
 interpolator and modified the influence of  scroll velocity

Change-Id: Ifddcab5223ac20be7d9f800ccf09442d9b4db781
---
 res/drawable-xlarge/home_screen_bg.9.png | Bin 0 -> 557 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-xlarge/home_screen_bg.9.png

(limited to 'res')

diff --git a/res/drawable-xlarge/home_screen_bg.9.png b/res/drawable-xlarge/home_screen_bg.9.png
new file mode 100644
index 0000000..d939d5c
Binary files /dev/null and b/res/drawable-xlarge/home_screen_bg.9.png differ
-- 
cgit v1.1


From de7658b5e02ae10010e44fcf8d9c5814f54d9eb0 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 27 Sep 2010 11:15:43 -0700
Subject: Show crosshairs when dragging items around the workspace.

---
 res/drawable/gardening_crosshairs.png | Bin 0 -> 3300 bytes
 res/values-xlarge/config.xml          |  12 ++++++++++++
 res/values/config.xml                 |  11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 res/drawable/gardening_crosshairs.png

(limited to 'res')

diff --git a/res/drawable/gardening_crosshairs.png b/res/drawable/gardening_crosshairs.png
new file mode 100644
index 0000000..cbaee78
Binary files /dev/null and b/res/drawable/gardening_crosshairs.png differ
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 9b1bc0d..f6f6646 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -26,4 +26,16 @@
          animations between all apps, customize, & the workspace. -->
     <integer name="config_toolbarButtonFadeInTime">350</integer>
     <integer name="config_toolbarButtonFadeOutTime">350</integer>
+
+    <integer name="config_crosshairsFadeInTime">600</integer>
+
+    <!-- When dragging items on the workspace, how much bigger (in pixels) the dragged view
+         should be, as compared to the original view. If 0, it will not be scaled at all.
+         Should be an even number, for pixel alignment. -->
+    <integer name="config_dragViewExtraPixels">0</integer>
+
+    <!-- When dragging items on the workspace, the number of pixels by which the position of
+         the drag view should be offset from the position of the original view. -->
+    <integer name="config_dragViewOffsetX">0</integer>
+    <integer name="config_dragViewOffsetY">12</integer>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 7811882..db967ea 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -4,4 +4,15 @@
     <integer name="config_allAppsBatchLoadDelay">0</integer>
     <integer name="config_allAppsBatchSize">0</integer>
     <bool name="config_hardwareAccelerated">false</bool>
+
+    <!--  When dragging an item on the workspace, how much bigger (in pixels) the dragged view
+          should be, as compared to the original view. If 0, it will not be scaled at all.
+          Should be an even number, for pixel alignment. -->
+    <integer name="config_dragViewExtraPixels">40</integer>
+
+    <!-- When dragging items on the workspace, the number of pixels by which the position of
+         the drag view should be offset from the position of the original view.
+         Setting to 1/2 of config_dragViewExtraPixels keeps it centered on its old position. -->
+    <integer name="config_dragViewOffsetX">20</integer>
+    <integer name="config_dragViewOffsetY">20</integer>
 </resources>
-- 
cgit v1.1


From 0fb7db5a3771223bc86fdf0e01665e69c1309cc1 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 29 Sep 2010 13:02:43 -0700
Subject: Fixing boot stall. Revert "-Added 3D effect to home screen scrolling"

This reverts commit 9415d87eda0cf28b8df1eccde39b0ca1646be3b9.

Change-Id: Ib8d6602f5d82884eb1f6cc44c0cc71cc563a3a59
---
 res/drawable-xlarge/home_screen_bg.9.png | Bin 557 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 res/drawable-xlarge/home_screen_bg.9.png

(limited to 'res')

diff --git a/res/drawable-xlarge/home_screen_bg.9.png b/res/drawable-xlarge/home_screen_bg.9.png
deleted file mode 100644
index d939d5c..0000000
Binary files a/res/drawable-xlarge/home_screen_bg.9.png and /dev/null differ
-- 
cgit v1.1


From f34bab59fc0260f926aec44d044883dce1b4191f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 30 Sep 2010 14:11:56 -0700
Subject: -Added 3D effect to home screen scrolling -Added background outline
 fade in / out -Modified the feel of scrolling: now using quintic 
 interpolator and modified the influence of  scroll velocity

Change-Id: Ifddcab5223ac20be7d9f800ccf09442d9b4db781

Conflicts:

	src/com/android/launcher2/CellLayout.java
---
 res/drawable-xlarge/home_screen_bg.9.png | Bin 0 -> 557 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-xlarge/home_screen_bg.9.png

(limited to 'res')

diff --git a/res/drawable-xlarge/home_screen_bg.9.png b/res/drawable-xlarge/home_screen_bg.9.png
new file mode 100644
index 0000000..d939d5c
Binary files /dev/null and b/res/drawable-xlarge/home_screen_bg.9.png differ
-- 
cgit v1.1


From 150fbab7de7df45ce0e2d08fb0f0be87ff091c2f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 29 Sep 2010 17:14:26 -0700
Subject: 3029324 wip: Drop target crossfades as it moves from position to
 position

---
 res/values-xlarge/config.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'res')

diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index f6f6646..c7c68e2 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -38,4 +38,11 @@
          the drag view should be offset from the position of the original view. -->
     <integer name="config_dragViewOffsetX">0</integer>
     <integer name="config_dragViewOffsetY">12</integer>
+
+    <!-- The duration (in ms) of the fade animation on the object outlines, used when
+         we are dragging objects around on the home screen. -->
+    <integer name="config_dragOutlineFadeTime">900</integer>
+
+    <!-- The alpha value at which to show the most recent drop visualization outline. -->
+    <integer name="config_dragOutlineMaxAlpha">180</integer>
 </resources>
-- 
cgit v1.1


From 658db74c24817892f1a379b16620744f38f60e40 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Wed, 29 Sep 2010 11:40:39 -0700
Subject: the scroll drag area was too small, and should have come from a
 resource anyway.

Change-Id: I11111aff767e21a2582c5c368b5d9ff1ac8f9cd7
---
 res/values/dimens.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 790f835..c83986b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,4 +37,8 @@
     
     <!-- delete_zone_size_full - button_bar_height_portrait -->
     <dimen name="delete_zone_padding">14dip</dimen>
+
+    <!-- the area at the edge of the screen that makes the workspace go left
+         or right while you're dragging. -->
+    <dimen name="scroll_zone">20dp</dimen>
 </resources>
-- 
cgit v1.1


From 16fed41e5e680c547b23e108788eb85f1b04d36d Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 1 Oct 2010 16:12:03 -0700
Subject: - getting rid of "dimmed" effect for icons and widgets - re-enabling
 drawing cache for icons and widgets

---
 res/layout-xlarge-land/application.xml | 2 +-
 res/layout-xlarge-port/application.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge-land/application.xml b/res/layout-xlarge-land/application.xml
index d0c8d9b..ed8fa8c 100644
--- a/res/layout-xlarge-land/application.xml
+++ b/res/layout-xlarge-land/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Landscape" />
\ No newline at end of file
diff --git a/res/layout-xlarge-port/application.xml b/res/layout-xlarge-port/application.xml
index ec66976..af7a8a4 100644
--- a/res/layout-xlarge-port/application.xml
+++ b/res/layout-xlarge-port/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- 	style="@style/WorkspaceIcon.Portrait" />
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+   style="@style/WorkspaceIcon.Portrait" />
-- 
cgit v1.1


From 6ae0fcfc80b55322824f87b2cc3c1f51ed83e5ab Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 1 Oct 2010 12:23:12 -0700
Subject: Pulling search button from metadata in search provider, or falling
 back on our default icon.

Change-Id: I59fc59b76a0915a04275e08c88f5d46c3484cc6c
---
 res/drawable-xlarge/search_button.xml         | 20 --------------------
 res/drawable-xlarge/search_button_generic.xml | 20 ++++++++++++++++++++
 res/layout-xlarge/launcher.xml                |  1 -
 3 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100644 res/drawable-xlarge/search_button.xml
 create mode 100644 res/drawable-xlarge/search_button_generic.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/search_button.xml b/res/drawable-xlarge/search_button.xml
deleted file mode 100644
index 8f18e67..0000000
--- a/res/drawable-xlarge/search_button.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/search_button_pressed" />
-    <item android:drawable="@drawable/search_button_normal" />
-</selector>
diff --git a/res/drawable-xlarge/search_button_generic.xml b/res/drawable-xlarge/search_button_generic.xml
new file mode 100644
index 0000000..8f18e67
--- /dev/null
+++ b/res/drawable-xlarge/search_button_generic.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/search_button_pressed" />
+    <item android:drawable="@drawable/search_button_normal" />
+</selector>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 9ed2dc5..9b41af0 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -54,7 +54,6 @@
 
         <ImageView
             android:id="@+id/search_button"
-            android:src="@drawable/search_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="left"
-- 
cgit v1.1


From 67f7f43f54613aeeccc37d5920014515eb765d59 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 4 Oct 2010 17:45:43 -0700
Subject: fix 3053561: Update homescreen icons for all apps, customize

---
 res/drawable-xlarge/all_apps_button_normal.9.png  | Bin 0 -> 901 bytes
 res/drawable-xlarge/all_apps_button_normal.png    | Bin 698 -> 0 bytes
 res/drawable-xlarge/all_apps_button_pressed.9.png | Bin 0 -> 2100 bytes
 res/drawable-xlarge/all_apps_button_pressed.png   | Bin 3606 -> 0 bytes
 res/drawable-xlarge/configure_button_normal.png   | Bin 416 -> 1256 bytes
 res/drawable-xlarge/configure_button_pressed.png  | Bin 2748 -> 3162 bytes
 res/layout-xlarge/launcher.xml                    |  31 ++++++++++++----------
 res/values-xlarge/styles.xml                      |   6 ++++-
 res/values/strings.xml                            |   4 +--
 9 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 res/drawable-xlarge/all_apps_button_normal.9.png
 delete mode 100644 res/drawable-xlarge/all_apps_button_normal.png
 create mode 100644 res/drawable-xlarge/all_apps_button_pressed.9.png
 delete mode 100644 res/drawable-xlarge/all_apps_button_pressed.png

(limited to 'res')

diff --git a/res/drawable-xlarge/all_apps_button_normal.9.png b/res/drawable-xlarge/all_apps_button_normal.9.png
new file mode 100644
index 0000000..a423145
Binary files /dev/null and b/res/drawable-xlarge/all_apps_button_normal.9.png differ
diff --git a/res/drawable-xlarge/all_apps_button_normal.png b/res/drawable-xlarge/all_apps_button_normal.png
deleted file mode 100644
index e1c8b7d..0000000
Binary files a/res/drawable-xlarge/all_apps_button_normal.png and /dev/null differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.9.png b/res/drawable-xlarge/all_apps_button_pressed.9.png
new file mode 100644
index 0000000..5dbe77c
Binary files /dev/null and b/res/drawable-xlarge/all_apps_button_pressed.9.png differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.png b/res/drawable-xlarge/all_apps_button_pressed.png
deleted file mode 100644
index 9dcfaa5..0000000
Binary files a/res/drawable-xlarge/all_apps_button_pressed.png and /dev/null differ
diff --git a/res/drawable-xlarge/configure_button_normal.png b/res/drawable-xlarge/configure_button_normal.png
index b11c2a8..9b37eff 100644
Binary files a/res/drawable-xlarge/configure_button_normal.png and b/res/drawable-xlarge/configure_button_normal.png differ
diff --git a/res/drawable-xlarge/configure_button_pressed.png b/res/drawable-xlarge/configure_button_pressed.png
index 70db9b7..5f38db6 100644
Binary files a/res/drawable-xlarge/configure_button_pressed.png and b/res/drawable-xlarge/configure_button_pressed.png differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 9b41af0..2b43442 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -64,14 +64,29 @@
             android:clickable="true"/>
 
         <ImageView
-            android:id="@+id/all_apps_button"
-            android:src="@drawable/all_apps_button"
+            android:id="@+id/configure_button"
+            android:src="@drawable/configure_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
             android:layout_marginRight="@dimen/toolbar_button_spacing"
 
+            android:onClick="onClickConfigureButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <TextView
+            android:id="@+id/all_apps_button"
+            android:text="@string/all_apps_button_label"
+            android:background="@drawable/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@id/configure_button"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
+            android:textSize="18dip"
+
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
@@ -89,18 +104,6 @@
             android:clickable="false"
             android:visibility="gone"/>
 
-        <ImageView
-            android:id="@+id/configure_button"
-            android:src="@drawable/configure_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/all_apps_button"
-            android:layout_marginLeft="@dimen/toolbar_button_spacing"
-
-            android:onClick="onClickConfigureButton"
-            android:focusable="true"
-            android:clickable="true" />
-
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:src="@drawable/delete_zone_selector"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 637b6ce..59301b9 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -18,9 +18,13 @@
 -->
 
 <resources>
-    <style name="Theme" parent="Theme.Base">
+    <style name="Theme" parent="android:Theme.Holo">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionModeOverlay">true</item>
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowShowWallpaper">true</item>
     </style>
 
     <style name="WorkspaceIcon.Portrait">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 98de9db..59fdfd3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,8 +118,8 @@
     <!-- Title of dialog when user is selecting live folder to add to homescreen -->
     <string name="title_select_live_folder">Select folder</string>
 
-    <!-- All applications label for accessibilty (spoken when the button gets focus). -->
-    <string name="all_apps_button_label">All applications</string>
+    <!-- All applications label -->
+    <string name="all_apps_button_label">Apps</string>
     <!-- Label for button in all applications label to go back home (to the workspace / desktop)
          for accessibilty (spoken when the button gets focus). -->
     <string name="all_apps_home_button_label">Home</string>
-- 
cgit v1.1


From 9c4949e12c909d5e01d24386147b1c528015b31b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 5 Oct 2010 12:27:22 -0700
Subject: ->Added attribute to PagedView to specify spacing between adjacent
 pages ->Fixing crash on phones Change-Id:
 I8ea97ce6d569c59b6d51b544dc10b0310d294b43

---
 res/layout-xlarge/launcher.xml | 3 ++-
 res/values/attrs.xml           | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 2b43442..65f29df 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -37,7 +37,8 @@
         android:paddingTop="?android:attr/actionBarSize"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
-        launcher:cellCountY="7">
+        launcher:cellCountY="7"
+        launcher:pageSpacing="64dip">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3e2a8e9..14a5e98 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -89,6 +89,8 @@
         <attr name="pageLayoutPaddingBottom" format="dimension" />
         <attr name="pageLayoutPaddingLeft" format="dimension" />
         <attr name="pageLayoutPaddingRight" format="dimension" />
+        <!-- The space between adjacent pages of the PagedView. -->
+        <attr name="pageSpacing" format="dimension" />
     </declare-styleable>
 
     <!-- CustomizePagedView specific attributes. These attributes are used to customize
-- 
cgit v1.1


From 046e7eb472acac800128ab026f3bc6348b0f933f Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 6 Oct 2010 12:14:43 -0700
Subject: Fix 3065611: NPE in Launcher attempting to drag app to home screen

---
 res/values-xlarge/config.xml | 9 ---------
 res/values/config.xml        | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index c7c68e2..73e7146 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -27,8 +27,6 @@
     <integer name="config_toolbarButtonFadeInTime">350</integer>
     <integer name="config_toolbarButtonFadeOutTime">350</integer>
 
-    <integer name="config_crosshairsFadeInTime">600</integer>
-
     <!-- When dragging items on the workspace, how much bigger (in pixels) the dragged view
          should be, as compared to the original view. If 0, it will not be scaled at all.
          Should be an even number, for pixel alignment. -->
@@ -38,11 +36,4 @@
          the drag view should be offset from the position of the original view. -->
     <integer name="config_dragViewOffsetX">0</integer>
     <integer name="config_dragViewOffsetY">12</integer>
-
-    <!-- The duration (in ms) of the fade animation on the object outlines, used when
-         we are dragging objects around on the home screen. -->
-    <integer name="config_dragOutlineFadeTime">900</integer>
-
-    <!-- The alpha value at which to show the most recent drop visualization outline. -->
-    <integer name="config_dragOutlineMaxAlpha">180</integer>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index db967ea..b6d5037 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -5,6 +5,8 @@
     <integer name="config_allAppsBatchSize">0</integer>
     <bool name="config_hardwareAccelerated">false</bool>
 
+    <integer name="config_crosshairsFadeInTime">600</integer>
+
     <!--  When dragging an item on the workspace, how much bigger (in pixels) the dragged view
           should be, as compared to the original view. If 0, it will not be scaled at all.
           Should be an even number, for pixel alignment. -->
@@ -15,4 +17,11 @@
          Setting to 1/2 of config_dragViewExtraPixels keeps it centered on its old position. -->
     <integer name="config_dragViewOffsetX">20</integer>
     <integer name="config_dragViewOffsetY">20</integer>
+
+    <!-- The duration (in ms) of the fade animation on the object outlines, used when
+         we are dragging objects around on the home screen. -->
+    <integer name="config_dragOutlineFadeTime">900</integer>
+
+    <!-- The alpha value at which to show the most recent drop visualization outline. -->
+    <integer name="config_dragOutlineMaxAlpha">180</integer>
 </resources>
-- 
cgit v1.1


From 1262e369484ce7f2565655ed80e6299232c70bd7 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 6 Oct 2010 15:49:50 -0700
Subject: wip 3029324: Implement new drag feedback

- Show page borders when dragging
- Enlarge scroll region (landscape only)
- When inside scroll region, show green border on adjacent page
---
 res/drawable-xlarge/home_screen_bg_hover.9.png | Bin 0 -> 244 bytes
 res/values-xlarge-land/dimens.xml              |  21 +++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 res/drawable-xlarge/home_screen_bg_hover.9.png
 create mode 100644 res/values-xlarge-land/dimens.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/home_screen_bg_hover.9.png b/res/drawable-xlarge/home_screen_bg_hover.9.png
new file mode 100644
index 0000000..c85bcab
Binary files /dev/null and b/res/drawable-xlarge/home_screen_bg_hover.9.png differ
diff --git a/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml
new file mode 100644
index 0000000..d1140c0
--- /dev/null
+++ b/res/values-xlarge-land/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<resources>
+    <!-- the area at the edge of the screen that makes the workspace go left
+         or right while you're dragging. -->
+    <dimen name="scroll_zone">160dip</dimen>
+</resources>
\ No newline at end of file
-- 
cgit v1.1


From 37265ef6a76155354e39c37a41de2cda893bfb71 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Thu, 7 Oct 2010 11:44:33 -0400
Subject: Fix crash on phones about no resource.

Bug: 3039845
Change-Id: If7b08eafd3fe6cdfc75a92ddcf463371359c3633
---
 res/values-xlarge/colors.xml | 22 ----------------------
 res/values/colors.xml        |  4 ++++
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 res/values-xlarge/colors.xml

(limited to 'res')

diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
deleted file mode 100644
index d4c6fad..0000000
--- a/res/values-xlarge/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2010, 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.
-*/
--->
-<resources>
-    <color name="app_info_filter">#A50000FE</color>
-    <color name="dimmed_view_color">#FF7F7F7F</color>
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9b9700f..24e1b67 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,4 +28,8 @@
 
     <color name="gesture_color">#ff0563c1</color>
     <color name="uncertain_gesture_color">#ff848484</color>
+
+    <color name="app_info_filter">#A50000FE</color>
+    <color name="dimmed_view_color">#FF7F7F7F</color>
+
 </resources>
-- 
cgit v1.1


From 3e7c7634531302271270c8cf418abc959d621cbc Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Sat, 2 Oct 2010 16:01:03 -0700
Subject: updated Workspace thumbnail behavior

- in All Apps mode, fade thumbnails completely
- while dragging, have thumbnails re-appear
- while dragging, give screen thumbnails that can accept drops a different appearance (green outline instead of blue)

Change-Id: I72ddf8a0f1947d35ef11514b7d4eea9ae5eee6e2
---
 res/drawable-xlarge/mini_home_screen_bg.9.png         | Bin 7288 -> 4618 bytes
 .../mini_home_screen_bg_accepts_drops.9.png           | Bin 0 -> 4702 bytes
 res/drawable-xlarge/mini_home_screen_bg_hover.9.png   | Bin 7069 -> 4742 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png

(limited to 'res')

diff --git a/res/drawable-xlarge/mini_home_screen_bg.9.png b/res/drawable-xlarge/mini_home_screen_bg.9.png
index ecbbcb4..e5b2d72 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg.9.png and b/res/drawable-xlarge/mini_home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png
new file mode 100644
index 0000000..4bd8637
Binary files /dev/null and b/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png
index 48af564..fb0fb63 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png and b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png differ
-- 
cgit v1.1


From b0b2e6f588367cf40a4270cca81af7d78f8e382e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 12 Oct 2010 17:49:56 -0700
Subject: Tweaking spacing and layout of AllApps/Customize in portrait.

- Also added workaround for tab label not being initially selected
- Added fix for initial layout of PagedViews preventing side pages from having proper alpha
- Marking widget dims format string as not translatable

Change-Id: I74a5410b88e2766816a87b14e64058b4288c214d
---
 res/layout-xlarge-land/all_apps_tabbed.xml      |   1 -
 res/layout-xlarge-land/customization_drawer.xml |   2 +-
 res/layout-xlarge-land/launcher.xml             | 155 ++++++++++++++++++++++++
 res/layout-xlarge-port/all_apps_tabbed.xml      |   5 +-
 res/layout-xlarge-port/customization_drawer.xml |   6 +-
 res/layout-xlarge-port/launcher.xml             | 155 ++++++++++++++++++++++++
 res/layout-xlarge/launcher.xml                  | 155 ------------------------
 res/values/strings.xml                          |   2 +-
 8 files changed, 317 insertions(+), 164 deletions(-)
 create mode 100644 res/layout-xlarge-land/launcher.xml
 create mode 100644 res/layout-xlarge-port/launcher.xml
 delete mode 100644 res/layout-xlarge/launcher.xml

(limited to 'res')

diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index 4f573f8..3a07b95 100644
--- a/res/layout-xlarge-land/all_apps_tabbed.xml
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -16,7 +16,6 @@
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:background="#30000000"
     android:paddingTop="?android:attr/actionBarSize">
     <LinearLayout
         android:orientation="vertical"
diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
index 7ad9132..8c60e68 100644
--- a/res/layout-xlarge-land/customization_drawer.xml
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -23,6 +23,6 @@
     launcher:cellCountX="7"
     launcher:cellCountY="4"
     launcher:pageLayoutPaddingTop="10dp"
-    launcher:pageLayoutPaddingBottom="15dp"
+    launcher:pageLayoutPaddingBottom="25dp"
     launcher:pageLayoutPaddingLeft="20dp"
     launcher:pageLayoutPaddingRight="20dp" />
\ No newline at end of file
diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
new file mode 100644
index 0000000..65f29df
--- /dev/null
+++ b/res/layout-xlarge-land/launcher.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.DragLayer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:id="@+id/drag_layer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="550dip"
+        android:layout_gravity="top"/>
+
+    <!-- The workspace contains 5 screens of cells -->
+    <com.android.launcher2.Workspace
+        android:id="@+id/workspace"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="?android:attr/actionBarSize"
+        launcher:defaultScreen="2"
+        launcher:cellCountX="8"
+        launcher:cellCountY="7"
+        launcher:pageSpacing="64dip">
+
+        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
+    </com.android.launcher2.Workspace>
+
+    <RelativeLayout
+        android:id="@+id/all_apps_button_cluster"
+        android:layout_width="fill_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_gravity="top">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
+
+        <ImageView
+            android:id="@+id/configure_button"
+            android:src="@drawable/configure_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
+
+            android:onClick="onClickConfigureButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <TextView
+            android:id="@+id/all_apps_button"
+            android:text="@string/all_apps_button_label"
+            android:background="@drawable/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@id/configure_button"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
+            android:textSize="18dip"
+
+            android:onClick="onClickAllAppsButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <!-- The button to bring up the installed app market.
+             The icon for this button will be dynamically set. -->
+        <ImageView
+            android:id="@+id/market_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:onClick="onClickAppMarketButton"
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone"/>
+
+        <com.android.launcher2.DeleteZone
+            android:id="@+id/delete_zone"
+            android:src="@drawable/delete_zone_selector"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:visibility="gone"
+            launcher:direction="horizontal" />
+
+        <com.android.launcher2.ApplicationInfoDropTarget
+            android:id="@+id/info_button"
+            android:src="@drawable/info_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/configure_button"
+
+            android:visibility="gone"
+            android:focusable="true"
+            android:clickable="true" />
+
+    </RelativeLayout>
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="500dip"
+        android:layout_gravity="bottom">
+        <LinearLayout
+            android:orientation="vertical"
+            android:background="#40000000"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:tabStripEnabled="false"
+                android:paddingBottom="10dp" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+             </FrameLayout>
+          </LinearLayout>
+    </TabHost>
+</com.android.launcher2.DragLayer>
diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml
index 2ff0447..6675adc 100644
--- a/res/layout-xlarge-port/all_apps_tabbed.xml
+++ b/res/layout-xlarge-port/all_apps_tabbed.xml
@@ -16,7 +16,6 @@
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:background="#30000000"
     android:paddingTop="?android:attr/actionBarSize">
     <LinearLayout
         android:orientation="vertical"
@@ -37,8 +36,8 @@
                 android:id="@+id/all_apps_paged_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                launcher:cellCountX="7"
-                launcher:cellCountY="4"
+                launcher:cellCountX="5"
+                launcher:cellCountY="7"
                 launcher:pageLayoutPaddingTop="10dp"
                 launcher:pageLayoutPaddingBottom="10dp"
                 launcher:pageLayoutPaddingLeft="0dp"
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index db264b2..20c207f 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -20,9 +20,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:widgetCellCountX="12"
-    launcher:cellCountX="7"
+    launcher:cellCountX="5"
     launcher:cellCountY="4"
-    launcher:pageLayoutPaddingTop="10dp"
-    launcher:pageLayoutPaddingBottom="15dp"
+    launcher:pageLayoutPaddingTop="15dp"
+    launcher:pageLayoutPaddingBottom="25dp"
     launcher:pageLayoutPaddingLeft="0dp"
     launcher:pageLayoutPaddingRight="0dp" />
\ No newline at end of file
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
new file mode 100644
index 0000000..a418b36
--- /dev/null
+++ b/res/layout-xlarge-port/launcher.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.android.launcher2.DragLayer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:id="@+id/drag_layer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="1000dip"
+        android:layout_gravity="top"/>
+
+    <!-- The workspace contains 5 screens of cells -->
+    <com.android.launcher2.Workspace
+        android:id="@+id/workspace"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="?android:attr/actionBarSize"
+        launcher:defaultScreen="2"
+        launcher:cellCountX="8"
+        launcher:cellCountY="7"
+        launcher:pageSpacing="64dip">
+
+        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
+    </com.android.launcher2.Workspace>
+
+    <RelativeLayout
+        android:id="@+id/all_apps_button_cluster"
+        android:layout_width="fill_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_gravity="top">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
+
+        <ImageView
+            android:id="@+id/configure_button"
+            android:src="@drawable/configure_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
+
+            android:onClick="onClickConfigureButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <TextView
+            android:id="@+id/all_apps_button"
+            android:text="@string/all_apps_button_label"
+            android:background="@drawable/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@id/configure_button"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
+            android:layout_marginRight="@dimen/toolbar_button_spacing"
+            android:textSize="18dip"
+
+            android:onClick="onClickAllAppsButton"
+            android:focusable="true"
+            android:clickable="true" />
+
+        <!-- The button to bring up the installed app market.
+             The icon for this button will be dynamically set. -->
+        <ImageView
+            android:id="@+id/market_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:onClick="onClickAppMarketButton"
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone"/>
+
+        <com.android.launcher2.DeleteZone
+            android:id="@+id/delete_zone"
+            android:src="@drawable/delete_zone_selector"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:visibility="gone"
+            launcher:direction="horizontal" />
+
+        <com.android.launcher2.ApplicationInfoDropTarget
+            android:id="@+id/info_button"
+            android:src="@drawable/info_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/configure_button"
+
+            android:visibility="gone"
+            android:focusable="true"
+            android:clickable="true" />
+
+    </RelativeLayout>
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="550dip"
+        android:layout_gravity="bottom">
+        <LinearLayout
+            android:orientation="vertical"
+            android:background="#40000000"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:tabStripEnabled="false"
+                android:paddingBottom="10dp" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+             </FrameLayout>
+          </LinearLayout>
+    </TabHost>
+</com.android.launcher2.DragLayer>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
deleted file mode 100644
index 65f29df..0000000
--- a/res/layout-xlarge/launcher.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.android.launcher2.DragLayer
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:id="@+id/drag_layer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        layout="@layout/all_apps_tabbed"
-        android:id="@+id/all_apps_view"
-        android:layout_width="match_parent"
-        android:layout_height="550dip"
-        android:layout_gravity="top"/>
-
-    <!-- The workspace contains 5 screens of cells -->
-    <com.android.launcher2.Workspace
-        android:id="@+id/workspace"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="?android:attr/actionBarSize"
-        launcher:defaultScreen="2"
-        launcher:cellCountX="8"
-        launcher:cellCountY="7"
-        launcher:pageSpacing="64dip">
-
-        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.android.launcher2.Workspace>
-
-    <RelativeLayout
-        android:id="@+id/all_apps_button_cluster"
-        android:layout_width="fill_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_gravity="top">
-
-        <ImageView
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="left"
-            android:layout_marginLeft="@dimen/toolbar_button_spacing"
-
-            android:onClick="onClickSearchButton"
-            android:focusable="true"
-            android:clickable="true"/>
-
-        <ImageView
-            android:id="@+id/configure_button"
-            android:src="@drawable/configure_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="@dimen/toolbar_button_spacing"
-            android:layout_marginRight="@dimen/toolbar_button_spacing"
-
-            android:onClick="onClickConfigureButton"
-            android:focusable="true"
-            android:clickable="true" />
-
-        <TextView
-            android:id="@+id/all_apps_button"
-            android:text="@string/all_apps_button_label"
-            android:background="@drawable/all_apps_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/configure_button"
-            android:layout_marginLeft="@dimen/toolbar_button_spacing"
-            android:layout_marginRight="@dimen/toolbar_button_spacing"
-            android:textSize="18dip"
-
-            android:onClick="onClickAllAppsButton"
-            android:focusable="true"
-            android:clickable="true" />
-
-        <!-- The button to bring up the installed app market.
-             The icon for this button will be dynamically set. -->
-        <ImageView
-            android:id="@+id/market_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignLeft="@id/all_apps_button"
-
-            android:onClick="onClickAppMarketButton"
-            android:focusable="false"
-            android:clickable="false"
-            android:visibility="gone"/>
-
-        <com.android.launcher2.DeleteZone
-            android:id="@+id/delete_zone"
-            android:src="@drawable/delete_zone_selector"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignLeft="@id/all_apps_button"
-
-            android:visibility="gone"
-            launcher:direction="horizontal" />
-
-        <com.android.launcher2.ApplicationInfoDropTarget
-            android:id="@+id/info_button"
-            android:src="@drawable/info_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignLeft="@id/configure_button"
-
-            android:visibility="gone"
-            android:focusable="true"
-            android:clickable="true" />
-
-    </RelativeLayout>
-
-    <TabHost
-        android:id="@android:id/tabhost"
-        android:layout_width="match_parent"
-        android:layout_height="500dip"
-        android:layout_gravity="bottom">
-        <LinearLayout
-            android:orientation="vertical"
-            android:background="#40000000"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:tabStripEnabled="false"
-                android:paddingBottom="10dp" />
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-             </FrameLayout>
-          </LinearLayout>
-    </TabHost>
-</com.android.launcher2.DragLayer>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bcb7e9a..4f74b59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -69,7 +69,7 @@
 
     <!-- Customization Drawer -->
     <!-- The format string for the dimensions of a widget in the drawer -->
-    <string name="widget_dims_format">%1$d x %2$d</string>
+    <string name="widget_dims_format" translatable="false">%1$d x %2$d</string>
 
     <!-- Folders -->
     <skip />
-- 
cgit v1.1


From 4be866d3a1665aa2098cb5d38d535b1ad1aab6d6 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Sun, 10 Oct 2010 11:26:02 -0700
Subject: fix 3029324: Implement new drag feedback

Add "shrinkwrap" icon outlines to visualize where the item will land
---
 res/values/colors.xml | 1 +
 res/values/config.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 24e1b67..3e964c4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,4 +32,5 @@
     <color name="app_info_filter">#A50000FE</color>
     <color name="dimmed_view_color">#FF7F7F7F</color>
 
+    <color name="drag_outline_color">#9DBE12</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b6d5037..9dee154 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -23,5 +23,5 @@
     <integer name="config_dragOutlineFadeTime">900</integer>
 
     <!-- The alpha value at which to show the most recent drop visualization outline. -->
-    <integer name="config_dragOutlineMaxAlpha">180</integer>
+    <integer name="config_dragOutlineMaxAlpha">128</integer>
 </resources>
-- 
cgit v1.1


From 9678557e66afe9c76103119df30ee13bf79581df Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 14 Oct 2010 13:37:13 -0700
Subject: Adding message when there are no icons in a particular tab.

Change-Id: Icbf122d10d07fcacb8a4429431ea389826a3d173
---
 res/drawable-xlarge/ic_no_applications.png         | Bin 0 -> 3190 bytes
 .../all_apps_no_items_placeholder.xml              |  36 +++++++++++++++++++++
 .../customize_paged_view_wallpaper_placeholder.xml |  36 ---------------------
 res/values/strings.xml                             |   6 ++++
 4 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 res/drawable-xlarge/ic_no_applications.png
 create mode 100644 res/layout-xlarge/all_apps_no_items_placeholder.xml
 delete mode 100644 res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml

(limited to 'res')

diff --git a/res/drawable-xlarge/ic_no_applications.png b/res/drawable-xlarge/ic_no_applications.png
new file mode 100644
index 0000000..a4f695a
Binary files /dev/null and b/res/drawable-xlarge/ic_no_applications.png differ
diff --git a/res/layout-xlarge/all_apps_no_items_placeholder.xml b/res/layout-xlarge/all_apps_no_items_placeholder.xml
new file mode 100644
index 0000000..f5ecdec
--- /dev/null
+++ b/res/layout-xlarge/all_apps_no_items_placeholder.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:id="@+id/no_items_icon"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:paddingTop="2dip"
+
+    android:textColor="#FFFFFFFF"
+    android:textSize="15sp"
+    android:shadowColor="#FF000000"
+    android:shadowDx="0.0"
+    android:shadowDy="1.0"
+    android:shadowRadius="1.0"
+    android:drawableLeft="@drawable/ic_no_applications"
+    android:drawablePadding="0dip"
+
+    android:maxLines="2"
+    android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml b/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
deleted file mode 100644
index 6112532..0000000
--- a/res/layout-xlarge/customize_paged_view_wallpaper_placeholder.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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:id="@+id/wallpaper_icon"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:paddingTop="2dip"
-
-    android:textColor="#FFFFFFFF"
-    android:textSize="14sp"
-    android:shadowColor="#FF000000"
-    android:shadowDx="0.0"
-    android:shadowDy="1.0"
-    android:shadowRadius="1.0"
-    android:drawableLeft="@drawable/ic_launcher_wallpaper"
-    android:drawablePadding="10dip"
-
-    android:maxLines="2"
-    android:fadingEdge="horizontal" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f74b59..8999282 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -67,6 +67,12 @@
     <!--  Tile of the tab for applications that were downloaded from market [CHAR_LIMIT=12] -->
     <string name="all_apps_tab_downloaded">Downloaded</string>
 
+    <!-- All Apps pane -->
+    <!-- Message to show when there are no games [CHAR_LIMIT=25] -->
+    <string name="all_apps_no_games">No games found.</string>
+    <!-- Message to show when there are no downloaded apps [CHAR_LIMIT=25] -->
+    <string name="all_apps_no_downloads">No downloaded apps found.</string>
+
     <!-- Customization Drawer -->
     <!-- The format string for the dimensions of a widget in the drawer -->
     <string name="widget_dims_format" translatable="false">%1$d x %2$d</string>
-- 
cgit v1.1


From 18014791be2e3f41080f0bf621c618e3f096c5c7 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 14 Oct 2010 09:01:34 -0700
Subject: Added bounce animation when item added to screens

Change-Id: I87d9e8545e2de588d083b48991d932eb904f6e3a
---
 res/values-xlarge/config.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'res')

diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 73e7146..6a56679 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -36,4 +36,13 @@
          the drag view should be offset from the position of the original view. -->
     <integer name="config_dragViewOffsetX">0</integer>
     <integer name="config_dragViewOffsetY">12</integer>
+
+    <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation
+         of the bright green hover outline, and then fade out the outline at the end. These are
+         the values used in that animation -->
+    <integer name="config_screenOnDropScalePercent">120</integer>
+    <integer name="config_screenOnDropScaleUpDuration">200</integer>
+    <integer name="config_screenOnDropScaleDownDuration">200</integer>
+    <integer name="config_screenOnDropAlphaFadeDelay">350</integer>
+    <integer name="config_screenOnDropAlphaFadeDuration">50</integer>
 </resources>
-- 
cgit v1.1


From ce34a9768b01115def95f000a6a8f35870f10d3a Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Tue, 19 Oct 2010 10:34:32 -0700
Subject: Animate items into place when dropping on home screen

---
 res/values/config.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'res')

diff --git a/res/values/config.xml b/res/values/config.xml
index 9dee154..9350ad1 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -24,4 +24,12 @@
 
     <!-- The alpha value at which to show the most recent drop visualization outline. -->
     <integer name="config_dragOutlineMaxAlpha">128</integer>
+
+    <!-- Parameters controlling the animation for when an item is dropped on the home screen,
+         and it animates from its old position to the new one. -->
+
+    <integer name="config_dropAnimMaxDuration">400</integer>
+
+    <!-- The distance at which the animation should take the max duration -->
+    <integer name="config_dropAnimMaxDist">800</integer>
 </resources>
-- 
cgit v1.1


From df4b83dd9d6380ab963c62d1f9d1312efc87cb0f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 20 Oct 2010 17:49:27 -0700
Subject: More spacing changes for AllApps.

- Also testing a simple scale of existing icons in lieu of high res icons.

Change-Id: Ib9758064536cd1b1704344ea885bccdc93dd3466
---
 res/layout-xlarge-land/all_apps_tabbed.xml            | 16 ++++++++--------
 res/layout-xlarge-land/launcher.xml                   |  2 +-
 res/layout-xlarge-port/all_apps_tabbed.xml            | 11 ++++++-----
 res/layout-xlarge-port/customization_drawer.xml       |  4 ++--
 res/layout-xlarge-port/launcher.xml                   |  2 +-
 res/layout-xlarge/all_apps_paged_view_application.xml |  3 ++-
 res/values-xlarge/dimens.xml                          |  3 ++-
 res/values/attrs.xml                                  |  5 +++++
 8 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index 3a07b95..fd9d9cb 100644
--- a/res/layout-xlarge-land/all_apps_tabbed.xml
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -15,8 +15,7 @@
 -->
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:paddingTop="?android:attr/actionBarSize">
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -26,8 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:tabStripEnabled="false"
-            android:paddingBottom="10dp" />
+            android:tabStripEnabled="false" />
         <FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="match_parent"
@@ -37,11 +35,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 launcher:cellCountX="7"
-                launcher:cellCountY="4"
-                launcher:pageLayoutPaddingTop="10dp"
+                launcher:cellCountY="5"
+                launcher:pageLayoutWidthGap="36dp"
+                launcher:pageLayoutHeightGap="6dp"
+                launcher:pageLayoutPaddingTop="0dp"
                 launcher:pageLayoutPaddingBottom="15dp"
-                launcher:pageLayoutPaddingLeft="20dp"
-                launcher:pageLayoutPaddingRight="20dp">
+                launcher:pageLayoutPaddingLeft="40dp"
+                launcher:pageLayoutPaddingRight="40dp">
             </com.android.launcher2.AllAppsPagedView>
         </FrameLayout>
     </LinearLayout>
diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index 65f29df..0ef946f 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="550dip"
+        android:layout_height="600dip"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml
index 6675adc..d61c979 100644
--- a/res/layout-xlarge-port/all_apps_tabbed.xml
+++ b/res/layout-xlarge-port/all_apps_tabbed.xml
@@ -26,8 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:tabStripEnabled="false"
-            android:paddingBottom="10dp" />
+            android:tabStripEnabled="false" />
         <FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="match_parent"
@@ -38,10 +37,12 @@
                 android:layout_height="match_parent"
                 launcher:cellCountX="5"
                 launcher:cellCountY="7"
-                launcher:pageLayoutPaddingTop="10dp"
+                launcher:pageLayoutWidthGap="36dp"
+                launcher:pageLayoutHeightGap="36dp"
+                launcher:pageLayoutPaddingTop="0dp"
                 launcher:pageLayoutPaddingBottom="10dp"
-                launcher:pageLayoutPaddingLeft="0dp"
-                launcher:pageLayoutPaddingRight="0dp">
+                launcher:pageLayoutPaddingLeft="20dp"
+                launcher:pageLayoutPaddingRight="20dp">
             </com.android.launcher2.AllAppsPagedView>
         </FrameLayout>
     </LinearLayout>
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index 20c207f..53d1f6f 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -24,5 +24,5 @@
     launcher:cellCountY="4"
     launcher:pageLayoutPaddingTop="15dp"
     launcher:pageLayoutPaddingBottom="25dp"
-    launcher:pageLayoutPaddingLeft="0dp"
-    launcher:pageLayoutPaddingRight="0dp" />
\ No newline at end of file
+    launcher:pageLayoutPaddingLeft="15dp"
+    launcher:pageLayoutPaddingRight="15dp" />
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index a418b36..df7abc1 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="1000dip"
+        android:layout_height="1040dip"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index 8e53e06..f687739 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -22,6 +22,7 @@
     launcher:outlineColor="#FF8CD2FF"
     launcher:checkedBlurColor="#FFBBE83C"
     launcher:checkedOutlineColor="#FF8CD2FF"
+    launcher:scaledIconSize="64dp"
 
     android:id="@+id/application_icon"
     android:layout_width="match_parent"
@@ -30,7 +31,7 @@
     android:paddingTop="2dip"
 
     android:textColor="#FFFFFFFF"
-    android:textSize="14sp"
+    android:textSize="13sp"
     android:shadowColor="#FF000000"
     android:shadowDx="0.0"
     android:shadowDy="1.0"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 4662aad..ecc6f3a 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -23,7 +23,8 @@
     <dimen name="smallScreenExtraSpacing">0dip</dimen>
 
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
-    <dimen name="smallScreenVerticalMargin">60dip</dimen>
+    <dimen name="smallScreenVerticalMarginLandscape">30dip</dimen>
+    <dimen name="smallScreenVerticalMarginPortrait">60dip</dimen>
 
     <dimen name="toolbar_padding">10dip</dimen>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 14a5e98..a0e2706 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -66,6 +66,8 @@
         <attr name="checkedBlurColor" format="color" />
         <!-- The checked outline color of the holographic outline -->
         <attr name="checkedOutlineColor" format="color" />
+        <!-- The scaled icon dimension -->
+        <attr name="scaledIconSize" format="dimension" />
     </declare-styleable>
 
     <!-- PagedViewWidgetIcon specific attributes. These attributes are used to
@@ -84,6 +86,9 @@
         <attr name="cellCountX" />
         <!-- The number of vertical cells in a page -->
         <attr name="cellCountY" />
+        <!-- A spacing override for the icons within a page -->
+        <attr name="pageLayoutWidthGap" format="dimension" />
+        <attr name="pageLayoutHeightGap" format="dimension" />
         <!-- The padding of the pages that are dynamically created per page -->
         <attr name="pageLayoutPaddingTop" format="dimension" />
         <attr name="pageLayoutPaddingBottom" format="dimension" />
-- 
cgit v1.1


From ef0066b52d2754ca0553ec79613c650b5649afaa Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 21 Oct 2010 11:55:00 -0700
Subject: More spacing changes to Customization Drawer.

Change-Id: Ie51a0a5da6169b0651e9f70cfb28450254cf0df1
---
 res/layout-xlarge-port/customization_drawer.xml   | 12 +++++++-----
 res/layout-xlarge-port/launcher.xml               |  4 ++--
 res/layout-xlarge/customize_paged_view_widget.xml |  3 +--
 res/values-xlarge/dimens.xml                      | 12 +++++++++---
 4 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index 53d1f6f..d3ca457 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -19,10 +19,12 @@
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    launcher:widgetCellCountX="12"
+    launcher:widgetCellCountX="10"
     launcher:cellCountX="5"
-    launcher:cellCountY="4"
-    launcher:pageLayoutPaddingTop="15dp"
+    launcher:cellCountY="5"
+    launcher:pageLayoutWidthGap="36dp"
+    launcher:pageLayoutHeightGap="36dp"
+    launcher:pageLayoutPaddingTop="25dp"
     launcher:pageLayoutPaddingBottom="25dp"
-    launcher:pageLayoutPaddingLeft="15dp"
-    launcher:pageLayoutPaddingRight="15dp" />
+    launcher:pageLayoutPaddingLeft="20dp"
+    launcher:pageLayoutPaddingRight="20dp" />
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index df7abc1..20debca 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -131,7 +131,7 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="550dip"
+        android:layout_height="800dip"
         android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
@@ -148,7 +148,7 @@
             <FrameLayout
                 android:id="@android:id/tabcontent"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="650dp">
              </FrameLayout>
           </LinearLayout>
     </TabHost>
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
index e8f4ac9..cfc0ca0 100644
--- a/res/layout-xlarge/customize_paged_view_widget.xml
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -18,10 +18,9 @@
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="425dp"
     android:paddingLeft="12.5dp"
     android:paddingRight="12.5dp"
-    android:paddingTop="40dp"
     android:paddingBottom="50dp"
     android:gravity="top"
     android:orientation="vertical"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index ecc6f3a..bfab155 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -22,9 +22,15 @@
          apps and in customization mode -->
     <dimen name="smallScreenExtraSpacing">0dip</dimen>
 
-    <!-- vertical spacing between edge of screen and mini screen thumbnails -->
-    <dimen name="smallScreenVerticalMarginLandscape">30dip</dimen>
-    <dimen name="smallScreenVerticalMarginPortrait">60dip</dimen>
+    <!-- Vertical spacing between edge of screen and mini cell layouts when they
+         are minimized to the bottom in all apps -->
+    <dimen name="allAppsSmallScreenVerticalMarginLandscape">30dip</dimen>
+    <dimen name="allAppsSmallScreenVerticalMarginPortrait">60dip</dimen>
+
+    <!-- Vertical spacing between edge of screen and mini cell layouts when they
+         are minimized to the top when the customization drawer is showing -->
+    <dimen name="customizeSmallScreenVerticalMarginLandscape">70dip</dimen>
+    <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen>
 
     <dimen name="toolbar_padding">10dip</dimen>
 
-- 
cgit v1.1


From ece7f5b3b55cab646941123e03589241a61678e2 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 22 Oct 2010 14:54:12 -0700
Subject: Altering homescreen spacing to match design.

Change-Id: I8b859992fe843d0cf688cb84bcbaab6dbeccb6fb
---
 res/layout-xlarge-land/launcher.xml         |  2 +-
 res/layout-xlarge-land/workspace_screen.xml |  2 ++
 res/layout-xlarge-port/workspace_screen.xml | 10 ++++++----
 res/values-xlarge-land/dimens.xml           |  4 ++++
 res/values-xlarge-port/dimens.xml           | 21 +++++++++++++++++++++
 res/values-xlarge/dimens.xml                |  8 ++++++--
 res/values/attrs.xml                        |  6 ++++++
 7 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 res/values-xlarge-port/dimens.xml

(limited to 'res')

diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index 0ef946f..f42d72b 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -38,7 +38,7 @@
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7"
-        launcher:pageSpacing="64dip">
+        launcher:pageSpacing="32dip">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
index f358443..38dab82 100644
--- a/res/layout-xlarge-land/workspace_screen.xml
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -24,6 +24,8 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:widthGap="@dimen/workspace_width_gap"
+    launcher:heightGap="@dimen/workspace_height_gap"
     launcher:yAxisStartPadding="40dip"
     launcher:yAxisEndPadding="40dip"
     launcher:xAxisStartPadding="40dip"
diff --git a/res/layout-xlarge-port/workspace_screen.xml b/res/layout-xlarge-port/workspace_screen.xml
index 7314e60..406441d 100644
--- a/res/layout-xlarge-port/workspace_screen.xml
+++ b/res/layout-xlarge-port/workspace_screen.xml
@@ -24,7 +24,9 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="40dip"
-    launcher:yAxisEndPadding="40dip"
-    launcher:xAxisStartPadding="40dip"
-    launcher:xAxisEndPadding="40dip"/>
+    launcher:widthGap="@dimen/workspace_width_gap"
+    launcher:heightGap="@dimen/workspace_height_gap"
+    launcher:yAxisStartPadding="25dip"
+    launcher:yAxisEndPadding="25dip"
+    launcher:xAxisStartPadding="15dip"
+    launcher:xAxisEndPadding="15dip"/>
diff --git a/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml
index d1140c0..f8ebb3f 100644
--- a/res/values-xlarge-land/dimens.xml
+++ b/res/values-xlarge-land/dimens.xml
@@ -18,4 +18,8 @@
     <!-- the area at the edge of the screen that makes the workspace go left
          or right while you're dragging. -->
     <dimen name="scroll_zone">160dip</dimen>
+
+    <!-- Width/height gap overrides for the workspace -->
+    <dimen name="workspace_width_gap">16dp</dimen>
+    <dimen name="workspace_height_gap">0dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml
new file mode 100644
index 0000000..3117df9
--- /dev/null
+++ b/res/values-xlarge-port/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<resources>
+    <!-- Width/height gap overrides for the workspace -->
+    <dimen name="workspace_width_gap">0dp</dimen>
+    <dimen name="workspace_height_gap">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index bfab155..a84926d 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -15,8 +15,12 @@
 -->
 
 <resources>
-    <dimen name="workspace_cell_width">76dip</dimen>
-    <dimen name="workspace_cell_height">76dip</dimen>
+    <dimen name="workspace_cell_width">96dip</dimen>
+    <dimen name="workspace_cell_height">96dip</dimen>
+
+    <!-- Width/height gap overrides for the workspace -->
+    <dimen name="workspace_width_gap">0dp</dimen>
+    <dimen name="workspace_height_gap">0dp</dimen>
 
     <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a0e2706..6189f1c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -53,6 +53,12 @@
         <attr name="yAxisStartPadding" format="dimension"  />
         <!-- Padding to apply at the end of the short axis -->
         <attr name="yAxisEndPadding" format="dimension"  />
+        <!-- An override for the width and height gap to allow users to specify
+             a specific size for the page using spacing instead of resolving the
+             spacing from the width of the page -->
+        <attr name="widthGap" format="dimension" />
+        <attr name="heightGap" format="dimension" />
+
     </declare-styleable>
 
     <!-- PagedViewIcon specific attributes. These attributes are used to customize
-- 
cgit v1.1


From 0f640fce05df448604c0d6bed3eb0e756e4b1b43 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 27 Oct 2010 14:33:07 -0700
Subject: Import revised translations.

Change-Id: Idf7ef6a9edc4c63d38640fe1542d6e280cca2140
---
 res/values-cs/strings.xml     | 26 ++++++++++++++------------
 res/values-da/strings.xml     | 26 ++++++++++++++------------
 res/values-de/strings.xml     | 28 +++++++++++++++-------------
 res/values-el/strings.xml     | 26 ++++++++++++++------------
 res/values-es-rUS/strings.xml | 26 +++++++++++++-------------
 res/values-es/strings.xml     | 26 ++++++++++++++------------
 res/values-fr/strings.xml     | 26 ++++++++++++++------------
 res/values-it/strings.xml     | 26 ++++++++++++++------------
 res/values-ja/strings.xml     | 26 ++++++++++++++------------
 res/values-ko/strings.xml     | 26 ++++++++++++++------------
 res/values-nb/strings.xml     | 26 ++++++++++++++------------
 res/values-nl/strings.xml     | 26 ++++++++++++++------------
 res/values-pl/strings.xml     | 26 ++++++++++++++------------
 res/values-pt-rPT/strings.xml | 26 ++++++++++++++------------
 res/values-pt/strings.xml     | 26 ++++++++++++++------------
 res/values-rm/strings.xml     | 18 +++++++++++++++---
 res/values-ru/strings.xml     | 26 ++++++++++++++------------
 res/values-sv/strings.xml     | 26 ++++++++++++++------------
 res/values-tr/strings.xml     | 26 ++++++++++++++------------
 res/values-zh-rCN/strings.xml | 26 ++++++++++++++------------
 res/values-zh-rTW/strings.xml | 28 +++++++++++++++-------------
 21 files changed, 296 insertions(+), 246 deletions(-)

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b127e1e..e938b73 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurace..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgety"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Složky"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Další"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Zástupci aplikací"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Vše"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikace"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Hry"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Stažené"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Název složky"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Přejmenovat složku"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Zástupce <xliff:g id="NAME">%s</xliff:g> byl odebrán."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Zástupce <xliff:g id="NAME">%s</xliff:g> již existuje."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Vyberte zástupce"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Výběr aplikace"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Vybrat složku"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Všechny aplikace"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Aplikace"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Plocha"</string>
     <string name="menu_add" msgid="3065046628354640854">"Přidat"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Spravovat aplikace"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
     <string name="menu_search" msgid="4826514464423239041">"Hledat"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Oznámení"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesta"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Nastavení"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odinstalovat aplikaci"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Podrobnosti o aplikaci"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Vybrána 1 aplikace"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Vybrán 1 widget"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Vybrána 1 složka"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Vybrán 1 zástupce"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalovat zástupce"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Povoluje aplikaci přidat zástupce bez zásahu uživatele."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"odinstalovat zástupce"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c3b069e..576abce 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer ..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Flere"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapeter"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Programgenvej"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er fanen for tapeter"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spil"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Downloadet"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Omdøb mappe"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" blev fjernet."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" findes allerede."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Vælg genvej"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Vælg program"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Vælg mappe"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Alle programmer"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Programmer"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Start"</string>
     <string name="menu_add" msgid="3065046628354640854">"Tilføj"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrer programmer"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapet"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søg"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Meddelelser"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestus"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Indstillinger"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Afinstaller program"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Programoplysninger"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 program er valgt"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget er valgt"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mappe er valgt"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 genvej er valgt"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installer genveje"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Tillader, at et program tilføjer genveje uden brugerindgriben."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"afinstaller genveje"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6b5401f..575db07 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurieren..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Ordner"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Mehr"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergründe"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"App-Verknüpfungen"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergründe\""</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Anwendungen"</string>
+    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spiele"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Heruntergeladen"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Ordnername"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Ordner umbenennen"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"\"<xliff:g id="NAME">%s</xliff:g>\"-Verknüpfung wurde entfernt."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"\"<xliff:g id="NAME">%s</xliff:g>\"-Verknüpfung ist bereits vorhanden."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Tastenkürzel auswählen"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Anwendung auswählen"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Ordner auswählen"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Alle Anwendungen"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Anwendungen"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startseite"</string>
     <string name="menu_add" msgid="3065046628354640854">"Hinzufügen"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Apps verwalten"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Hintergrund"</string>
     <string name="menu_search" msgid="4826514464423239041">"Suchen"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Benachrichtigungen"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Bewegungen"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Einstellungen"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Anwendung deinstallieren"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Anwendungsdetails"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 Anwendung ausgewählt"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 Widget ausgewählt"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 Ordner ausgewählt"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 Verknüpfung ausgewählt"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"Verknüpfungen installieren"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Ermöglicht einer Anwendung das Hinzufügen von Verknüpfungen ohne Eingriff des Nutzers."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"Verknüpfungen deinstallieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 9326a93..0937c5b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Διαμόρφωση..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Γραφικά στοιχεία"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Φάκελοι"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Περισσότερα"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ταπετσαρίες"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Συντομεύσεις Εφαρμογών"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Αυτή θα είναι η καρτέλα ταπετσαριών"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Κάθε ηλικία"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Εφαρμογές"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Παιχνίδια"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Η λήψη ολοκληρώθηκε"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Όνομα φακέλου"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Μετονομασία φακέλου"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" καταργήθηκε."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" υπάρχει ήδη."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Επιλογή συντόμευσης"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Επιλέξτε εφαρμογή"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Επιλογή φακέλου"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Όλες οι εφαρμογές"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Εφαρμογές"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Αρχική σελίδα"</string>
     <string name="menu_add" msgid="3065046628354640854">"Προσθήκη"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Διαχείριση εφαρμογών"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Ταπετσαρία"</string>
     <string name="menu_search" msgid="4826514464423239041">"Αναζήτηση"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Ειδοποιήσεις"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Χειρονομίες"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ρυθμίσεις"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Κατάργηση εγκατάστασης εφαρμογής"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Λεπτομέρειες εφαρμογής"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Επιλέχθηκε 1 εφαρμογή"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Επιλέχθηκε 1 γραφικό στοιχείο"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Επιλέχθηκε 1 φάκελος"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Επιλέχθηκε 1 συντόμευση"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"εγκατάσταση συντομεύσεων"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Επιτρέπει σε μια εφαρμογή την προσθήκη συντομεύσεων χωρίς την παρέμβαση του χρήστη."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"κατάργηση εγκατάστασης συντομεύσεων"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b4e65d0..d718936 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,18 +29,16 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Más"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papeles tapiz"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Accesos directos a aplicaciones"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ésta será la pestaña para los papeles tapiz"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Google Apps"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Descargado"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
-    <skip />
+    <string name="all_apps_no_games" msgid="5293893733372793696">"No"</string>
+    <string name="all_apps_no_downloads" msgid="6145042636084482299">"No  Google Apps"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
     <string name="rename_action" msgid="6016003384693240896">"Aceptar"</string>
@@ -60,21 +58,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ha sido eliminado."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Seleccionar acceso directo"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Seleccionar aplicación"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Seleccionar carpeta"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Todas las aplicaciones"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Google Apps"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Página principal"</string>
     <string name="menu_add" msgid="3065046628354640854">"Agregar"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrar aplicaciones"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Papel tapiz"</string>
     <string name="menu_search" msgid="4826514464423239041">"Buscar"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Configuración"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar la aplicación"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalles de la aplicación"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Se seleccionó 1 aplicación"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Se seleccionó 1 widget"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Se seleccionó 1 carpeta"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Se seleccionó 1 acceso directo"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite a una aplicación agregar accesos directos sin intervención del usuario."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar papel tapiz"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ecbe8af..ab0485a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Carpetas"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Más"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fondos de pantalla"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Accesos directos de aplicaciones"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Será la carpeta de fondos de pantalla."</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas las aplicaciones"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicaciones"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Descargadas"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Se ha eliminado el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Seleccionar acceso directo"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Seleccionar aplicación"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Seleccionar carpeta"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Todas las aplicaciones"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Aplicaciones"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Inicio"</string>
     <string name="menu_add" msgid="3065046628354640854">"Añadir"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrar aplicaciones"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fondo de pantalla"</string>
     <string name="menu_search" msgid="4826514464423239041">"Buscar con Google"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ajustes"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicación"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Información de la aplicación"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Se ha seleccionado una aplicación."</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Se ha seleccionado un widget."</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Se ha seleccionado una carpeta."</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Se ha seleccionado un acceso directo."</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que una aplicación añada accesos directos sin intervención del usuario."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar accesos directos"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c6d530d..35ee775 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurer..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Dossiers"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Plus"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fonds d\'écran"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Raccourcis des applications"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Onglet des fonds d\'écran"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Toutes"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applications"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Jeux"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Téléchargées"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nom du dossier"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renommer le dossier"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" a été supprimé."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" existe déjà."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Sélectionner un raccourci"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Sélection d\'une application"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Sélectionner le dossier"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Toutes les applications"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Applications"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Page d\'accueil"</string>
     <string name="menu_add" msgid="3065046628354640854">"Ajouter"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Gérer les applications"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fond d\'écran"</string>
     <string name="menu_search" msgid="4826514464423239041">"Rechercher"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notifications"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestes"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Paramètres"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Désinstaller l\'application"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Infos sur l\'application"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 application sélectionnée"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget sélectionné"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 dossier sélectionné"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 raccourci sélectionné"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installer des raccourcis"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permet à une application d\'ajouter des raccourcis sans l\'intervention de l\'utilisateur."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"désinstaller les raccourcis"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f25156a..7705763 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configura..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Cartelle"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Altro"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Scorciatoie applicazioni"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Tutte"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applicazioni"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Giochi"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Scaricate"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome cartella"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Rinomina cartella"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"La scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" è stata rimossa."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" già presente."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Seleziona scorciatoia"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Seleziona applicazione"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Seleziona cartella"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Tutte le applicazioni"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Applicazioni"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Home"</string>
     <string name="menu_add" msgid="3065046628354640854">"Aggiungi"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Gestisci applicazioni"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Sfondo"</string>
     <string name="menu_search" msgid="4826514464423239041">"Cerca"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notifiche"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesti"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Impostazioni"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Disinstalla applicazione"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Dettagli applicazione"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 applicazione selezionata"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget selezionato"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 cartella selezionata"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 scorciatoia selezionata"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"aggiungere scorciatoie"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Consente a un\'applicazione di aggiungere scorciatoie automaticamente."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"eliminare scorciatoie"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 98f042b..2a7a218 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"ウィジェット"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"フォルダ"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"その他"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁紙"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"アプリのショートカット"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ここが壁紙タブになります"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"すべて"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"アプリ"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"ゲーム"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"ダウンロード済み"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"フォルダ名"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"フォルダ名を変更"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を削除しました。"</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。"</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"ショートカットを選択"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"アプリを選択"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"フォルダの選択"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"すべてのアプリケーション"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"アプリ"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"ホーム"</string>
     <string name="menu_add" msgid="3065046628354640854">"追加"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"アプリの管理"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"壁紙"</string>
     <string name="menu_search" msgid="4826514464423239041">"検索"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"ジェスチャー"</string>
     <string name="menu_settings" msgid="6233960148378443661">"設定"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"アプリケーションのアンインストール"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"アプリケーションの詳細"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1つのアプリケーションが選択されています"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1つのウィジェットが選択されています"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1つのフォルダが選択されています"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1つのショートカットが選択されています"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"ショートカットのインストール"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"ユーザー操作なしでショートカットの追加をアプリケーションに許可します。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"ショートカットのアンインストール"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5213326..b23450d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"구성..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"위젯"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"폴더"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"더보기"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"배경화면"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"앱 바로가기"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"배경화면 탭이 됩니다."</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"모두"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"애플리케이션"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"게임"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"다운로드앱"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"폴더 이름"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"폴더 이름 바꾸기"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 삭제되었습니다."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 이미 있습니다."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"바로가기 선택"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"애플리케이션 선택"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"폴더 선택"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"모든 애플리케이션"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"애플리케이션"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"홈"</string>
     <string name="menu_add" msgid="3065046628354640854">"추가"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"애플리케이션 관리"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"배경화면"</string>
     <string name="menu_search" msgid="4826514464423239041">"검색"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"알림"</string>
     <string name="menu_gestures" msgid="514678675575912237">"동작"</string>
     <string name="menu_settings" msgid="6233960148378443661">"설정"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"애플리케이션 제거"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"애플리케이션 세부정보"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1개 애플리케이션 선택"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1개 위젯 선택"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1개 폴더 선택"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1개 바로가기 선택"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"바로가기 설치"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"애플리케이션이 사용자의 작업 없이 바로가기를 추가할 수 있도록 합니다."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"바로가기 제거"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0d24eb9..5026744 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer"</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Moduler"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mapper"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Mer"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrunner"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Programsnarveier"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er nå bakgrunnsfanen"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spill"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Nedlastet"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Gi nytt navn til mappe"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Fjernet snarveien «<xliff:g id="NAME">%s</xliff:g>»."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» fins allerede."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Velg snarvei"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Velg program"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Velg mappe"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Alle programmer"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Programmer"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startsiden"</string>
     <string name="menu_add" msgid="3065046628354640854">"Legg til"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrer programmer"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrunnsbilde"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søk"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Varslinger"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Bevegelser"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Innstillinger"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Avinstaller program"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Søknadsopplysninger"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 program valgt"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 modul valgt"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mappe valgt"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 snarvei valgt"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installere snarveier"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Lar applikasjonen legge til snarveier uten å involvere brukeren."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"avinstallere snarveier"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5a2a269..6562529 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configureren..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mappen"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Meer"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Achtergronden"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Toepassingssnelkoppelingen"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit wordt het tabblad \'Achtergronden\'"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Toepassingen"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Games"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Gedownload"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mapnaam"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Naam van map wijzigen"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' is verwijderd."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' bestaat al."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Snelkoppeling selecteren"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Toepassing selecteren"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Map selecteren"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Alle toepassingen"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Toepassingen"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startpagina"</string>
     <string name="menu_add" msgid="3065046628354640854">"Toevoegen"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Toepassingen beheren"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Achtergrond"</string>
     <string name="menu_search" msgid="4826514464423239041">"Zoeken"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Meldingen"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gebaren"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Instellingen"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Toepassing verwijderen"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Toepassingsdetails"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 toepassing geselecteerd"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget geselecteerd"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 map geselecteerd"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 snelkoppeling geselecteerd"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"snelkoppelingen installeren"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Een toepassing toestaan om snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"snelkoppelingen verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0c8e91b..f2ac81d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfiguruj..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widżety"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Foldery"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Więcej"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Skróty do aplikacji"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To będzie karta tapet"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Wszystkie"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikacje"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Gry"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Pobrane"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nazwa folderu"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Zmień nazwę folderu"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Skrót „<xliff:g id="NAME">%s</xliff:g>” został usunięty."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Skrót „<xliff:g id="NAME">%s</xliff:g>” już istnieje."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Wybierz skrót"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Wybierz aplikację"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Wybierz folder"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Wszystkie aplikacje"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Aplikacje"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Ekran główny"</string>
     <string name="menu_add" msgid="3065046628354640854">"Dodaj"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Zarządzaj aplikacjami"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
     <string name="menu_search" msgid="4826514464423239041">"Szukaj"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Powiadomienia"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gesty"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ustawienia"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odinstaluj aplikację"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Szczegóły aplikacji"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Zaznaczono 1 aplikację"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Zaznaczono 1 widżet"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Zaznaczono 1 folder"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Zaznaczono 1 skrót"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"zainstaluj skróty"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Umożliwia aplikacji dodawanie skrótów bez interwencji użytkownika."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"odinstaluj skróty"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cdff3bf..a3c432d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Mais"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagens de fundo"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Atalhos de aplicações"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Isto será o separador de imagens de fundo"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicações"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Transferidas"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Mudar o nome da pasta"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Seleccione o atalho"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Seleccionar aplicação"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Seleccione a pasta"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Todas as aplicações"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Aplicações"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
     <string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Gerir aplicações"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Imagem de fundo"</string>
     <string name="menu_search" msgid="4826514464423239041">"Pesquisar"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Definições"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicação"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalhes da aplicação"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 aplicação seleccionada"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget seleccionado"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 pasta seleccionada"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 atalho seleccionado"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que uma aplicação adicione atalhos sem a intervenção do utilizador."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bdebb87..3941c4f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Pastas"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Mais"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papéis de parede"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Atalhos de aplicativo"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Esta será a guia de papéis de parede"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicativos"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Download concluído"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Selecionar atalho"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Selecionar aplicativo"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Selecionar pasta"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Todos os aplicativos"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Aplicativos"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
     <string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Gerenciar aplicativos"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Plano de fundo"</string>
     <string name="menu_search" msgid="4826514464423239041">"Pesquisa"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gestos"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Configurações"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicativo"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalhes do aplicativo"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Um aplicativo selecionado"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Um widget selecionado"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Uma pasta selecionada"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Um atalho selecionado"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Permite que um aplicativo adicione os atalhos sem a intervenção do usuário."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 0e4e4da..10cbc4a 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -47,7 +47,9 @@
     <skip />
     <!-- no translation found for all_apps_tab_downloaded (2300935549064726963) -->
     <skip />
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Num da l\'ordinatur"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Renumnar l\'ordinatur"</string>
@@ -68,10 +70,14 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"\"La scursanida \"\"<xliff:g id="NAME">%s</xliff:g>\"\" è vegnida stizzada.\""</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"\"La scursanida \"\"<xliff:g id="NAME">%s</xliff:g>\"\" exista gia.\""</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Tscherner ina cumbinaziun da tastas"</string>
+    <!-- no translation found for title_select_application (8031072293115454221) -->
+    <skip />
     <string name="title_select_live_folder" msgid="3753447798805166749">"Tscherner l\'ordinatur"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Tut las applicaziuns"</string>
+    <!-- outdated translation 3953036962111614813 -->     <string name="all_apps_button_label" msgid="2578400570124163469">"Tut las applicaziuns"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Pagina da partenza"</string>
     <string name="menu_add" msgid="3065046628354640854">"Agiuntar"</string>
+    <!-- no translation found for menu_manage_apps (2308685199463588895) -->
+    <skip />
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fund davos"</string>
     <string name="menu_search" msgid="4826514464423239041">"Tschertgar"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Avis"</string>
@@ -81,7 +87,13 @@
     <skip />
     <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
     <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
+    <!-- no translation found for cab_app_selection_text (606113924828167756) -->
+    <skip />
+    <!-- no translation found for cab_widget_selection_text (962527270506951955) -->
+    <skip />
+    <!-- no translation found for cab_folder_selection_text (8916111874189565067) -->
+    <skip />
+    <!-- no translation found for cab_shortcut_selection_text (8115847384500412878) -->
     <skip />
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"Installar scursanidas"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Pussibilitescha ch\'ina applicaziun agiunta scursanidas senza l\'intervenziun da l\'utilisader."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bb87445..fd5b35d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Настроить..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Виджеты"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Папки"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Еще"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Обои"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Ярлыки приложений"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Это будет вкладка обоев"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Все"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Приложения"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Игры"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Загруженные"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Название папки"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Переименовать папку"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" удален."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" уже существует."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Выберите ярлык"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Выбор приложения"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Выбор папки"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Все приложения"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Приложения"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Главная"</string>
     <string name="menu_add" msgid="3065046628354640854">"Добавить"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Управление приложениями"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Обои"</string>
     <string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Жесты"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Настройки"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Удалить приложение"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Сведения о приложении"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"Выбрано 1 приложение"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"Выбран 1 виджет"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"Выбрана 1 папка"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Выбран 1 ярлык"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"устанавливать ярлыки"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Позволяет приложению добавлять ярлыки без вмешательства пользователя"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"удалять ярлыки"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index be6ee7f..17a6cdc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurera..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgetar"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Mappar"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Mer"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrundsbilder"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Genvägar för appar"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Det här kommer att vara fliken för bakgrundsbilder"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Alla"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Program"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spel"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"Hämtade"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappnamn"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Byt namn på mapp"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Genvägen \"<xliff:g id="NAME">%s</xliff:g>\" har tagits bort."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Genvägen \"<xliff:g id="NAME">%s</xliff:g>\" finns redan."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Välj genväg"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Välj program"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Välj mapp"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Alla program"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Program"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startsida"</string>
     <string name="menu_add" msgid="3065046628354640854">"Lägg till"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Hantera appar"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrund"</string>
     <string name="menu_search" msgid="4826514464423239041">"Sök"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Aviseringar"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Gester"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Inställningar"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Avinstallera program"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Programinformation"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 program har valts"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget vald"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mapp vald"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 genväg har valts"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"installera genvägar"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Tillåter att ett program lägger till genvägar utan åtgärd från användaren."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"avinstallera genvägar"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 59c816d..19417f0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"Yapılandır..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widget\'lar"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"Klasörler"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"Diğer"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Duvar Kağıtları"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"Uygulama Kısayolları"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Bu duvar kağıdı sekmesi olacaktır"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"Tümü"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"Uygulamalar"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Oyunlar"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"İndirilenler"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"Klasör adı"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Klasörü yeniden adlandır"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Kısayolu seçin"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Uygulama seç"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"Klasörü seçin"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"Tüm uygulamalar"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"Uygulamalar"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Ana Sayfa"</string>
     <string name="menu_add" msgid="3065046628354640854">"Ekle"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Uyglm yönet"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Duvar Kağıdı"</string>
     <string name="menu_search" msgid="4826514464423239041">"Ara"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Bildirimler"</string>
     <string name="menu_gestures" msgid="514678675575912237">"Hareketler"</string>
     <string name="menu_settings" msgid="6233960148378443661">"Ayarlar"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Uygulamanın yüklemesini kaldır"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"Uygulama ayrıntıları"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 uygulama seçildi"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget seçildi"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 klasör seçildi"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 kısayol seçildi"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"kısayolları yükle"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Bir uygulamaya, kısayolları kullanıcı müdahale etmeden ekleme izni verir."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"kısayolları kaldır"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 58f6178..751474b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,17 +29,17 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"配置..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"窗口小部件"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"文件夹"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"更多"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁纸"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"应用程序快捷方式"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"这将会成为壁纸标签"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"应用程序"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"游戏"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"已下载"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"文件夹名称"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重命名文件夹"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"选择快捷方式"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"选择应用程序"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"选择文件夹"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"所有应用程序"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"应用程序"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"主屏幕"</string>
     <string name="menu_add" msgid="3065046628354640854">"添加"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"管理应用程序"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"壁纸"</string>
     <string name="menu_search" msgid="4826514464423239041">"搜索"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"手势"</string>
     <string name="menu_settings" msgid="6233960148378443661">"设置"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"卸载应用程序"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"应用程序详细信息"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"已选中 1 个应用程序"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"已选中 1 个窗口小部件"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"已选中 1 个文件夹"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"已选中 1 个快捷方式"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"安装快捷方式"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"允许应用程序在没有用户介入的情况下添加快捷方式。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"卸载快捷方式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a7cd098..824ec64 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,23 +29,23 @@
     <string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"小工具"</string>
     <string name="folders_tab_label" msgid="1145293785541489736">"資料夾"</string>
-    <!-- no translation found for shortcuts_tab_label (8640731503933155644) -->
-    <skip />
+    <string name="shortcuts_tab_label" msgid="8640731503933155644">"更多選項"</string>
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
-    <!-- no translation found for applications_tab_label (9046797126882613707) -->
-    <skip />
+    <string name="applications_tab_label" msgid="9046797126882613707">"應用程式捷徑"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"桌布標籤保留位"</string>
     <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
     <string name="all_apps_tab_apps" msgid="5468972551904071712">"應用程式"</string>
     <string name="all_apps_tab_games" msgid="1855736784923494918">"遊戲"</string>
     <string name="all_apps_tab_downloaded" msgid="2300935549064726963">"下載內容"</string>
-    <!-- no translation found for widget_dims_format (412876472704567784) -->
+    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
+    <skip />
+    <!-- no translation found for all_apps_no_downloads (6145042636084482299) -->
     <skip />
     <string name="rename_folder_label" msgid="5646236631298452787">"資料夾名稱"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"重新命名資料夾"</string>
     <string name="rename_action" msgid="6016003384693240896">"確定"</string>
     <string name="cancel_action" msgid="3811860427489435048">"取消"</string>
-    <string name="menu_item_add_item" msgid="6233177331075781114">"新增至首頁畫面"</string>
+    <string name="menu_item_add_item" msgid="6233177331075781114">"新增至主畫面"</string>
     <string name="group_applications" msgid="4118484163419674240">"應用程式"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"捷徑"</string>
     <string name="group_folder" msgid="5143593791798929193">"新資料夾"</string>
@@ -60,21 +60,23 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已經存在。"</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"選取捷徑"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"選取應用程式"</string>
     <string name="title_select_live_folder" msgid="3753447798805166749">"選取資料夾"</string>
-    <string name="all_apps_button_label" msgid="3953036962111614813">"所有應用程式"</string>
+    <string name="all_apps_button_label" msgid="2578400570124163469">"應用程式"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"主螢幕"</string>
     <string name="menu_add" msgid="3065046628354640854">"新增"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"管理應用程式"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"桌布"</string>
     <string name="menu_search" msgid="4826514464423239041">"搜尋"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
     <string name="menu_gestures" msgid="514678675575912237">"觸控動作"</string>
     <string name="menu_settings" msgid="6233960148378443661">"設定"</string>
-    <!-- no translation found for cab_menu_delete_app (1242619904941293871) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (5180426909324882018) -->
-    <skip />
-    <!-- no translation found for cab_selection_text (8712157849499378915) -->
-    <skip />
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"解除安裝應用程式"</string>
+    <string name="cab_menu_app_info" msgid="5180426909324882018">"應用程式詳細資料"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"已選取 1 個應用程式"</string>
+    <string name="cab_widget_selection_text" msgid="962527270506951955">"已選取 1 個小工具"</string>
+    <string name="cab_folder_selection_text" msgid="8916111874189565067">"已選取 1 個資料夾"</string>
+    <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"已選取 1 個捷徑"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"安裝捷徑"</string>
     <string name="permdesc_install_shortcut" msgid="7429365847558984148">"允許應用程式自動新增快速鍵。"</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"解除安裝捷徑"</string>
-- 
cgit v1.1


From a9abd0e0bdedb5cbbd12b84cb83037a735e79a20 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 27 Oct 2010 17:18:37 -0700
Subject: Initial changes to allow dragging external shortcuts to launcher
 using the same InstallShortcut intent.

Change-Id: I21b57115429ed37d604084ae01308d1d3f33ee7e
---
 res/values-xlarge/dimens.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res')

diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index a84926d..a834a2e 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -22,6 +22,9 @@
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">0dp</dimen>
 
+    <!-- The corner radius to draw the external drop icon rounded rect -->
+    <dimen name="external_drop_icon_rect_radius">10dp</dimen>
+
     <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
     <dimen name="smallScreenExtraSpacing">0dip</dimen>
-- 
cgit v1.1


From 0e41ae6433b38ab84184aec4ae55bc909a95abbb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 27 Oct 2010 18:10:32 -0700
Subject: Increasing icons for homescreen as well as as all-apps (temporarily
 until we get hi-res icons).

- Also fixing spacing in the portrait mode, and using the same styles for both AllApps and workspace icons.

Change-Id: I222dd5d53a39d6940a85f40b57912b69c926ffd0
---
 res/layout-xlarge-land/workspace_screen.xml           |  4 ++--
 res/layout-xlarge/all_apps_paged_view_application.xml | 12 +-----------
 res/values-xlarge-land/dimens.xml                     |  2 +-
 res/values-xlarge-port/dimens.xml                     |  2 +-
 res/values-xlarge/dimens.xml                          |  3 +++
 res/values-xlarge/styles.xml                          |  4 ++--
 res/values/attrs.xml                                  |  2 --
 7 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'res')

diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
index 38dab82..64de05e 100644
--- a/res/layout-xlarge-land/workspace_screen.xml
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -26,7 +26,7 @@
     launcher:cellHeight="@dimen/workspace_cell_height"
     launcher:widthGap="@dimen/workspace_width_gap"
     launcher:heightGap="@dimen/workspace_height_gap"
-    launcher:yAxisStartPadding="40dip"
-    launcher:yAxisEndPadding="40dip"
+    launcher:yAxisStartPadding="25dip"
+    launcher:yAxisEndPadding="25dip"
     launcher:xAxisStartPadding="40dip"
     launcher:xAxisEndPadding="40dip" />
diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index f687739..48b5712 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -22,20 +22,10 @@
     launcher:outlineColor="#FF8CD2FF"
     launcher:checkedBlurColor="#FFBBE83C"
     launcher:checkedOutlineColor="#FF8CD2FF"
-    launcher:scaledIconSize="64dp"
 
     android:id="@+id/application_icon"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
-    android:paddingTop="2dip"
 
-    android:textColor="#FFFFFFFF"
-    android:textSize="13sp"
-    android:shadowColor="#FF000000"
-    android:shadowDx="0.0"
-    android:shadowDy="1.0"
-    android:shadowRadius="1.0"
-
-    android:maxLines="2"
-    android:fadingEdge="horizontal" />
+    style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml
index f8ebb3f..db31cf1 100644
--- a/res/values-xlarge-land/dimens.xml
+++ b/res/values-xlarge-land/dimens.xml
@@ -21,5 +21,5 @@
 
     <!-- Width/height gap overrides for the workspace -->
     <dimen name="workspace_width_gap">16dp</dimen>
-    <dimen name="workspace_height_gap">0dp</dimen>
+    <dimen name="workspace_height_gap">5dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml
index 3117df9..b60635b 100644
--- a/res/values-xlarge-port/dimens.xml
+++ b/res/values-xlarge-port/dimens.xml
@@ -17,5 +17,5 @@
 <resources>
     <!-- Width/height gap overrides for the workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
-    <dimen name="workspace_height_gap">16dp</dimen>
+    <dimen name="workspace_height_gap">32dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index a834a2e..aa602be 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -24,6 +24,9 @@
 
     <!-- The corner radius to draw the external drop icon rounded rect -->
     <dimen name="external_drop_icon_rect_radius">10dp</dimen>
+    
+    <!-- Temporary scaled icon size -->
+    <dimen name="temp_scaled_icon_size">72dp</dimen>
 
     <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 59301b9..bf79b4d 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -28,12 +28,12 @@
     </style>
 
     <style name="WorkspaceIcon.Portrait">
-        <item name="android:drawablePadding">4dip</item>
+        <item name="android:drawablePadding">0dip</item>
         <item name="android:paddingTop">1dip</item>
     </style>
 
     <style name="WorkspaceIcon.Landscape">
-        <item name="android:drawablePadding">4dip</item>
+        <item name="android:drawablePadding">0dip</item>
         <item name="android:paddingTop">1dip</item>
     </style>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6189f1c..5d6773c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -72,8 +72,6 @@
         <attr name="checkedBlurColor" format="color" />
         <!-- The checked outline color of the holographic outline -->
         <attr name="checkedOutlineColor" format="color" />
-        <!-- The scaled icon dimension -->
-        <attr name="scaledIconSize" format="dimension" />
     </declare-styleable>
 
     <!-- PagedViewWidgetIcon specific attributes. These attributes are used to
-- 
cgit v1.1


From 1b0aaac0b3abd777ed319341f95a8dfff23c79f4 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 28 Oct 2010 11:11:18 -0700
Subject: -> Made outline of current page fade out -> Added new assets for
 homescreen outlines

Change-Id: Ic19b32a749fd4109bd5601c8b220759aab56603c
---
 res/drawable-xlarge/home_screen_bg.9.png              | Bin 557 -> 643 bytes
 res/drawable-xlarge/home_screen_bg_hover.9.png        | Bin 244 -> 1600 bytes
 res/drawable-xlarge/mini_home_screen_bg.9.png         | Bin 4618 -> 3095 bytes
 .../mini_home_screen_bg_accepts_drops.9.png           | Bin 4702 -> 4595 bytes
 res/drawable-xlarge/mini_home_screen_bg_hover.9.png   | Bin 4742 -> 5103 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'res')

diff --git a/res/drawable-xlarge/home_screen_bg.9.png b/res/drawable-xlarge/home_screen_bg.9.png
index d939d5c..413e492 100644
Binary files a/res/drawable-xlarge/home_screen_bg.9.png and b/res/drawable-xlarge/home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge/home_screen_bg_hover.9.png b/res/drawable-xlarge/home_screen_bg_hover.9.png
index c85bcab..73696bf 100644
Binary files a/res/drawable-xlarge/home_screen_bg_hover.9.png and b/res/drawable-xlarge/home_screen_bg_hover.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg.9.png b/res/drawable-xlarge/mini_home_screen_bg.9.png
index e5b2d72..4602609 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg.9.png and b/res/drawable-xlarge/mini_home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png
index 4bd8637..b1aa98b 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png and b/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png
index fb0fb63..a30e992 100644
Binary files a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png and b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png differ
-- 
cgit v1.1


From 12b9fc767783feb95b33a3387b2c4405e1340b0f Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Thu, 28 Oct 2010 12:13:25 -0700
Subject: Cleaning assets to match designers' tree

Change-Id: Ia83ab4486a383362dcb1f19db302c252ee4734bb
---
 res/drawable-xlarge-mdpi/all_apps_button_focused.png   | Bin 0 -> 1107 bytes
 res/drawable-xlarge-mdpi/all_apps_button_normal.9.png  | Bin 0 -> 901 bytes
 res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png | Bin 0 -> 2100 bytes
 res/drawable-xlarge-mdpi/app_market_generic.png        | Bin 0 -> 2750 bytes
 res/drawable-xlarge-mdpi/configure_button_normal.png   | Bin 0 -> 1256 bytes
 res/drawable-xlarge-mdpi/configure_button_pressed.png  | Bin 0 -> 3162 bytes
 res/drawable-xlarge-mdpi/glow_wallpaper.png            | Bin 0 -> 782067 bytes
 res/drawable-xlarge-mdpi/glow_wallpaper_small.png      | Bin 0 -> 11585 bytes
 res/drawable-xlarge-mdpi/home_screen_bg.9.png          | Bin 0 -> 643 bytes
 res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png    | Bin 0 -> 1600 bytes
 res/drawable-xlarge-mdpi/ic_no_applications.png        | Bin 0 -> 3190 bytes
 res/drawable-xlarge-mdpi/info_button.png               | Bin 0 -> 2315 bytes
 res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png     | Bin 0 -> 3095 bytes
 .../mini_home_screen_bg_accepts_drops.9.png            | Bin 0 -> 4595 bytes
 .../mini_home_screen_bg_hover.9.png                    | Bin 0 -> 5103 bytes
 res/drawable-xlarge-mdpi/rotate_button_normal.png      | Bin 0 -> 6252 bytes
 res/drawable-xlarge-mdpi/rotate_button_pressed.png     | Bin 0 -> 6388 bytes
 res/drawable-xlarge-mdpi/search_button_normal.png      | Bin 0 -> 1067 bytes
 res/drawable-xlarge-mdpi/search_button_pressed.png     | Bin 0 -> 3706 bytes
 res/drawable-xlarge-mdpi/trashcan.png                  | Bin 0 -> 906 bytes
 res/drawable-xlarge-mdpi/trashcan_hover.png            | Bin 0 -> 542 bytes
 res/drawable-xlarge/all_apps_button_normal.9.png       | Bin 901 -> 0 bytes
 res/drawable-xlarge/all_apps_button_pressed.9.png      | Bin 2100 -> 0 bytes
 res/drawable-xlarge/app_market_generic.png             | Bin 2750 -> 0 bytes
 res/drawable-xlarge/configure_button_normal.png        | Bin 1256 -> 0 bytes
 res/drawable-xlarge/configure_button_pressed.png       | Bin 3162 -> 0 bytes
 res/drawable-xlarge/glow_wallpaper.png                 | Bin 782067 -> 0 bytes
 res/drawable-xlarge/glow_wallpaper_small.png           | Bin 11585 -> 0 bytes
 res/drawable-xlarge/home_screen_bg.9.png               | Bin 643 -> 0 bytes
 res/drawable-xlarge/home_screen_bg_hover.9.png         | Bin 1600 -> 0 bytes
 res/drawable-xlarge/ic_no_applications.png             | Bin 3190 -> 0 bytes
 res/drawable-xlarge/info_button.png                    | Bin 2315 -> 0 bytes
 res/drawable-xlarge/mini_home_screen_bg.9.png          | Bin 3095 -> 0 bytes
 .../mini_home_screen_bg_accepts_drops.9.png            | Bin 4595 -> 0 bytes
 res/drawable-xlarge/mini_home_screen_bg_hover.9.png    | Bin 5103 -> 0 bytes
 res/drawable-xlarge/rotate_button_normal.png           | Bin 6252 -> 0 bytes
 res/drawable-xlarge/rotate_button_pressed.png          | Bin 6388 -> 0 bytes
 res/drawable-xlarge/search_button_normal.png           | Bin 1067 -> 0 bytes
 res/drawable-xlarge/search_button_pressed.png          | Bin 3706 -> 0 bytes
 res/drawable-xlarge/trashcan.png                       | Bin 906 -> 0 bytes
 res/drawable-xlarge/trashcan_hover.png                 | Bin 542 -> 0 bytes
 41 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-xlarge-mdpi/all_apps_button_focused.png
 create mode 100644 res/drawable-xlarge-mdpi/all_apps_button_normal.9.png
 create mode 100644 res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png
 create mode 100644 res/drawable-xlarge-mdpi/app_market_generic.png
 create mode 100644 res/drawable-xlarge-mdpi/configure_button_normal.png
 create mode 100644 res/drawable-xlarge-mdpi/configure_button_pressed.png
 create mode 100644 res/drawable-xlarge-mdpi/glow_wallpaper.png
 create mode 100644 res/drawable-xlarge-mdpi/glow_wallpaper_small.png
 create mode 100644 res/drawable-xlarge-mdpi/home_screen_bg.9.png
 create mode 100644 res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png
 create mode 100644 res/drawable-xlarge-mdpi/ic_no_applications.png
 create mode 100644 res/drawable-xlarge-mdpi/info_button.png
 create mode 100644 res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png
 create mode 100644 res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png
 create mode 100644 res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png
 create mode 100644 res/drawable-xlarge-mdpi/rotate_button_normal.png
 create mode 100644 res/drawable-xlarge-mdpi/rotate_button_pressed.png
 create mode 100644 res/drawable-xlarge-mdpi/search_button_normal.png
 create mode 100644 res/drawable-xlarge-mdpi/search_button_pressed.png
 create mode 100644 res/drawable-xlarge-mdpi/trashcan.png
 create mode 100644 res/drawable-xlarge-mdpi/trashcan_hover.png
 delete mode 100644 res/drawable-xlarge/all_apps_button_normal.9.png
 delete mode 100644 res/drawable-xlarge/all_apps_button_pressed.9.png
 delete mode 100644 res/drawable-xlarge/app_market_generic.png
 delete mode 100644 res/drawable-xlarge/configure_button_normal.png
 delete mode 100644 res/drawable-xlarge/configure_button_pressed.png
 delete mode 100644 res/drawable-xlarge/glow_wallpaper.png
 delete mode 100644 res/drawable-xlarge/glow_wallpaper_small.png
 delete mode 100644 res/drawable-xlarge/home_screen_bg.9.png
 delete mode 100644 res/drawable-xlarge/home_screen_bg_hover.9.png
 delete mode 100644 res/drawable-xlarge/ic_no_applications.png
 delete mode 100644 res/drawable-xlarge/info_button.png
 delete mode 100644 res/drawable-xlarge/mini_home_screen_bg.9.png
 delete mode 100644 res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png
 delete mode 100644 res/drawable-xlarge/mini_home_screen_bg_hover.9.png
 delete mode 100644 res/drawable-xlarge/rotate_button_normal.png
 delete mode 100644 res/drawable-xlarge/rotate_button_pressed.png
 delete mode 100644 res/drawable-xlarge/search_button_normal.png
 delete mode 100644 res/drawable-xlarge/search_button_pressed.png
 delete mode 100644 res/drawable-xlarge/trashcan.png
 delete mode 100644 res/drawable-xlarge/trashcan_hover.png

(limited to 'res')

diff --git a/res/drawable-xlarge-mdpi/all_apps_button_focused.png b/res/drawable-xlarge-mdpi/all_apps_button_focused.png
new file mode 100644
index 0000000..a9d5a3f
Binary files /dev/null and b/res/drawable-xlarge-mdpi/all_apps_button_focused.png differ
diff --git a/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png b/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png
new file mode 100644
index 0000000..a423145
Binary files /dev/null and b/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png differ
diff --git a/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png b/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png
new file mode 100644
index 0000000..5dbe77c
Binary files /dev/null and b/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png differ
diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-xlarge-mdpi/app_market_generic.png
new file mode 100644
index 0000000..0ceaeef
Binary files /dev/null and b/res/drawable-xlarge-mdpi/app_market_generic.png differ
diff --git a/res/drawable-xlarge-mdpi/configure_button_normal.png b/res/drawable-xlarge-mdpi/configure_button_normal.png
new file mode 100644
index 0000000..9b37eff
Binary files /dev/null and b/res/drawable-xlarge-mdpi/configure_button_normal.png differ
diff --git a/res/drawable-xlarge-mdpi/configure_button_pressed.png b/res/drawable-xlarge-mdpi/configure_button_pressed.png
new file mode 100644
index 0000000..5f38db6
Binary files /dev/null and b/res/drawable-xlarge-mdpi/configure_button_pressed.png differ
diff --git a/res/drawable-xlarge-mdpi/glow_wallpaper.png b/res/drawable-xlarge-mdpi/glow_wallpaper.png
new file mode 100644
index 0000000..eb29449
Binary files /dev/null and b/res/drawable-xlarge-mdpi/glow_wallpaper.png differ
diff --git a/res/drawable-xlarge-mdpi/glow_wallpaper_small.png b/res/drawable-xlarge-mdpi/glow_wallpaper_small.png
new file mode 100644
index 0000000..f83fc60
Binary files /dev/null and b/res/drawable-xlarge-mdpi/glow_wallpaper_small.png differ
diff --git a/res/drawable-xlarge-mdpi/home_screen_bg.9.png b/res/drawable-xlarge-mdpi/home_screen_bg.9.png
new file mode 100644
index 0000000..413e492
Binary files /dev/null and b/res/drawable-xlarge-mdpi/home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png b/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png
new file mode 100644
index 0000000..73696bf
Binary files /dev/null and b/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png differ
diff --git a/res/drawable-xlarge-mdpi/ic_no_applications.png b/res/drawable-xlarge-mdpi/ic_no_applications.png
new file mode 100644
index 0000000..a4f695a
Binary files /dev/null and b/res/drawable-xlarge-mdpi/ic_no_applications.png differ
diff --git a/res/drawable-xlarge-mdpi/info_button.png b/res/drawable-xlarge-mdpi/info_button.png
new file mode 100644
index 0000000..253cdf7
Binary files /dev/null and b/res/drawable-xlarge-mdpi/info_button.png differ
diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png
new file mode 100644
index 0000000..4602609
Binary files /dev/null and b/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png differ
diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png
new file mode 100644
index 0000000..b1aa98b
Binary files /dev/null and b/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png differ
diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png
new file mode 100644
index 0000000..a30e992
Binary files /dev/null and b/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png differ
diff --git a/res/drawable-xlarge-mdpi/rotate_button_normal.png b/res/drawable-xlarge-mdpi/rotate_button_normal.png
new file mode 100644
index 0000000..fd014aa
Binary files /dev/null and b/res/drawable-xlarge-mdpi/rotate_button_normal.png differ
diff --git a/res/drawable-xlarge-mdpi/rotate_button_pressed.png b/res/drawable-xlarge-mdpi/rotate_button_pressed.png
new file mode 100644
index 0000000..29fb8d9
Binary files /dev/null and b/res/drawable-xlarge-mdpi/rotate_button_pressed.png differ
diff --git a/res/drawable-xlarge-mdpi/search_button_normal.png b/res/drawable-xlarge-mdpi/search_button_normal.png
new file mode 100644
index 0000000..b172074
Binary files /dev/null and b/res/drawable-xlarge-mdpi/search_button_normal.png differ
diff --git a/res/drawable-xlarge-mdpi/search_button_pressed.png b/res/drawable-xlarge-mdpi/search_button_pressed.png
new file mode 100644
index 0000000..c2926c8
Binary files /dev/null and b/res/drawable-xlarge-mdpi/search_button_pressed.png differ
diff --git a/res/drawable-xlarge-mdpi/trashcan.png b/res/drawable-xlarge-mdpi/trashcan.png
new file mode 100644
index 0000000..839d4b8
Binary files /dev/null and b/res/drawable-xlarge-mdpi/trashcan.png differ
diff --git a/res/drawable-xlarge-mdpi/trashcan_hover.png b/res/drawable-xlarge-mdpi/trashcan_hover.png
new file mode 100644
index 0000000..cc2fde7
Binary files /dev/null and b/res/drawable-xlarge-mdpi/trashcan_hover.png differ
diff --git a/res/drawable-xlarge/all_apps_button_normal.9.png b/res/drawable-xlarge/all_apps_button_normal.9.png
deleted file mode 100644
index a423145..0000000
Binary files a/res/drawable-xlarge/all_apps_button_normal.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.9.png b/res/drawable-xlarge/all_apps_button_pressed.9.png
deleted file mode 100644
index 5dbe77c..0000000
Binary files a/res/drawable-xlarge/all_apps_button_pressed.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/app_market_generic.png b/res/drawable-xlarge/app_market_generic.png
deleted file mode 100644
index 0ceaeef..0000000
Binary files a/res/drawable-xlarge/app_market_generic.png and /dev/null differ
diff --git a/res/drawable-xlarge/configure_button_normal.png b/res/drawable-xlarge/configure_button_normal.png
deleted file mode 100644
index 9b37eff..0000000
Binary files a/res/drawable-xlarge/configure_button_normal.png and /dev/null differ
diff --git a/res/drawable-xlarge/configure_button_pressed.png b/res/drawable-xlarge/configure_button_pressed.png
deleted file mode 100644
index 5f38db6..0000000
Binary files a/res/drawable-xlarge/configure_button_pressed.png and /dev/null differ
diff --git a/res/drawable-xlarge/glow_wallpaper.png b/res/drawable-xlarge/glow_wallpaper.png
deleted file mode 100644
index eb29449..0000000
Binary files a/res/drawable-xlarge/glow_wallpaper.png and /dev/null differ
diff --git a/res/drawable-xlarge/glow_wallpaper_small.png b/res/drawable-xlarge/glow_wallpaper_small.png
deleted file mode 100644
index f83fc60..0000000
Binary files a/res/drawable-xlarge/glow_wallpaper_small.png and /dev/null differ
diff --git a/res/drawable-xlarge/home_screen_bg.9.png b/res/drawable-xlarge/home_screen_bg.9.png
deleted file mode 100644
index 413e492..0000000
Binary files a/res/drawable-xlarge/home_screen_bg.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/home_screen_bg_hover.9.png b/res/drawable-xlarge/home_screen_bg_hover.9.png
deleted file mode 100644
index 73696bf..0000000
Binary files a/res/drawable-xlarge/home_screen_bg_hover.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/ic_no_applications.png b/res/drawable-xlarge/ic_no_applications.png
deleted file mode 100644
index a4f695a..0000000
Binary files a/res/drawable-xlarge/ic_no_applications.png and /dev/null differ
diff --git a/res/drawable-xlarge/info_button.png b/res/drawable-xlarge/info_button.png
deleted file mode 100644
index 253cdf7..0000000
Binary files a/res/drawable-xlarge/info_button.png and /dev/null differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg.9.png b/res/drawable-xlarge/mini_home_screen_bg.9.png
deleted file mode 100644
index 4602609..0000000
Binary files a/res/drawable-xlarge/mini_home_screen_bg.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png
deleted file mode 100644
index b1aa98b..0000000
Binary files a/res/drawable-xlarge/mini_home_screen_bg_accepts_drops.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge/mini_home_screen_bg_hover.9.png
deleted file mode 100644
index a30e992..0000000
Binary files a/res/drawable-xlarge/mini_home_screen_bg_hover.9.png and /dev/null differ
diff --git a/res/drawable-xlarge/rotate_button_normal.png b/res/drawable-xlarge/rotate_button_normal.png
deleted file mode 100644
index fd014aa..0000000
Binary files a/res/drawable-xlarge/rotate_button_normal.png and /dev/null differ
diff --git a/res/drawable-xlarge/rotate_button_pressed.png b/res/drawable-xlarge/rotate_button_pressed.png
deleted file mode 100644
index 29fb8d9..0000000
Binary files a/res/drawable-xlarge/rotate_button_pressed.png and /dev/null differ
diff --git a/res/drawable-xlarge/search_button_normal.png b/res/drawable-xlarge/search_button_normal.png
deleted file mode 100644
index b172074..0000000
Binary files a/res/drawable-xlarge/search_button_normal.png and /dev/null differ
diff --git a/res/drawable-xlarge/search_button_pressed.png b/res/drawable-xlarge/search_button_pressed.png
deleted file mode 100644
index c2926c8..0000000
Binary files a/res/drawable-xlarge/search_button_pressed.png and /dev/null differ
diff --git a/res/drawable-xlarge/trashcan.png b/res/drawable-xlarge/trashcan.png
deleted file mode 100644
index 839d4b8..0000000
Binary files a/res/drawable-xlarge/trashcan.png and /dev/null differ
diff --git a/res/drawable-xlarge/trashcan_hover.png b/res/drawable-xlarge/trashcan_hover.png
deleted file mode 100644
index cc2fde7..0000000
Binary files a/res/drawable-xlarge/trashcan_hover.png and /dev/null differ
-- 
cgit v1.1


From 7da1025bd7f15b04cf55c79b73e94e5e1bc959d9 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 28 Oct 2010 16:07:04 -0700
Subject: Layout and spacing changes for AllApps/Customization drawer

- Also fixing issue where preview images in the customization drawer were not being scaled down

Change-Id: I83d1abf019d591954204b87a437eac2ff916dd54
---
 res/drawable-mdpi/tab_unselected_holo.9.png           | Bin 0 -> 128 bytes
 res/drawable-xlarge/all_apps_bg_gradient.9.png        | Bin 0 -> 268 bytes
 res/drawable-xlarge/customize_bg_gradient.png         | Bin 0 -> 304471 bytes
 res/layout-xlarge-land/all_apps_tabbed.xml            |   5 +++--
 res/layout-xlarge-land/customization_drawer.xml       |   8 +++++---
 res/layout-xlarge-land/launcher.xml                   |  15 +++++++--------
 res/layout-xlarge-port/all_apps_tabbed.xml            |   8 ++++----
 res/layout-xlarge-port/customization_drawer.xml       |   6 +++---
 res/layout-xlarge-port/launcher.xml                   |  15 +++++++--------
 res/layout-xlarge/all_apps_paged_view_application.xml |   2 ++
 res/layout-xlarge/customize_paged_view_item.xml       |  14 +++-----------
 res/layout-xlarge/customize_paged_view_widget.xml     |   2 +-
 res/values-xlarge/dimens.xml                          |   2 +-
 res/values-xlarge/styles.xml                          |   4 ++--
 14 files changed, 38 insertions(+), 43 deletions(-)
 create mode 100644 res/drawable-mdpi/tab_unselected_holo.9.png
 create mode 100644 res/drawable-xlarge/all_apps_bg_gradient.9.png
 create mode 100644 res/drawable-xlarge/customize_bg_gradient.png

(limited to 'res')

diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png
new file mode 100644
index 0000000..848f3f1
Binary files /dev/null and b/res/drawable-mdpi/tab_unselected_holo.9.png differ
diff --git a/res/drawable-xlarge/all_apps_bg_gradient.9.png b/res/drawable-xlarge/all_apps_bg_gradient.9.png
new file mode 100644
index 0000000..8d88a7e
Binary files /dev/null and b/res/drawable-xlarge/all_apps_bg_gradient.9.png differ
diff --git a/res/drawable-xlarge/customize_bg_gradient.png b/res/drawable-xlarge/customize_bg_gradient.png
new file mode 100644
index 0000000..fb3ec90
Binary files /dev/null and b/res/drawable-xlarge/customize_bg_gradient.png differ
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index fd9d9cb..89a3104 100644
--- a/res/layout-xlarge-land/all_apps_tabbed.xml
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -22,9 +22,10 @@
         android:layout_height="match_parent">
         <TabWidget
             android:id="@android:id/tabs"
-            android:layout_width="wrap_content"
+            android:layout_width="952dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:background="@drawable/tab_unselected_holo"
             android:tabStripEnabled="false" />
         <FrameLayout
             android:id="@android:id/tabcontent"
@@ -38,7 +39,7 @@
                 launcher:cellCountY="5"
                 launcher:pageLayoutWidthGap="36dp"
                 launcher:pageLayoutHeightGap="6dp"
-                launcher:pageLayoutPaddingTop="0dp"
+                launcher:pageLayoutPaddingTop="15dp"
                 launcher:pageLayoutPaddingBottom="15dp"
                 launcher:pageLayoutPaddingLeft="40dp"
                 launcher:pageLayoutPaddingRight="40dp">
diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
index 8c60e68..9115259 100644
--- a/res/layout-xlarge-land/customization_drawer.xml
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -20,9 +20,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:widgetCellCountX="16"
-    launcher:cellCountX="7"
-    launcher:cellCountY="4"
-    launcher:pageLayoutPaddingTop="10dp"
+    launcher:cellCountX="8"
+    launcher:cellCountY="3"
+    launcher:pageLayoutWidthGap="32dp"
+    launcher:pageLayoutHeightGap="12dp"
+    launcher:pageLayoutPaddingTop="40dp"
     launcher:pageLayoutPaddingBottom="25dp"
     launcher:pageLayoutPaddingLeft="20dp"
     launcher:pageLayoutPaddingRight="20dp" />
\ No newline at end of file
diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index f42d72b..e5ba393 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="600dip"
+        android:layout_height="600dp"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
@@ -38,7 +38,7 @@
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7"
-        launcher:pageSpacing="32dip">
+        launcher:pageSpacing="32dp">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -86,7 +86,7 @@
             android:layout_toLeftOf="@id/configure_button"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
             android:layout_marginRight="@dimen/toolbar_button_spacing"
-            android:textSize="18dip"
+            android:textSize="18dp"
 
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
@@ -131,20 +131,19 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="500dip"
+        android:layout_height="460dp"
         android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
-            android:background="#40000000"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <TabWidget
                 android:id="@android:id/tabs"
-                android:layout_width="wrap_content"
+                android:layout_width="952dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:tabStripEnabled="false"
-                android:paddingBottom="10dp" />
+                android:background="@drawable/tab_unselected_holo"
+                android:tabStripEnabled="false" />
             <FrameLayout
                 android:id="@android:id/tabcontent"
                 android:layout_width="match_parent"
diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml
index d61c979..65e3729 100644
--- a/res/layout-xlarge-port/all_apps_tabbed.xml
+++ b/res/layout-xlarge-port/all_apps_tabbed.xml
@@ -15,17 +15,17 @@
 -->
 <com.android.launcher2.AllAppsTabbed
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:paddingTop="?android:attr/actionBarSize">
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TabWidget
             android:id="@android:id/tabs"
-            android:layout_width="wrap_content"
+            android:layout_width="700dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:background="@drawable/tab_unselected_holo"
             android:tabStripEnabled="false" />
         <FrameLayout
             android:id="@android:id/tabcontent"
@@ -39,7 +39,7 @@
                 launcher:cellCountY="7"
                 launcher:pageLayoutWidthGap="36dp"
                 launcher:pageLayoutHeightGap="36dp"
-                launcher:pageLayoutPaddingTop="0dp"
+                launcher:pageLayoutPaddingTop="25dp"
                 launcher:pageLayoutPaddingBottom="10dp"
                 launcher:pageLayoutPaddingLeft="20dp"
                 launcher:pageLayoutPaddingRight="20dp">
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index d3ca457..28127ea 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -21,10 +21,10 @@
     android:layout_height="match_parent"
     launcher:widgetCellCountX="10"
     launcher:cellCountX="5"
-    launcher:cellCountY="5"
+    launcher:cellCountY="3"
     launcher:pageLayoutWidthGap="36dp"
-    launcher:pageLayoutHeightGap="36dp"
-    launcher:pageLayoutPaddingTop="25dp"
+    launcher:pageLayoutHeightGap="12dp"
+    launcher:pageLayoutPaddingTop="40dp"
     launcher:pageLayoutPaddingBottom="25dp"
     launcher:pageLayoutPaddingLeft="20dp"
     launcher:pageLayoutPaddingRight="20dp" />
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index 20debca..13b69fe 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -26,7 +26,7 @@
         layout="@layout/all_apps_tabbed"
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
-        android:layout_height="1040dip"
+        android:layout_height="1040dp"
         android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
@@ -38,7 +38,7 @@
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7"
-        launcher:pageSpacing="64dip">
+        launcher:pageSpacing="64dp">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -86,7 +86,7 @@
             android:layout_toLeftOf="@id/configure_button"
             android:layout_marginLeft="@dimen/toolbar_button_spacing"
             android:layout_marginRight="@dimen/toolbar_button_spacing"
-            android:textSize="18dip"
+            android:textSize="18dp"
 
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
@@ -131,20 +131,19 @@
     <TabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
-        android:layout_height="800dip"
+        android:layout_height="800dp"
         android:layout_gravity="bottom">
         <LinearLayout
             android:orientation="vertical"
-            android:background="#40000000"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <TabWidget
                 android:id="@android:id/tabs"
-                android:layout_width="wrap_content"
+                android:layout_width="700dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:tabStripEnabled="false"
-                android:paddingBottom="10dp" />
+                android:background="@drawable/tab_unselected_holo"
+                android:tabStripEnabled="false" />
             <FrameLayout
                 android:id="@android:id/tabcontent"
                 android:layout_width="match_parent"
diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
index 48b5712..7458222 100644
--- a/res/layout-xlarge/all_apps_paged_view_application.xml
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -27,5 +27,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
+    android:singleLine="false"
+    android:maxLines="1"
 
     style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml
index e427345..bbc04d7 100644
--- a/res/layout-xlarge/customize_paged_view_item.xml
+++ b/res/layout-xlarge/customize_paged_view_item.xml
@@ -26,15 +26,7 @@
     android:id="@+id/customize_icon"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:paddingTop="2dip"
+    android:singleLine="false"
+    android:maxLines="1"
 
-    android:textColor="#FFFFFFFF"
-    android:textSize="14sp"
-    android:shadowColor="#FF000000"
-    android:shadowDx="0.0"
-    android:shadowDy="1.0"
-    android:shadowRadius="1.0"
-
-    android:maxLines="2"
-    android:fadingEdge="horizontal" />
+    style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml
index cfc0ca0..fab2a9b 100644
--- a/res/layout-xlarge/customize_paged_view_widget.xml
+++ b/res/layout-xlarge/customize_paged_view_widget.xml
@@ -18,7 +18,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:layout_width="wrap_content"
-    android:layout_height="425dp"
+    android:layout_height="365dp"
     android:paddingLeft="12.5dp"
     android:paddingRight="12.5dp"
     android:paddingBottom="50dp"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index aa602be..742b59a 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -39,7 +39,7 @@
 
     <!-- Vertical spacing between edge of screen and mini cell layouts when they
          are minimized to the top when the customization drawer is showing -->
-    <dimen name="customizeSmallScreenVerticalMarginLandscape">70dip</dimen>
+    <dimen name="customizeSmallScreenVerticalMarginLandscape">90dip</dimen>
     <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen>
 
     <dimen name="toolbar_padding">10dip</dimen>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index bf79b4d..83cdbcc 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -29,11 +29,11 @@
 
     <style name="WorkspaceIcon.Portrait">
         <item name="android:drawablePadding">0dip</item>
-        <item name="android:paddingTop">1dip</item>
+        <item name="android:paddingTop">0dip</item>
     </style>
 
     <style name="WorkspaceIcon.Landscape">
         <item name="android:drawablePadding">0dip</item>
-        <item name="android:paddingTop">1dip</item>
+        <item name="android:paddingTop">0dip</item>
     </style>
 </resources>
-- 
cgit v1.1


From c9a961952d1a057029874f8426b90181f6876034 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 1 Nov 2010 11:52:08 -0700
Subject: Using hdpi icons in Launcher

Known issue: Default activity icon is still showing up as small
---
 res/values-xlarge/dimens.xml | 4 ++--
 res/values/dimens.xml        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 742b59a..667f0e3 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -25,8 +25,8 @@
     <!-- The corner radius to draw the external drop icon rounded rect -->
     <dimen name="external_drop_icon_rect_radius">10dp</dimen>
     
-    <!-- Temporary scaled icon size -->
-    <dimen name="temp_scaled_icon_size">72dp</dimen>
+    <!-- Size of icons in workspace -->
+    <dimen name="app_icon_size">72dp</dimen>
 
     <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c83986b..d6cd3ee 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -32,6 +32,9 @@
          button cluster in landscape) -->
     <dimen name="half_status_bar_height">12dip</dimen>
 
+    <!-- Size of icons in workspace -->
+    <dimen name="app_icon_size">50dp</dimen>
+
     <!-- height & width of the drop rectangle for the trash icon -->
     <dimen name="delete_zone_size">70dip</dimen>
     
-- 
cgit v1.1


From 68846fdce6c01bbe474bd0c8307e1ccaac161cbc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 29 Oct 2010 11:00:27 -0700
Subject: Initial changes to allow resolution of arbitrary clip data to widgets
 that support them.

Change-Id: Id5dfa8436a5bf6eb7bd300ec603911a9d3698de3
---
 .../external_widget_drop_list_item.xml             | 39 ++++++++++++++++++++++
 res/values/strings.xml                             |  7 ++++
 2 files changed, 46 insertions(+)
 create mode 100644 res/layout-xlarge/external_widget_drop_list_item.xml

(limited to 'res')

diff --git a/res/layout-xlarge/external_widget_drop_list_item.xml b/res/layout-xlarge/external_widget_drop_list_item.xml
new file mode 100644
index 0000000..84f40ed
--- /dev/null
+++ b/res/layout-xlarge/external_widget_drop_list_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:layout_width="match_parent"
+    android:layout_height="64dp">
+    <ImageView
+        android:id="@+id/provider_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="20dp"
+        android:maxWidth="32dp"
+        android:maxHeight="32dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_launcher_application" />
+    <TextView
+        android:id="@+id/provider"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="5dp"
+        android:gravity="center_vertical"
+        android:textSize="18sp" />
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c8f362..f26dfc8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,6 +77,13 @@
     <!-- The format string for the dimensions of a widget in the drawer -->
     <string name="widget_dims_format" translatable="false">%1$d x %2$d</string>
 
+    <!-- External-drop widget pick label format string [CHAR_LIMIT=25] -->
+    <string name="external_drop_widget_pick_format" translatable="false">%1$s (%2$d x %3$d)</string>
+    <!-- External-drop widget error string -->
+    <string name="external_drop_widget_error">Could not install clipboard item</string>
+    <!-- External-drop widget pick title -->
+    <string name="external_drop_widget_pick_title">Select widget to create</string>
+
     <!-- Folders -->
     <skip />
     <!-- Label of Folder name field in Rename folder dialog box -->
-- 
cgit v1.1


From 0207c522472d7252f146f4d39efa456ca5248c6b Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 3 Nov 2010 22:12:02 -0700
Subject: Draw glow along screen edge when dragging in portrait.

---
 res/drawable/page_hover_left.9.png  | Bin 0 -> 413 bytes
 res/drawable/page_hover_right.9.png | Bin 0 -> 415 bytes
 res/values-xlarge-port/dimens.xml   |   4 ++++
 3 files changed, 4 insertions(+)
 create mode 100644 res/drawable/page_hover_left.9.png
 create mode 100644 res/drawable/page_hover_right.9.png

(limited to 'res')

diff --git a/res/drawable/page_hover_left.9.png b/res/drawable/page_hover_left.9.png
new file mode 100644
index 0000000..5d5e0c8
Binary files /dev/null and b/res/drawable/page_hover_left.9.png differ
diff --git a/res/drawable/page_hover_right.9.png b/res/drawable/page_hover_right.9.png
new file mode 100644
index 0000000..1545bfe
Binary files /dev/null and b/res/drawable/page_hover_right.9.png differ
diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml
index b60635b..baa31aa 100644
--- a/res/values-xlarge-port/dimens.xml
+++ b/res/values-xlarge-port/dimens.xml
@@ -15,6 +15,10 @@
 -->
 
 <resources>
+    <!-- the area at the edge of the screen that makes the workspace go left
+         or right while you're dragging. -->
+    <dimen name="scroll_zone">40dp</dimen>
+
     <!-- Width/height gap overrides for the workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">32dp</dimen>
-- 
cgit v1.1