diff options
author | cretin45 <cretin45@gmail.com> | 2015-11-13 16:51:43 -0800 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2015-11-23 12:10:32 -0800 |
commit | acab44fc939b4083ab7ec889b0c6d4fe0db00cca (patch) | |
tree | 6d7dd6d411404b804814ec4091e007f05dfd4ae5 /res/layout | |
parent | 35614fdc7d13179ba9cbc80f15eca6d63cf3229d (diff) | |
download | android_packages_apps_Trebuchet-acab44fc939b4083ab7ec889b0c6d4fe0db00cca.tar.gz android_packages_apps_Trebuchet-acab44fc939b4083ab7ec889b0c6d4fe0db00cca.tar.bz2 android_packages_apps_Trebuchet-acab44fc939b4083ab7ec889b0c6d4fe0db00cca.zip |
Reimplement the CM scrubber against the new Launcher
PS4: Implement RTL support
Change-Id: I4456d54b5924913d1b36e1cfa9a2269150f6fb3e
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps_container.xml | 9 | ||||
-rw-r--r-- | res/layout/scrub_layout.xml | 44 | ||||
-rw-r--r-- | res/layout/scrubber_container.xml | 53 | ||||
-rw-r--r-- | res/layout/widgets_view.xml | 9 |
4 files changed, 115 insertions, 0 deletions
diff --git a/res/layout/all_apps_container.xml b/res/layout/all_apps_container.xml index 626edafab..3a2c96cd0 100644 --- a/res/layout/all_apps_container.xml +++ b/res/layout/all_apps_container.xml @@ -35,4 +35,13 @@ android:focusable="true" android:descendantFocusability="afterDescendants" /> + <ViewStub + android:id="@+id/scrubber_container_stub" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inflatedId="@+id/scrubber_container" + android:layout="@layout/scrubber_container" + android:layout_gravity="bottom" + android:clipToPadding="false"/> + </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
\ No newline at end of file diff --git a/res/layout/scrub_layout.xml b/res/layout/scrub_layout.xml new file mode 100644 index 000000000..11ee381d0 --- /dev/null +++ b/res/layout/scrub_layout.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/app_drawer_scrubber_container" + android:layout_width="match_parent" + android:layout_height="@dimen/scrubber_height" + android:paddingLeft="@dimen/app_drawer_scrubber_padding" + android:paddingRight="@dimen/app_drawer_scrubber_padding" + android:layout_alignParentBottom="true" + android:background="@drawable/seek_back"> + + <com.android.launcher3.AutoExpandTextView + android:id="@+id/scrubberText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textColor="@android:color/white" + android:maxLines="1" + android:lines="1" + android:textSize="8sp" /> + + <SeekBar + android:id="@+id/scrubber" + android:thumb="@android:color/transparent" + android:progressDrawable="@android:color/transparent" + android:layout_width="match_parent" + android:layout_gravity="center" + android:layout_height="match_parent" /> + +</FrameLayout> diff --git a/res/layout/scrubber_container.xml b/res/layout/scrubber_container.xml new file mode 100644 index 000000000..4fe84755f --- /dev/null +++ b/res/layout/scrubber_container.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod 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. +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/scrubber_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:clipToPadding="false"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_below="@+id/scrubberIndicator" + android:background="@drawable/scrubber_back" + android:clipToPadding="false"> + + <com.android.launcher3.BaseRecyclerViewScrubber + android:id="@+id/base_scrubber" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:layout_gravity="bottom"/> + </FrameLayout> + + <TextView + android:id="@+id/scrubberIndicator" + android:background="@drawable/letter_indicator" + android:layout_width="100dp" + android:layout_marginLeft="@dimen/app_drawer_scrubber_padding" + android:layout_marginRight="@dimen/app_drawer_scrubber_padding" + android:paddingTop="18dp" + android:textSize="24sp" + android:gravity="center_horizontal|top" + android:textColor="@android:color/black" + android:clickable="false" + android:layout_marginBottom="-40dp" + android:visibility="invisible" + android:layout_height="100dp" /> +</RelativeLayout> diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 755634f82..1f276adb9 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -46,6 +46,15 @@ android:layout_gravity="center" android:elevation="15dp" android:visibility="gone" /> + + <ViewStub + android:id="@+id/scrubber_container_stub" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inflatedId="@+id/scrubber_container" + android:layout="@layout/scrubber_container" + android:layout_gravity="bottom" + android:clipToPadding="false"/> </FrameLayout> </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file |