diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/hidden_apps_list.xml | 7 | ||||
| -rw-r--r-- | res/layout/hidden_apps_list_item.xml | 33 | ||||
| -rw-r--r-- | res/layout/tab_widget_indicator.xml | 19 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 14 | ||||
| -rw-r--r-- | res/values/preferences_defaults.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences_drawer.xml | 36 | ||||
| -rw-r--r-- | res/xml/preferences_headers.xml | 20 |
7 files changed, 103 insertions, 28 deletions
diff --git a/res/layout/hidden_apps_list.xml b/res/layout/hidden_apps_list.xml new file mode 100644 index 000000000..fb0d4bffb --- /dev/null +++ b/res/layout/hidden_apps_list.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:choiceMode="multipleChoice" />
\ No newline at end of file diff --git a/res/layout/hidden_apps_list_item.xml b/res/layout/hidden_apps_list_item.xml new file mode 100644 index 000000000..a00b07741 --- /dev/null +++ b/res/layout/hidden_apps_list_item.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.android.launcher3.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dp" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize" + android:background="?android:attr/selectableItemBackground" + android:descendantFocusability="blocksDescendants"> + + <ImageView android:id="@+id/icon" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" /> + + <TextView android:id="@+id/title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="15dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <com.android.launcher3.widget.InertCheckBox android:id="@+id/checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + +</com.android.launcher3.widget.CheckableLinearLayout>
\ No newline at end of file diff --git a/res/layout/tab_widget_indicator.xml b/res/layout/tab_widget_indicator.xml deleted file mode 100644 index de7c50ec4..000000000 --- a/res/layout/tab_widget_indicator.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<com.android.launcher3.AccessibleTabView - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/TabIndicator.AppsCustomize" /> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 33da3d2e9..73598a571 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -55,6 +55,14 @@ <!-- Drawer --> <string name="preferences_interface_drawer_title">Drawer</string> + <string name="preferences_interface_drawer_summary">Apps and widgets drawer</string> + <string name="preferences_interface_drawer_apps_category">Apps</string> + <string name="preferences_interface_drawer_hidden_apps_title">Hidden apps</string> + <string name="preferences_interface_drawer_hidden_apps_summary">Hide apps from the drawer</string> + <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Remove shortcuts</string> + <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Remove the shortcuts of hidden apps from the homescreen</string> + <string name="preferences_interface_drawer_hidden_apps_widgets_title">Remove widgets</string> + <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Remove the widgets of hidden apps from the homescreen</string> <!-- Dock --> <string name="preferences_interface_dock_title">Dock</string> @@ -78,4 +86,10 @@ <string name="all_apps_cling_cm">Customize your drawer</string> <!-- The description of how to access Trebuchet settings [CHAR_LIMIT=160] --> <string name="all_apps_cling_summary">Tap the page indicator to view additional configuration settings</string> + + <!-- Noun, menu item used to reset hidden apps list --> + <string name="menu_hidden_apps_delete">Reset</string> + + <!-- Hidden apps --> + <string name="hidden_apps_title">Hidden apps</string> </resources> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 288157381..daf28a3de 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -7,6 +7,8 @@ <bool name="preferences_interface_homescreen_scrolling_fade_adjacent_default">@bool/config_workspaceFadeAdjacentScreens</bool> <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string> <bool name="preferences_interface_drawer_scrolling_fade_adjacent_default">false</bool> + <bool name="preferences_interface_drawer_remove_hidden_apps_shortcuts_default">true</bool> + <bool name="preferences_interface_drawer_remove_hidden_apps_widgets_default">true</bool> <bool name="preferences_interface_general_icons_large_default">@bool/config_largeIcons</bool> <string name="preferences_interface_general_icons_text_font_family_default">sans-serif-condensed</string> <integer name="preferences_interface_general_icons_text_font_style_default">0</integer> diff --git a/res/xml/preferences_drawer.xml b/res/xml/preferences_drawer.xml new file mode 100644 index 000000000..c59d6b7fe --- /dev/null +++ b/res/xml/preferences_drawer.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3" + android:key="ui_drawer" + android:title="@string/preferences_interface_drawer_title"> + <PreferenceCategory android:title="@string/preferences_interface_drawer_apps_category"> + <Preference android:key="ui_drawer_hidden_apps" + android:title="@string/preferences_interface_drawer_hidden_apps_title" + android:summary="@string/preferences_interface_drawer_hidden_apps_summary"> + <intent android:action=".settings.HiddenAppsActivity"/> + </Preference> + <CheckBoxPreference android:key="ui_drawer_remove_hidden_apps_shortcuts" + android:title="@string/preferences_interface_drawer_hidden_apps_shortcuts_title" + android:summary="@string/preferences_interface_drawer_hidden_apps_shortcuts_summary" + android:defaultValue="@bool/preferences_interface_drawer_remove_hidden_apps_shortcuts_default" /> + <CheckBoxPreference android:key="ui_drawer_remove_hidden_apps_widgets" + android:title="@string/preferences_interface_drawer_hidden_apps_widgets_title" + android:summary="@string/preferences_interface_drawer_hidden_apps_widgets_summary" + android:defaultValue="@bool/preferences_interface_drawer_remove_hidden_apps_widgets_default" /> + </PreferenceCategory> +</PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml index bc919b2d5..42a08a9bd 100644 --- a/res/xml/preferences_headers.xml +++ b/res/xml/preferences_headers.xml @@ -20,20 +20,22 @@ android:fragment="com.android.launcher3.settings.SettingsActivity$HomescreenFragment" android:title="@string/preferences_interface_homescreen_title" /> - <!--<header android:id="@+id/preferences_drawer_section" - android:title="@string/preferences_interface_drawer_title" /> - - <header android:id="@+id/preferences_dock_section" + <header android:id="@+id/preferences_drawer_section" + android:fragment="com.android.launcher3.settings.SettingsActivity$DrawerFragment" + android:title="@string/preferences_interface_drawer_title" + android:summary="@string/preferences_interface_drawer_summary" /> + + <!--<header android:id="@+id/preferences_dock_section" android:title="@string/preferences_interface_dock_title" />--> - + <header android:id="@+id/preferences_general_section" android:fragment="com.android.launcher3.settings.SettingsActivity$GeneralFragment" android:title="@string/preferences_interface_general_title" /> - + <header android:id="@+id/preferences_application_section" - android:title="@string/preferences_application_title" /> - + android:title="@string/preferences_application_title" /> + <header android:id="@+id/preferences_application_version" - android:summary="@string/application_copyright" /> + android:summary="@string/application_copyright" /> </preference-headers> |