diff options
| author | 2017-06-28 15:10:53 -0700 | |
|---|---|---|
| committer | 2017-11-13 14:59:54 -0800 | |
| commit | 85fbddc9380b386a1adc804fbcbf0a7c69bb887e (patch) | |
| tree | d1806a67ce9acbcc96d3383228607c682bf0ccca | |
| parent | 3c9118900fc64e0172efb736a35f62dcc168e3a4 (diff) | |
Provide materials for Mobile network settings UI.
Provide customized layout for category style with divider above.
Provide drawable for "expland more" icon.
Bug: 63133738
Test: Manual
Change-Id: I477b7cc088001d9ded6aa1cf78206f974a376bc1
Merged-In: I477b7cc088001d9ded6aa1cf78206f974a376bc1
3 files changed, 86 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/drawable/ic_expand_more.xml b/packages/SettingsLib/res/drawable/ic_expand_more.xml new file mode 100644 index 000000000000..a8ff5397c839 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_expand_more.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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" + android:tint="?android:attr/colorControlNormal"> + + <path + android:fillColor="@android:color/white" + android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/> + +</vector> diff --git a/packages/SettingsLib/res/layout/preference_category_divider.xml b/packages/SettingsLib/res/layout/preference_category_divider.xml new file mode 100644 index 000000000000..6644eecd71fa --- /dev/null +++ b/packages/SettingsLib/res/layout/preference_category_divider.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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:id="@+id/two_target_divider" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:gravity="start|center_vertical" + android:orientation="horizontal"> + <View + android:layout_height="1dp" + android:layout_width="match_parent" + android:background="?android:attr/dividerHorizontal" /> +</LinearLayout>
\ No newline at end of file diff --git a/packages/SettingsLib/res/layout/preference_category_material_settings_with_divider.xml b/packages/SettingsLib/res/layout/preference_category_material_settings_with_divider.xml new file mode 100644 index 000000000000..70d0898f71c1 --- /dev/null +++ b/packages/SettingsLib/res/layout/preference_category_material_settings_with_divider.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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. + --> + +<!-- Similar to preference_category_material_settings.xml, except that this always adds + a divider above category. --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/preference_category_divider"/> + <include layout="@layout/preference_category_material_settings"/> +</LinearLayout>
\ No newline at end of file |