diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/color/listitem_text.xml | 21 | ||||
-rw-r--r-- | res/drawable/ic_remove.xml | 29 | ||||
-rw-r--r-- | res/drawable/listitem_bg.xml | 21 | ||||
-rw-r--r-- | res/drawable/listitem_selector.xml | 21 | ||||
-rw-r--r-- | res/layout/hidden_apps_list.xml | 22 | ||||
-rw-r--r-- | res/layout/hidden_apps_list_item.xml | 48 | ||||
-rw-r--r-- | res/layout/hidden_folder.xml | 69 | ||||
-rw-r--r-- | res/layout/hidden_folder_apps_list_item.xml | 48 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 8 | ||||
-rw-r--r-- | res/values/colors.xml | 6 | ||||
-rw-r--r-- | res/values/dimens.xml | 9 |
11 files changed, 299 insertions, 3 deletions
diff --git a/res/color/listitem_text.xml b/res/color/listitem_text.xml new file mode 100644 index 000000000..ce981439a --- /dev/null +++ b/res/color/listitem_text.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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_enabled="true" + android:state_pressed="true" android:color="@color/settings_bg_color" /> + <item android:color="@android:color/white" /> +</selector> diff --git a/res/drawable/ic_remove.xml b/res/drawable/ic_remove.xml new file mode 100644 index 000000000..a37a64b82 --- /dev/null +++ b/res/drawable/ic_remove.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#000000" + android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 +19 19 17.59 13.41 12z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector> diff --git a/res/drawable/listitem_bg.xml b/res/drawable/listitem_bg.xml index be1fedbe5..1a1e93d53 100644 --- a/res/drawable/listitem_bg.xml +++ b/res/drawable/listitem_bg.xml @@ -1,6 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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_enabled="true" - android:state_pressed="true" android:drawable="@android:color/white" /> - <item android:drawable="@color/slideup_panel_bg_color" /> -</selector>
\ No newline at end of file + android:state_pressed="true" android:drawable="@android:color/white" /> + <item android:drawable="@color/settings_bg_color" /> +</selector> diff --git a/res/drawable/listitem_selector.xml b/res/drawable/listitem_selector.xml new file mode 100644 index 000000000..1a1e93d53 --- /dev/null +++ b/res/drawable/listitem_selector.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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_enabled="true" + android:state_pressed="true" android:drawable="@android:color/white" /> + <item android:drawable="@color/settings_bg_color" /> +</selector> diff --git a/res/layout/hidden_apps_list.xml b/res/layout/hidden_apps_list.xml new file mode 100644 index 000000000..a639ae094 --- /dev/null +++ b/res/layout/hidden_apps_list.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> +<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" /> diff --git a/res/layout/hidden_apps_list_item.xml b/res/layout/hidden_apps_list_item.xml new file mode 100644 index 000000000..7061b35c3 --- /dev/null +++ b/res/layout/hidden_apps_list_item.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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.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> diff --git a/res/layout/hidden_folder.xml b/res/layout/hidden_folder.xml new file mode 100644 index 000000000..529384737 --- /dev/null +++ b/res/layout/hidden_folder.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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" + xmlns:insettable="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/settings_bg_color" + android:orientation="vertical" + android:paddingLeft="@dimen/overview_panel_button_spacing" + android:paddingRight="@dimen/overview_panel_button_spacing" + android:paddingTop="@dimen/overview_panel_bottom_padding" + android:focusable="true" + android:focusableInTouchMode="true" + insettable:layout_ignoreInsets="true" + android:clickable="true" > + + <RelativeLayout + android:id="@+id/folder_title_lock" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + <ImageView + android:id="@+id/folder_lock_icon" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:src="@drawable/folder_unlocked" + android:background="@drawable/listitem_bg" /> + + <EditText + android:id="@+id/folder_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_toStartOf="@id/folder_lock_icon" + android:paddingBottom="@dimen/folder_name_padding" + android:paddingTop="@dimen/folder_name_padding" + android:hint="@string/folder_hint_text" + android:textColor="@android:color/white" + android:textSize="20sp" + android:textColorHighlight="#ffCCCCCC" + android:textCursorDrawable="@null" + android:singleLine="true" + android:background="#00000000" /> + </RelativeLayout> + + <ListView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/hidden_apps_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" /> + +</LinearLayout> diff --git a/res/layout/hidden_folder_apps_list_item.xml b/res/layout/hidden_folder_apps_list_item.xml new file mode 100644 index 000000000..33f9fa572 --- /dev/null +++ b/res/layout/hidden_folder_apps_list_item.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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="wrap_content" + android:minHeight="48dp" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize" + android:background="?android:attr/selectableItemBackground"> + + <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" /> + + <ImageView android:id="@+id/remove" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" + android:src="@drawable/ic_remove"/> +</LinearLayout> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 2152a9986..1a7e2d332 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -79,6 +79,14 @@ android:layout_gravity="center_vertical" layout="@layout/page_indicator" /> + <ImageView + android:id="@+id/folder_lock" + android:layout_width="@dimen/folder_lock_icon" + android:layout_height="@dimen/folder_lock_icon" + android:padding="@dimen/folder_name_padding" + android:layout_gravity="center_vertical" + android:src="@drawable/folder_unlocked" /> + </LinearLayout> </com.android.launcher3.Folder> diff --git a/res/values/colors.xml b/res/values/colors.xml index 0cad1cefc..80c0d6f6d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -44,6 +44,12 @@ <color name="container_fastscroll_thumb_inactive_color">#009688</color> <color name="container_fastscroll_thumb_active_color">#009688</color> + <color name="settings_header_text">#FF6cd2ea</color> + <color name="settings_bg_color">#FF485459</color> + <color name="settings_bg_header_color">#FFb2b0ab</color> + <color name="settings_bg_selected_color">#26000000</color> + <color name="settings_transition_selected_color">#50000000</color> + <!-- All Apps --> <color name="all_apps_grid_section_text_color">#009688</color> <color name="all_apps_grid_section_text_color_dark">#FFF</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8c64ef0c5..95557d9c5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -44,6 +44,15 @@ <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> + <dimen name="workspace_overscroll_drawable_padding">0dp</dimen> + <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen> + <dimen name="overview_panel_top_padding">20dp</dimen> + <dimen name="overview_panel_bottom_padding">50dp</dimen> + <dimen name="overview_panel_button_spacing">30dp</dimen> + <dimen name="overview_panel_list_padding">16dp</dimen> + <dimen name="overview_mode_page_offset">60dp</dimen> + <dimen name="sliding_panel_padding">175dp</dimen> + <dimen name="overview_scaling_padding">50dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> |