Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge changes from topic 'OMS' into n7.1
* changes: SystemUI: Use own drawables for QS expand icon Themes: Expose QS battery
- Loading branch information
Showing
15 changed files
with
384 additions
and
7 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="250" | ||
| android:interpolator="@android:interpolator/fast_out_slow_in" | ||
| android:pathData="M 12.0,9.0 c 0.0,0.66667 0.0,5.0 0.0,6.0" | ||
| android:propertyXName="translateX" | ||
| android:propertyYName="translateY" /> | ||
|
|
||
| </set> |
26 changes: 26 additions & 0 deletions
26
packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="200" | ||
| android:interpolator="@interpolator/ic_qs_collapse_animation_interpolator_0" | ||
| android:propertyName="rotation" | ||
| android:valueFrom="45.0" | ||
| android:valueTo="-45.0" | ||
| android:valueType="floatType" /> | ||
|
|
||
| </set> |
26 changes: 26 additions & 0 deletions
26
packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="200" | ||
| android:interpolator="@interpolator/ic_qs_collapse_animation_interpolator_0" | ||
| android:propertyName="rotation" | ||
| android:valueFrom="-45.0" | ||
| android:valueTo="45.0" | ||
| android:valueType="floatType" /> | ||
|
|
||
| </set> |
25 changes: 25 additions & 0 deletions
25
packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="250" | ||
| android:interpolator="@android:interpolator/fast_out_slow_in" | ||
| android:pathData="M 12.0,15.0 c 0.0,-1.0 0.0,-5.33333 0.0,-6.0" | ||
| android:propertyXName="translateX" | ||
| android:propertyYName="translateY" /> | ||
|
|
||
| </set> |
26 changes: 26 additions & 0 deletions
26
packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="200" | ||
| android:interpolator="@interpolator/ic_qs_expand_animation_interpolator_0" | ||
| android:propertyName="rotation" | ||
| android:valueFrom="45.0" | ||
| android:valueTo="-45.0" | ||
| android:valueType="floatType" /> | ||
|
|
||
| </set> |
26 changes: 26 additions & 0 deletions
26
packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <set xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <objectAnimator | ||
| android:duration="200" | ||
| android:interpolator="@interpolator/ic_qs_expand_animation_interpolator_0" | ||
| android:propertyName="rotation" | ||
| android:valueFrom="-45.0" | ||
| android:valueTo="45.0" | ||
| android:valueType="floatType" /> | ||
|
|
||
| </set> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <!-- | ||
| 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:name="ic_qs_collapse" | ||
| android:height="24dp" | ||
| android:viewportHeight="24" | ||
| android:viewportWidth="24" | ||
| android:width="24dp" > | ||
|
|
||
| <group | ||
| android:name="chevron_02" | ||
| android:rotation="90" | ||
| android:translateX="12" | ||
| android:translateY="9" > | ||
| <group | ||
| android:name="rectangle_2" | ||
| android:rotation="-45" > | ||
| <group | ||
| android:name="rectangle_2_pivot" | ||
| android:translateY="4" > | ||
| <group | ||
| android:name="rectangle_path_2_position" | ||
| android:translateY="-1" > | ||
| <path | ||
| android:name="rectangle_path_2" | ||
| android:fillColor="#FFFFFFFF" | ||
| android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||
| </group> | ||
| </group> | ||
| </group> | ||
| <group | ||
| android:name="rectangle_1" | ||
| android:rotation="45" > | ||
| <group | ||
| android:name="rectangle_1_pivot" | ||
| android:translateY="-4" > | ||
| <group | ||
| android:name="rectangle_path_1_position" | ||
| android:translateY="1" > | ||
| <path | ||
| android:name="rectangle_path_1" | ||
| android:fillColor="#FFFFFFFF" | ||
| android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||
| </group> | ||
| </group> | ||
| </group> | ||
| </group> | ||
|
|
||
| </vector> |
29 changes: 29 additions & 0 deletions
29
packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:drawable="@drawable/ic_qs_collapse" > | ||
|
|
||
| <target | ||
| android:name="chevron_02" | ||
| android:animation="@anim/ic_qs_collapse_chevron_02_animation" /> | ||
| <target | ||
| android:name="rectangle_2" | ||
| android:animation="@anim/ic_qs_collapse_rectangle_2_animation" /> | ||
| <target | ||
| android:name="rectangle_1" | ||
| android:animation="@anim/ic_qs_collapse_rectangle_1_animation" /> | ||
|
|
||
| </animated-vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <!-- | ||
| 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:name="ic_qs_expand" | ||
| android:height="24dp" | ||
| android:viewportHeight="24" | ||
| android:viewportWidth="24" | ||
| android:width="24dp" > | ||
|
|
||
| <group | ||
| android:name="chevron_01" | ||
| android:rotation="90" | ||
| android:translateX="12" | ||
| android:translateY="15" > | ||
| <group | ||
| android:name="rectangle_3" | ||
| android:rotation="45" > | ||
| <group | ||
| android:name="rectangle_2_pivot_0" | ||
| android:translateY="4" > | ||
| <group | ||
| android:name="rectangle_path_3_position" | ||
| android:translateY="-1" > | ||
| <path | ||
| android:name="rectangle_path_3" | ||
| android:fillColor="#FFFFFFFF" | ||
| android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||
| </group> | ||
| </group> | ||
| </group> | ||
| <group | ||
| android:name="rectangle_4" | ||
| android:rotation="-45" > | ||
| <group | ||
| android:name="rectangle_1_pivot_0" | ||
| android:translateY="-4" > | ||
| <group | ||
| android:name="rectangle_path_4_position" | ||
| android:translateY="1" > | ||
| <path | ||
| android:name="rectangle_path_4" | ||
| android:fillColor="#FFFFFFFF" | ||
| android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||
| </group> | ||
| </group> | ||
| </group> | ||
| </group> | ||
|
|
||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:drawable="@drawable/ic_qs_expand" > | ||
|
|
||
| <target | ||
| android:name="chevron_01" | ||
| android:animation="@anim/ic_qs_expand_chevron_01_animation" /> | ||
| <target | ||
| android:name="rectangle_3" | ||
| android:animation="@anim/ic_qs_expand_rectangle_3_animation" /> | ||
| <target | ||
| android:name="rectangle_4" | ||
| android:animation="@anim/ic_qs_expand_rectangle_4_animation" /> | ||
|
|
||
| </animated-vector> |
17 changes: 17 additions & 0 deletions
17
packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" /> |
17 changes: 17 additions & 0 deletions
17
packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" /> |
Oops, something went wrong.