diff options
author | Danny Baumann <dannybaumann@web.de> | 2014-07-02 23:36:27 +0200 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2014-11-23 23:12:22 +0000 |
commit | 90ae307eedcb2f90d4cdcb0276018b6e0e92c304 (patch) | |
tree | 54a872f05cf4236a0a7c7eb0f028b4b24a8da976 /res | |
parent | 465fa647ba06b8d76c79ce044a18a47ebe212e86 (diff) | |
download | android_packages_apps_Trebuchet-90ae307eedcb2f90d4cdcb0276018b6e0e92c304.tar.gz android_packages_apps_Trebuchet-90ae307eedcb2f90d4cdcb0276018b6e0e92c304.tar.bz2 android_packages_apps_Trebuchet-90ae307eedcb2f90d4cdcb0276018b6e0e92c304.zip |
Trebuchet: Draw the dynamic grid image dynamically
This commits makes it possible to draw the image which previews
the selected grid dynamically.
Change-Id: I7c029f06110afdf1fe62145a079bba76166bb690
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/grid.png | bin | 1971 -> 0 bytes | |||
-rw-r--r-- | res/drawable/grid_comfortable.png | bin | 1984 -> 0 bytes | |||
-rw-r--r-- | res/drawable/grid_condensed.png | bin | 2033 -> 0 bytes | |||
-rw-r--r-- | res/drawable/grid_cozy.png | bin | 2006 -> 0 bytes | |||
-rw-r--r-- | res/layout/dynamic_grid_size_screen.xml | 4 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 4 | ||||
-rw-r--r-- | res/values/colors.xml | 3 |
7 files changed, 7 insertions, 4 deletions
diff --git a/res/drawable/grid.png b/res/drawable/grid.png Binary files differdeleted file mode 100644 index 79fe901d1..000000000 --- a/res/drawable/grid.png +++ /dev/null diff --git a/res/drawable/grid_comfortable.png b/res/drawable/grid_comfortable.png Binary files differdeleted file mode 100644 index 34e3ef2ee..000000000 --- a/res/drawable/grid_comfortable.png +++ /dev/null diff --git a/res/drawable/grid_condensed.png b/res/drawable/grid_condensed.png Binary files differdeleted file mode 100644 index ebc9d4e54..000000000 --- a/res/drawable/grid_condensed.png +++ /dev/null diff --git a/res/drawable/grid_cozy.png b/res/drawable/grid_cozy.png Binary files differdeleted file mode 100644 index 929bcb541..000000000 --- a/res/drawable/grid_cozy.png +++ /dev/null diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml index 984f24a0f..8b6ed95ca 100644 --- a/res/layout/dynamic_grid_size_screen.xml +++ b/res/layout/dynamic_grid_size_screen.xml @@ -35,12 +35,12 @@ android:textSize="16sp" /> </LinearLayout> - <ImageView + <view + class="com.android.launcher3.DynamicGridSizeFragment$GridSizeView" android:id="@+id/dynamic_grid_size_image" android:layout_width="150dp" android:layout_height="150dp" android:layout_gravity="center_horizontal" - android:adjustViewBounds="true" android:layout_marginBottom="@dimen/grid_padding"/> <ListView diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index be2d91928..f724a5f5a 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Application name --> <string name="cm_application_name" translatable="false">Trebuchet</string> <!-- App version --> @@ -68,7 +68,7 @@ <string name="grid_size_comfortable">Comfortable</string> <string name="grid_size_cozy">Cozy</string> <string name="grid_size_condensed">Condensed</string> - <string name="grid_size_custom">Custom</string> + <string name="grid_size_custom">Custom (<xliff:g id="rows">%1$d</xliff:g> \u00d7 <xliff:g id="columns">%2$d</xliff:g>)</string> <string name="preferences_interface_homescreen_custom">Select custom size</string> <string name="preferences_interface_homescreen_rows_title">Number of rows</string> <string name="preferences_interface_homescreen_columns_title">Number of columns</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index fd50ffd73..948801f5b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -46,4 +46,7 @@ <color name="settings_transition_selected_color">#50000000</color> <color name="infomation_count_circle_color">#F44336</color> + + <color name="dynamic_grid_preview_background">#FFFFFFFF</color> + <color name="dynamic_grid_preview_foreground">#FF000000</color> </resources> |