OSDN Git Service
Maurice Lam [Sat, 28 Jun 2014 02:40:20 +0000 (19:40 -0700)]
[WifiSetup] L layout update
Changed the layout based on the new design mocks. Copied over
StickyHeaderListView and SetupWizardHeader. Currently using the
generic illustration but will update to Wifi setup specific version
once we get them.
Change-Id: I22bdef8c9860d419be55938e1e4a6a682db5b7e8
Amith Yamasani [Wed, 9 Jul 2014 19:10:58 +0000 (19:10 +0000)]
Merge "Multiuser settings revamp - followup to address comments"
Amith Yamasani [Tue, 1 Jul 2014 18:36:37 +0000 (00:06 +0530)]
Multiuser settings revamp - followup to address comments
Bug:
15761405
Change-Id: I9c03432a2f2651a931486ce65fb3b5af37608be0
Santos Cordon [Mon, 7 Jul 2014 23:25:10 +0000 (16:25 -0700)]
Update CryptKeeper to use PhoneManager APIS.
Change-Id: Ie0ba36ef55869f2d7cfd3e460541c6f3bd08da55
Ido Ofir [Wed, 9 Jul 2014 17:57:38 +0000 (17:57 +0000)]
Merge "b/
16154604 removing the settings link from the trust agent menu."
Ido Ofir [Tue, 8 Jul 2014 22:17:30 +0000 (15:17 -0700)]
b/
16154604 removing the settings link from the trust agent menu.
Change-Id: If5050a16ffd776a5ca2eec6f1dad4eef47f2f0e4
Fabrice Di Meglio [Tue, 8 Jul 2014 00:44:55 +0000 (00:44 +0000)]
Merge "Define a specific preferenceFragmentStyle in Settings Theme"
Fabrice Di Meglio [Thu, 3 Jul 2014 01:16:35 +0000 (18:16 -0700)]
Define a specific preferenceFragmentStyle in Settings Theme
- needed for being able to have PreferenceFragments look as the Dashboard
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: I098008a131aa29594025b38dd0dc07c1cc3bffdc
John Spurlock [Mon, 7 Jul 2014 23:27:13 +0000 (23:27 +0000)]
Merge "Settings: Update to follow new volume design."
John Spurlock [Sat, 5 Jul 2014 16:57:08 +0000 (12:57 -0400)]
Settings: Update to follow new volume design.
- "Sound & Notification" (not Notifications)
- Remove ringer-mode pref.
- Add zen-mode pref to renamed "Interruptions" screen.
- Implement two separate "Sound" & "Notification" sections.
- Remove "Showing notifications" screen, migrate settings.
- Remove custom category styling now that we have a platform style.
- Implement new "days" sleep mode and corresponding dialog pref.
- Corresponding changes to indexable resources.
Associated frameworks/base change:
I35afe38646f04d2ba0dbac11c2c6356120a33694
Bug:
15831713
Change-Id: I6ed56791784968adfbd684f490dbbebed285a2dd
Derek Tan [Mon, 7 Jul 2014 23:22:53 +0000 (23:22 +0000)]
Merge "Get phone number from TelephonyManager on Phone Status page."
Baligh Uddin [Sun, 6 Jul 2014 21:41:28 +0000 (21:41 +0000)]
am
9bf54e70: (-s ours) am
395cf2d1: (-s ours) am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
9bf54e7081c2b98e47fb493455627d31848f78b9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:34:21 +0000 (21:34 +0000)]
am
395cf2d1: (-s ours) am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
395cf2d1ce9ed817dae092b2fc33ad6f9bb881c4':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:27:40 +0000 (21:27 +0000)]
am
12d64129: (-s ours) am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
12d6412978761f1aab14fbe9244d14c7cefc63b8':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:36 +0000 (21:24 +0000)]
am
a64a0904: (-s ours) am
5a55f567: (-s ours) Import translations. DO NOT MERGE
* commit '
a64a09042cd64d57e145c8c88693d929450a5878':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:09 +0000 (21:21 +0000)]
am
c53e033e: (-s ours) Import translations. DO NOT MERGE
* commit '
c53e033e0a5f5f408a1818444462d4ea4e7f80f2':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:18:48 +0000 (21:18 +0000)]
am
5a55f567: (-s ours) Import translations. DO NOT MERGE
* commit '
5a55f567d9dcdb7a255cfcfeb86d9bb0add43ed6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 12:24:33 +0000 (05:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0e3c511d208a4b8eaa9c0d0c8bd8fc90148ae72e
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 12:00:45 +0000 (05:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib5aa49667b420a1ff6426274d9205242d638c78c
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 11:57:08 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2f01e63ccf0f291b96f749af7d85f2f0036728
Auto-generated-cl: translation import
Tadashi G. Takaoka [Fri, 4 Jul 2014 12:28:17 +0000 (21:28 +0900)]
Refactor spell checker settings a bit
This CL removes unnecessary SpellCheckerUtils class.
Change-Id: I1b94b76620fee9119df726b86cec73fb32c0ee8b
Derek Tan [Thu, 3 Jul 2014 00:44:53 +0000 (17:44 -0700)]
Get phone number from TelephonyManager on Phone Status page.
Bug:
11900806
Change-Id: I4df3fac7b483ddae2bbda14b5a85629486e400cf
Alan Viverette [Thu, 3 Jul 2014 00:58:52 +0000 (00:58 +0000)]
Merge "Update data usage progress bar to match framework"
Alan Viverette [Thu, 3 Jul 2014 00:50:38 +0000 (17:50 -0700)]
Update data usage progress bar to match framework
Change-Id: Ibc8af377e6088fd03100809a85d9e4ee69bfad1d
Ido Ofir [Tue, 24 Jun 2014 23:26:09 +0000 (16:26 -0700)]
changing language for security screen regarding trust agents
and fixing a bug with multiple trust agents.
Change-Id: I14ee45110a20124d8f9ed2dc80214aff4dc521d3
Tadashi G. Takaoka [Wed, 9 Jul 2014 07:25:32 +0000 (07:25 +0000)]
Merge "Add TODO comments to Language & input settings"
Tadashi G. Takaoka [Wed, 9 Jul 2014 05:59:19 +0000 (14:59 +0900)]
Add TODO comments to Language & input settings
Bug:
16115751
Change-Id: I7bc426b95af214374db98c35314f4893dabfb2d4
vandwalle [Wed, 9 Jul 2014 02:46:17 +0000 (02:46 +0000)]
Merge "add BSSID blacklist indicator"
Dianne Hackborn [Wed, 9 Jul 2014 00:23:13 +0000 (00:23 +0000)]
Merge "Issue #
15986092: Add power tracking of flashlight."
Dianne Hackborn [Mon, 30 Jun 2014 23:58:52 +0000 (16:58 -0700)]
Issue #
15986092: Add power tracking of flashlight.
Also improve drawing of date markers to allow a middle
marker for really looong durations.
Change-Id: I0c12ec9b6de102360d9171627787462dfa58b7ef
Paul Lawrence [Thu, 19 Jun 2014 20:34:58 +0000 (13:34 -0700)]
Fix back button on crypto screen
Did not reenable after entering wrong password.
Bug:
12434219
Change-Id: If8b0c22213a345b3dd0f92e02710c155c7adcd1c
vandwalle [Tue, 8 Jul 2014 19:23:53 +0000 (12:23 -0700)]
add BSSID blacklist indicator
Change-Id: I476d9fd48ca5786642721ff78f9a4a603179ad81
PauloftheWest [Tue, 24 Jun 2014 14:42:27 +0000 (07:42 -0700)]
Added Saved networks UI to Wifi
+ Added Saved networks to Overflow menu
+ Moved WPS Pin Entry from Overflow menu to Advance Setting Activity
+ "Automatically manage Wi-Fi : Let a Wi-Fi assistant manage your connection"
+ "Wi-Fi assistant : <selected assistant> [cog secondary hit target]
+ MAC address & IP address list items have the static italic style
- "Avoid poor connections" from Advance Settings
- "Wi-Fi optimization" from Advance Settings
Bug:
15698824
Change-Id: Ieb25b29874752db07398dcb200ec07862779f507
Fabrice Di Meglio [Tue, 8 Jul 2014 18:05:17 +0000 (18:05 +0000)]
Merge "FR #
16136331 Search - results should be ordered with match on Title and then on SubTitle"
Fabrice Di Meglio [Tue, 8 Jul 2014 17:50:34 +0000 (10:50 -0700)]
FR #
16136331 Search - results should be ordered with match on Title and then on SubTitle
- issue two queries instead of one. The first is for matching on the Title
and the second is for matching on the SubTitle (but use EXECEPT clause for
filtering out the potential dupe results that may be coming from the Title)
- use a MergeCursor for aggregating the two Cursor
Change-Id: I0ba4bb227dbd4a113348da8ed788ca7cded986fb
Alexandra Gherghina [Wed, 2 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "Adds missing per-user calls for displaying and syncing accounts"
Alexandra Gherghina [Tue, 1 Jul 2014 14:24:45 +0000 (15:24 +0100)]
Adds missing per-user calls for displaying and syncing accounts
Bug:
15466880
Change-Id: Ifa96af782adc8485f925dc45d5c71b1c28a075d2
Fabrice Di Meglio [Wed, 2 Jul 2014 00:33:14 +0000 (00:33 +0000)]
Merge "Fix RTL support for the Dashboard"
Fabrice Di Meglio [Wed, 2 Jul 2014 00:30:57 +0000 (17:30 -0700)]
Fix RTL support for the Dashboard
- make ic_settings_nfc_payment auto mirror
See bug: #
15313101 Settings Dashboard needs to support RTL
Change-Id: If8174e0ce565100e3e61bcdef19ff105ab4f636f
Fabrice Di Meglio [Wed, 2 Jul 2014 00:18:40 +0000 (17:18 -0700)]
Fix again bug #
15940103 ACTION_SYNC_SETTINGS shows the non-functional
...left arrow button at the top (the back button works)
- the android.settings.DATE_SETTINGS Intent was showing similar issue
so this CL fix it on a more generic basis
Change-Id: I4c26a5a8dc3eb090d26967fa607449a4fe6631c6
Fabrice Di Meglio [Wed, 2 Jul 2014 00:25:43 +0000 (00:25 +0000)]
Merge "Fix again bug #
15940103 ACTION_SYNC_SETTINGS shows the non-functional ...left arrow button at the top (the back button works)"
Fabrice Di Meglio [Tue, 1 Jul 2014 22:15:18 +0000 (15:15 -0700)]
Fix SettingsPreferenceFragment.startFragment()
- was always passing R.string.lock_settings_picker_title as a title res
Change-Id: Iab47ef3da00e91d5ce3b6dc50c50c943bd78b08f
Fabrice Di Meglio [Tue, 1 Jul 2014 21:32:03 +0000 (14:32 -0700)]
Fix some Dashboard top categories not showing for Search
- fix Date & time / Printing / Security
See bug: #
12910134 Implement Search into the Settings App
Change-Id: I7e96eb35a6802fde7589ccfe244e71f8be43dea8
Fabrice Di Meglio [Tue, 1 Jul 2014 19:12:52 +0000 (12:12 -0700)]
Fix Search History RTL support
- make ic_search_history icon auto mirror
Change-Id: I3e57103bf776f4dd52c2089d80992d9abef4ec1c
Fabrice Di Meglio [Tue, 1 Jul 2014 19:03:09 +0000 (12:03 -0700)]
Fix RTL support for the Dashboard
- the RTL version of ic_settings_display was shadowing the real
icon
- make the new icon auto mirror
See bug: #
15313101 Settings Dashboard needs to support RTL
Change-Id: I8c935cf8f5e5166e5ced70f27b3703bb3de8319d
Fabrice Di Meglio [Tue, 1 Jul 2014 00:16:25 +0000 (17:16 -0700)]
Update Search Suggestions and Results Panel
- fix overdraw use as less backgrounds as possible
- make it look like the Dashboard with padding left and right
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: I30ff33e51bc3c73e888d45f0ce6e16784eb6721c
Fabrice Di Meglio [Wed, 2 Jul 2014 01:26:16 +0000 (01:26 +0000)]
Merge "Fix bug #
16020502 I can crash Settings with java.lang.ClassNotFoundException: ...Didn't find class "com.android.settings.users.AppRestrictionsFragment$Activity""
Fabrice Di Meglio [Wed, 2 Jul 2014 01:22:00 +0000 (18:22 -0700)]
Fix bug #
16020502 I can crash Settings with java.lang.ClassNotFoundException:
...Didn't find class "com.android.settings.users.AppRestrictionsFragment$Activity"
- remove it from the AndroidManifest
Change-Id: I135d9268b9959f0f01df79aade61fe087eebaeed
Fabrice Di Meglio [Tue, 1 Jul 2014 22:39:09 +0000 (22:39 +0000)]
Merge "Fix SettingsPreferenceFragment.startFragment()"
Fabrice Di Meglio [Tue, 1 Jul 2014 21:41:09 +0000 (21:41 +0000)]
Merge "Fix some Dashboard top categories not showing for Search"
Fabrice Di Meglio [Tue, 1 Jul 2014 19:15:04 +0000 (19:15 +0000)]
Merge "Fix Search History RTL support"
Fabrice Di Meglio [Tue, 1 Jul 2014 19:07:01 +0000 (19:07 +0000)]
Merge "Fix RTL support for the Dashboard"
Andres Morales [Tue, 1 Jul 2014 18:51:46 +0000 (11:51 -0700)]
Fix Write to NFC Tag dialog layout for tablets
Change-Id: I10a846dd328ff7b3f06350ff93197712495d2fb4
Fabrice Di Meglio [Tue, 1 Jul 2014 18:25:16 +0000 (18:25 +0000)]
Merge "Update Search Suggestions and Results Panel"
Amith Yamasani [Mon, 30 Jun 2014 10:01:37 +0000 (15:31 +0530)]
Multiuser settings revamp for L, first pass
Include Guest settings
Ability to switch users from Settings
Manage user settings like telephony access
Bug:
15761405
Change-Id: I2cfdc7bc2703ed202aa8bf1261c304c51ce48b29
Fabrice Di Meglio [Mon, 30 Jun 2014 22:18:08 +0000 (15:18 -0700)]
Fix bug #
15940103 ACTION_SYNC_SETTINGS shows the non-functional left arrow button at the top
- make android.settings.SYNC_SETTINGS Intent behave like a Shortcut
(no Up affordance nor Search)
Change-Id: I573feaedeb062757fb893417e8746d17a09e66f4
Fabrice Di Meglio [Mon, 30 Jun 2014 20:11:53 +0000 (13:11 -0700)]
Disable auto-backup for Settings App
- we dont want Settings data to be backed-up so add
android:allowBackup="false" to the AndroidManifest
Change-Id: I1165a37ecdd18c6a6526ce8b9a9576d9bbfd415b
Alexandra Gherghina [Tue, 10 Jun 2014 13:01:10 +0000 (14:01 +0100)]
Handle forwarded intents from a managed user in AccountSyncSettings
Bug:
15466880
Change-Id: I4041b69f237033dbe5b78c8eb52f5e6ebb6ff7f7
Fabrice Di Meglio [Sun, 29 Jun 2014 23:19:35 +0000 (23:19 +0000)]
Merge "Make edge effect goes border to border on xlarge tablets"
Fabrice Di Meglio [Sun, 29 Jun 2014 21:49:56 +0000 (14:49 -0700)]
Make edge effect goes border to border on xlarge tablets
- it is all where you apply the padding ...
Change-Id: Ia8b75662a387bee278b4ea1bca83153724db5bfa
Baligh Uddin [Sat, 28 Jun 2014 03:04:58 +0000 (03:04 +0000)]
am
5e34f2b6: (-s ours) Import translations. DO NOT MERGE
* commit '
5e34f2b6ce70b574fc4c258d70fd841e6f86a8e5':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Sat, 28 Jun 2014 02:13:19 +0000 (19:13 -0700)]
Fix bug #
15897505 Talk back state shows "off" while the talk back is still enabled.
- we were missing the update of the TextView from the SwitchBar so provide a new
setCheckedInternal() method that is doing the TextView and Switch update at the
same time
Change-Id: I6dd9c472a386bb534a58fbf5cf82d9d01fa74f6c
Fabrice Di Meglio [Sat, 28 Jun 2014 01:18:14 +0000 (18:18 -0700)]
Fix bug #
15939648 "Use TalkBack ?" is shown after orientation change even if it was OFF before
- prevent onSaveInstanceState() on the ToggleSwitch
- fix missing setOnCheckedChangeListener() when restoring the SwitchBar state
Change-Id: I818577004f142be46fa378389f264c7f37cfd7b8
Craig Mautner [Mon, 30 Jun 2014 14:48:01 +0000 (14:48 +0000)]
Merge "Take TextToSpeechSettings out of endless loop"
Baligh Uddin [Mon, 30 Jun 2014 09:28:27 +0000 (02:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab0c8c9538100600bf2c0d47a9eb9cb26ffb49e4
Auto-generated-cl: translation import
Craig Mautner [Sat, 28 Jun 2014 21:25:28 +0000 (14:25 -0700)]
Take TextToSpeechSettings out of endless loop
Launching an Activity using startActivityForResult() every time
you are in onResume() is a recipe for endless looping. I.e. every
time the launched Activity finishes it will be relaunched because
the launching Activity reenters onResume().
This change keeps the GetSampleText activity from being launched
from onResume if we already have the sample text and the Locale
hasn't changed since the last onResume.
Fixes bug
15951054.
Change-Id: I65d9070df93396d8d3a45a6673ae56826f418122
Baligh Uddin [Sat, 28 Jun 2014 03:00:11 +0000 (03:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Lifu Tang [Sat, 28 Jun 2014 02:31:47 +0000 (02:31 +0000)]
Merge "Disable the switch bar instead of switch itself"
Lifu Tang [Sat, 28 Jun 2014 01:10:16 +0000 (18:10 -0700)]
Disable the switch bar instead of switch itself
- Fix b/
15754817
Change-Id: I20c5bc85d35057a340ddcac691912863a4477804
Fabrice Di Meglio [Sat, 28 Jun 2014 02:18:11 +0000 (02:18 +0000)]
Merge "Fix bug #
15897505 Talk back state shows "off" while the talk back is still enabled."
Fabrice Di Meglio [Sat, 28 Jun 2014 02:03:57 +0000 (02:03 +0000)]
Merge "Fix bug #
15939648 "Use TalkBack ?" is shown after orientation change even if it was OFF before"
PauloftheWest [Wed, 18 Jun 2014 18:20:24 +0000 (11:20 -0700)]
Applied some minor UI changes (see below)
+ Changed wifi icons to teal
+ Removed “Secured with …” from network status
+ Added an empty state image above text when Wi-Fi is off
+ Removed Wi-Fi Direct and WPS Push button from overflow menu
+ Added Wi-Fi Direct and WPS Push button to Advance Activity
+ Input Password Dialog: Moved Signal Strength and Security to Advance
+ Input Password Dialog: Updated Password text to Material style
BugId: #
15698824 #
15702808
Change-Id: I542ab9aac2c098738330c92d9183d3907c4f0b38
Fabrice Di Meglio [Thu, 26 Jun 2014 23:20:26 +0000 (16:20 -0700)]
Fix bug #
15431722 Uninstalling an app via settings leaves user on screen
...for the now uninstalled app
- add the missing call to finish()
- fix also a typo
Change-Id: I3d365db1fa1e6ba1efeddae022d8c2136af6380a
Fabrice Di Meglio [Thu, 26 Jun 2014 22:50:33 +0000 (15:50 -0700)]
Fix WifiSettings / AdvancedWifiSettings indexing
- fix typo for the declaration of the SearchIndexableResource for
AdvancedWifiSettings that was not the correct one
See bug: #
12910134 Implement Search into the Settings App
Change-Id: I964ca7ae4ba75a382af099e023383fc00773c844
Fabrice Di Meglio [Thu, 26 Jun 2014 22:45:37 +0000 (15:45 -0700)]
Fix bug #
15914018 Search - "wifi" does not gives any result for WifiSettings
- prevent the NPE by checking if the drawable reference is not null
Was a regression from
c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91
Change-Id: I467dfd41b76eacd0ad1c67bc138481964b2e5b13
Fabrice Di Meglio [Thu, 26 Jun 2014 21:17:45 +0000 (14:17 -0700)]
Fix new Wi-Fi strings from Developer Options
- issue introduced by that CL:
5e7b3ad09f28f0ef083b6f10cf17f26a39735deb
- use Wi\u2011Fi
Change-Id: I1e00a3c435cebcecfda2f8d91787587c56fd3bc1
Fabrice Di Meglio [Thu, 26 Jun 2014 20:48:55 +0000 (13:48 -0700)]
Fix icon size for Data Usage / Battery Stats / Process Stats
- remove padding from app_percentage_item and apply it correctly
on its containers
- wrap app_percentage_item into preference_app_percentage for having
correct padding o nProcessStatsPreference and PowerGaugePreference
Change-Id: I290c92959f51a33a1edb49435cd0bd1e6cd9afa3
Baligh Uddin [Thu, 26 Jun 2014 20:55:58 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib11c205c5d938b147c6db5cd86c104018193c827
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Jun 2014 20:50:58 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic74a7c7565290f1b9dff3865ad66ae8f3b100b2a
Auto-generated-cl: translation import
Julia Reynolds [Mon, 30 Jun 2014 14:09:53 +0000 (14:09 +0000)]
Merge "Credentials should be shown but can't be modified."
Jason Monk [Fri, 27 Jun 2014 12:56:06 +0000 (12:56 +0000)]
Merge "Add lock-to-app to settings"
Fabrice Di Meglio [Thu, 26 Jun 2014 23:23:39 +0000 (23:23 +0000)]
Merge "Fix bug #
15431722 Uninstalling an app via settings leaves user on screen ...for the now uninstalled app"
Fabrice Di Meglio [Thu, 26 Jun 2014 23:22:36 +0000 (23:22 +0000)]
Merge "Fix WifiSettings / AdvancedWifiSettings indexing"
Fabrice Di Meglio [Thu, 26 Jun 2014 22:48:46 +0000 (22:48 +0000)]
Merge "Fix bug #
15914018 Search - "wifi" does not gives any result for WifiSettings"
Fabrice Di Meglio [Thu, 26 Jun 2014 21:20:27 +0000 (21:20 +0000)]
Merge "Fix new Wi-Fi strings from Developer Options"
Fabrice Di Meglio [Thu, 26 Jun 2014 21:06:03 +0000 (21:06 +0000)]
Merge "Fix icon size for Data Usage / Battery Stats / Process Stats"
Julia Reynolds [Thu, 26 Jun 2014 19:15:07 +0000 (19:15 +0000)]
Merge "Use user restriction instead of pin to guard factory reset in Settings."
Baligh Uddin [Thu, 26 Jun 2014 16:54:22 +0000 (16:54 +0000)]
am
eab9192a: (-s ours) Import translations. DO NOT MERGE
* commit '
eab9192aca9091d2b72d6697220d192536b9201e':
Import translations. DO NOT MERGE
Jason Monk [Thu, 19 Jun 2014 14:33:41 +0000 (10:33 -0400)]
Add lock-to-app to settings
Lock-to-app when disabled shows some instructions about how to
enable it and use it.
When enabled shows an option of use lock screen, which controls
whether the device is locked when exiting lock-to-app. Turning
on use lock screen requires that the device have some security
challenge.
Bug:
15759649
Change-Id: I6188243e03fb0c85bdfdbc32a23ad486296a34f9
Alexandra Gherghina [Wed, 4 Jun 2014 09:02:55 +0000 (10:02 +0100)]
Add work account settings.
Bug:
15467756
Change-Id: I13b5a0bb3967611d0d24b575bfc15d9bfaad4cfa
Jeff Davidson [Thu, 26 Jun 2014 17:17:48 +0000 (17:17 +0000)]
Merge "Update change scorer dialog to use new label field."
Baligh Uddin [Thu, 26 Jun 2014 16:59:49 +0000 (16:59 +0000)]
am
29450680: (-s ours) am
eab9192a: (-s ours) Import translations. DO NOT MERGE
* commit '
294506808d140eb0cb14bec0a48704a23f63da90':
Import translations. DO NOT MERGE
Jeff Davidson [Tue, 24 Jun 2014 01:17:43 +0000 (18:17 -0700)]
Update change scorer dialog to use new label field.
Bug:
15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
Baligh Uddin [Wed, 25 Jun 2014 17:39:48 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b2d1434d76982612d7aa754464a4abf1210daef
Auto-generated-cl: translation import
Fabrice Di Meglio [Thu, 26 Jun 2014 00:23:29 +0000 (00:23 +0000)]
Merge "Make Apps Icons size consistent in Battery Stats"
Fabrice Di Meglio [Thu, 26 Jun 2014 00:04:39 +0000 (17:04 -0700)]
Make Apps Icons size consistent in Battery Stats
- set them to 24dip as for the Settings Dashboard
Change-Id: Iadab299cac88a6b22157d285aff8a7dcf506fc97
Fabrice Di Meglio [Wed, 25 Jun 2014 21:19:49 +0000 (21:19 +0000)]
Merge "Update Dashboard layout - part 2"
Fabrice Di Meglio [Tue, 24 Jun 2014 22:29:08 +0000 (15:29 -0700)]
Update Dashboard layout - part 2
- follow UX spec
- tablet UI support
- tuning for phone UI
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: I26fc6a51a4bb608399f319206c27f58c21b4aa64
Christoph Studer [Wed, 25 Jun 2014 10:49:16 +0000 (10:49 +0000)]
Merge "Remove ZEN notification visibility settings"
Christoph Studer [Tue, 24 Jun 2014 16:23:29 +0000 (18:23 +0200)]
Remove ZEN notification visibility settings
Bug:
15286335
Change-Id: I927948458cfa4cddb8ebffda2f4c81fa003f8004