diff options
author | Maurice Lam <yukl@google.com> | 2015-04-21 23:01:11 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-04-29 22:38:22 -0700 |
commit | 28c3f6bb71da1727fdc39bdc622518b1daeb3b0a (patch) | |
tree | 3f662b71bb718d89887ba3bbf569fd477c0d2d25 /res | |
parent | bc95630994227736aff46885ca1d9345829e83e2 (diff) | |
download | packages_apps_Settings-28c3f6bb71da1727fdc39bdc622518b1daeb3b0a.zip packages_apps_Settings-28c3f6bb71da1727fdc39bdc622518b1daeb3b0a.tar.gz packages_apps_Settings-28c3f6bb71da1727fdc39bdc622518b1daeb3b0a.tar.bz2 |
[WifiSettings] Add progress bar when scanning
Add a progress bar when the Wi-Fi screen is in a transient state,
like enabling, disabling Wi-Fi and scanning for network. This change
sets the progress bar as a pinned header at the top of the activity.
The pinned header container needs to be match parent so that the
progress bar can occupy the full width of the screen. If the header
view doesn't want to fill the width, then the header view *inside*
the container should be wrap_content.
Added an overloaded setPinnedHeader method that takes a layout
resource ID, and returns the view to the caller. This way the
inflater can set the parent property so that layout params will not
be ignored.
Bug: 17389577
Change-Id: I18d0eb7c72ad31d1c4b35a54789016c32c81fb93
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/progress_indeterminate_horizontal_material_trimmed.xml | 28 | ||||
-rw-r--r-- | res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml | 53 | ||||
-rw-r--r-- | res/layout/preference_list_fragment.xml | 2 | ||||
-rw-r--r-- | res/layout/wifi_progress_header.xml | 22 | ||||
-rw-r--r-- | res/values/styles.xml | 6 |
5 files changed, 110 insertions, 1 deletions
diff --git a/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml b/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml new file mode 100644 index 0000000..070b9a1 --- /dev/null +++ b/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which + draws the whole height of the progress bar instead having blank space above and below the + bar. --> +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/vector_drawable_progress_indeterminate_horizontal_trimmed" > + <target + android:name="rect2_grp" + android:animation="@*android:anim/progress_indeterminate_horizontal_rect2" /> + <target + android:name="rect1_grp" + android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" /> +</animated-vector> diff --git a/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml b/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml new file mode 100644 index 0000000..39e3a37 --- /dev/null +++ b/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml @@ -0,0 +1,53 @@ +<?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. +--> + +<!-- Variant of vector_drawable_progress_indeterminate_horizontal in frameworks/base/core/res, which + draws the whole height of the progress bar instead having blank space above and below the + bar. --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="10dp" + android:width="360dp" + android:viewportHeight="10" + android:viewportWidth="360" > + <group + android:name="progress_group" + android:translateX="180" + android:translateY="5" > + <path + android:name="background_track" + android:pathData="M -180.0,-5.0 l 360.0,0 l 0,10.0 l -360.0,0 Z" + android:fillColor="?android:attr/colorControlActivated" + android:fillAlpha="?android:attr/disabledAlpha"/> + <group + android:name="rect2_grp" + android:translateX="-197.60001" + android:scaleX="0.1" > + <path + android:name="rect2" + android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z" + android:fillColor="?android:attr/colorControlActivated" /> + </group> + <group + android:name="rect1_grp" + android:translateX="-522.59998" + android:scaleX="0.1" > + <path + android:name="rect1" + android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z" + android:fillColor="?android:attr/colorControlActivated" /> + </group> + </group> +</vector> diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml index 1412381..2e9299c 100644 --- a/res/layout/preference_list_fragment.xml +++ b/res/layout/preference_list_fragment.xml @@ -25,7 +25,7 @@ android:background="@android:color/transparent"> <FrameLayout android:id="@+id/pinned_header" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" /> diff --git a/res/layout/wifi_progress_header.xml b/res/layout/wifi_progress_header.xml new file mode 100644 index 0000000..05518ae --- /dev/null +++ b/res/layout/wifi_progress_header.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. +--> + +<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/TrimmedHorizontalProgressBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:indeterminate="true" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index d0d2ead..cca8a70 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -158,6 +158,12 @@ <item name="android:textColor">?android:attr/colorAccent</item> </style> + <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal"> + <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item> + <item name="android:minHeight">3dip</item> + <item name="android:maxHeight">3dip</item> + </style> + <style name="bt_item"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> |