PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move personal account settings to a new screen."

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-06-04 07:48:13 +00:00
committed by Android (Google) Code Review
parent 9bf759c3cd ba63597d5a
commit 820848a038
5 changed files with 337 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout/account_type_preference.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/accountTypeIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@null" />

6
res/values/strings.xml
View File

@@ -718,6 +718,8 @@
<string name="profile_info_settings_title">Profile info</string>
<!-- Main Settings screen setting option title for the item to take you to the location screen -->
<string name="location_settings_title">Location</string>
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
<string name="account_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
<string name="security_settings_title">Security</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
@@ -1804,6 +1806,10 @@
<!-- Account settings header. [CHAR LIMIT=30] -->
<string name="account_settings">Accounts</string>
<!-- Header for items under the personal user [CHAR LIMIT=30] -->
<string name="category_personal">Personal</string>
<!-- Header for items under the work user [CHAR LIMIT=30] -->
<string name="category_work">Work</string>
<!-- Main Settings screen, setting option name to go into search settings -->
<string name="search_settings">Search</string>

51
res/xml/account_settings.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="account"
android:title="@string/account_settings_title">
<Preference
android:key="add_account"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
<PreferenceCategory
android:key="account_personal"
android:title="@string/category_personal" >
<Preference
android:key="add_account_personal"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
</PreferenceCategory>
<PreferenceCategory
android:key="account_work"
android:title="@string/category_work" >
<Preference
android:key="add_account_work"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
</PreferenceCategory>
</PreferenceScreen>

9
res/xml/dashboard_categories.xml
View File

@@ -162,6 +162,15 @@
android:icon="@drawable/ic_settings_security"
/>
<!-- Account -->
<!-- TODO: add accounts icon -->
<dashboard-tile
android:id="@+id/account_settings"
android:title="@string/account_settings_title"
android:fragment="com.android.settings.accounts.AccountSettings"
android:icon="@null"
/>
<!-- Language -->
<dashboard-tile
android:id="@+id/language_settings"