summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTyson Miller <tmiller@cyngn.com>2015-11-10 08:59:15 -0800
committerTyson Miller <tmiller@cyngn.com>2015-12-01 17:16:59 -0800
commit719deb83a0ac84422b68605f4d5c782865766aef (patch)
treefd3db92c9e10fa1665c2bb5c7f2e0b059ba79d5d /res
parentb0bc788a4fc3d6d7a86ff3f286d8524e3fa2787c (diff)
downloadandroid_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.tar.gz
android_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.tar.bz2
android_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.zip
Trebuchet: dynamic folder type added
Issue-Id: CYNGNOS-1328 Change-Id: I09bf7bec119307f54836fedee8a1532627035d9a
Diffstat (limited to 'res')
-rw-r--r--res/layout/remote_folder.xml123
-rw-r--r--res/values/cm_strings.xml6
-rw-r--r--res/values/version.xml4
-rw-r--r--res/xml/default_workspace_4x4.xml4
-rw-r--r--res/xml/default_workspace_5x5.xml4
-rw-r--r--res/xml/default_workspace_5x6.xml4
6 files changed, 145 insertions, 0 deletions
diff --git a/res/layout/remote_folder.xml b/res/layout/remote_folder.xml
new file mode 100644
index 000000000..b185a2109
--- /dev/null
+++ b/res/layout/remote_folder.xml
@@ -0,0 +1,123 @@
+<?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.launcher3.RemoteFolder
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:launcher="http://schemas.android.com/apk/res-auto"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:orientation="vertical"
+android:paddingTop="16dp"
+android:paddingStart="@dimen/folder_preview_padding"
+android:paddingEnd="@dimen/folder_preview_padding"
+android:paddingBottom="@dimen/folder_preview_padding"
+android:layout_gravity="center"
+android:background="@drawable/folder_bg">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/folder_info_container"
+ android:background="@android:color/holo_green_dark">
+
+ <!-- TODO replace background with android:background="@android:color/transparent" -->
+ <com.android.launcher3.FolderEditText
+ android:id="@+id/folder_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/holo_orange_dark"
+ android:fontFamily="sans-serif-condensed"
+ android:hint="@string/folder_hint_text"
+ android:imeOptions="flagNoExtractUi"
+ android:paddingBottom="@dimen/folder_name_padding"
+ android:paddingTop="@dimen/folder_name_padding"
+ android:layout_marginStart="@dimen/folder_name_padding"
+ android:layout_marginEnd="@dimen/folder_name_padding"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:textColor="@color/workspace_icon_text_color"
+ android:textColorHighlight="#ffCCCCCC"
+ android:textColorHint="#78ffffff"
+ android:textCursorDrawable="@null"
+ android:textSize="18sp"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"/>
+
+
+ <ImageView
+ android:id="@+id/folder_info"
+ android:layout_width="@dimen/folder_lock_icon"
+ android:layout_height="@dimen/folder_lock_icon"
+ android:padding="@dimen/folder_name_padding"
+ android:src="@drawable/ic_launcher_info_normal_holo"
+ android:layout_alignTop="@id/folder_name"
+ android:layout_alignParentRight="true"/>
+
+ <TextView
+ android:id="@+id/help_text_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/folder_name_padding"
+ android:layout_marginEnd="@dimen/folder_name_padding"
+ android:text="@string/recommendations_help_text"
+ android:fontFamily="sans-serif-condensed"
+ android:textSize="18sp"
+ android:textColor="@color/workspace_icon_text_color"
+ android:textColorHighlight="#ffCCCCCC"
+ android:textColorHint="#78ffffff"
+ android:layout_below="@id/folder_info"
+ android:background="@android:color/holo_purple"
+ />
+
+ <Button
+ android:id="@+id/close_info_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/folder_lock_icon"
+ android:text="@string/close"
+ android:layout_below="@id/help_text_view"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ />
+
+ <Button
+ android:id="@+id/disable_remote_folder_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/folder_lock_icon"
+ android:text="@string/disable"
+ android:layout_below="@id/help_text_view"
+ android:layout_toLeftOf="@id/close_info_button"
+ android:layout_alignParentBottom="true"
+ />
+
+ </RelativeLayout>
+
+ <ScrollView
+ android:id="@+id/scroll_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:background="@android:color/holo_red_dark">
+
+ <com.android.launcher3.CellLayout
+ android:id="@+id/folder_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:cacheColorHint="#ff333333"
+ android:hapticFeedbackEnabled="false"
+ android:background="@android:color/holo_blue_bright"/>
+ </ScrollView>
+</com.android.launcher3.RemoteFolder> \ No newline at end of file
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7602ac107..a235a2a90 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -87,4 +87,10 @@
<!-- Search Manager doesn't exist -->
<string name="search_activity_not_found">A search activity could not be found!</string>
+
+ <!-- Featured Apps Strings -->
+ <string name="recommendations_title">Featured Apps</string>
+ <string name="recommendations_help_text">This is a dynamic folder that will automatically load with recommended and featured apps from us at Cyanogen Inc. If you would not like to receive these awesome offers, simply disable below and the folder will be removed.</string>
+ <string name="disable">DISABLE</string>
+ <string name="close">CLOSE</string>
</resources>
diff --git a/res/values/version.xml b/res/values/version.xml
new file mode 100644
index 000000000..d8a0e1f85
--- /dev/null
+++ b/res/values/version.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <integer name="google_play_services_version">7571000</integer>
+</resources> \ No newline at end of file
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index 5970f12f4..809697ebe 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -29,6 +29,10 @@
launcher:spanX="4"
launcher:spanY="2" />
+ <!-- Recommended Folder -->
+ <remote-folder launcher:screen="1" launcher:x="0" launcher:y="2" launcher:title="@string/recommendations_title">
+ </remote-folder>
+
<!-- Google Folder -->
<folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/google_title">
<favorite
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 5839438f6..3577bb7a1 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -29,6 +29,10 @@
launcher:spanX="5"
launcher:spanY="2" />
+ <!-- Recommended Folder -->
+ <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">
+ </remote-folder>
+
<!-- Google Folder -->
<folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">
<favorite
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 81a1ef701..96845ae56 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -29,6 +29,10 @@
launcher:spanX="6"
launcher:spanY="2" />
+ <!-- Recommended Folder -->
+ <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">
+ </remote-folder>
+
<!-- Google Folder -->
<folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">
<favorite