OSDN Git Service
Fabrice Di Meglio [Sat, 5 Apr 2014 01:18:57 +0000 (01:18 +0000)]
Merge "Change Search icon asset in the ActionBar"
Fabrice Di Meglio [Sat, 5 Apr 2014 01:17:02 +0000 (18:17 -0700)]
Change Search icon asset in the ActionBar
- use ic_search_api_holo_light and wait for the Quantum Paper asset
Related to bug #
13818985 Settings using GB-style search icon
Change-Id: I6e550008b1ec89470c66bc83b55dec11f7a3f067
Fabrice Di Meglio [Sat, 5 Apr 2014 00:57:49 +0000 (00:57 +0000)]
Merge "Fix bug #
13817456 User not take to previous sub setting screen when Home ...affordance is tapped from second level sub settings page"
Fabrice Di Meglio [Sat, 5 Apr 2014 00:55:57 +0000 (17:55 -0700)]
Fix bug #
13817456 User not take to previous sub setting screen when Home
...affordance is tapped from second level sub settings page
- start an Activity instead of switch Fragments
Change-Id: I0e47d6539a3a048d7aa25bdb125c4c99031f9e85
Xia Wang [Sat, 5 Apr 2014 00:54:54 +0000 (00:54 +0000)]
am
70ce016f: am
d2f56f07: am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
70ce016f84ce6c54b2c5f07adf86e415de5598cb':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:51:44 +0000 (00:51 +0000)]
am
d2f56f07: am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
d2f56f07f97e72e62c51b82454d06de1e7b929a8':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:48:38 +0000 (00:48 +0000)]
am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ac768973bc23b9f8f266013c20d301554729fd70':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:43:17 +0000 (00:43 +0000)]
am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ce11881accf5db04e2a54b58176e24de49ef6917':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Fri, 4 Apr 2014 23:23:38 +0000 (16:23 -0700)]
Allow VPN to stay connected for some time before disconnecting it.
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
Fabrice Di Meglio [Sat, 5 Apr 2014 00:02:46 +0000 (17:02 -0700)]
Re-enable the switch into Location Settings
- get rid of that onIsHidingHeaders()
Change-Id: If0b3fc6900f70cb6dfb54094d1b46b44aba6290f
Fabrice Di Meglio [Fri, 4 Apr 2014 21:48:05 +0000 (14:48 -0700)]
Fix bug #
13813608 Launcher back button does not take you to previous...
... settings after orientation change
- gasp, there were some issues in the way we were tracking if
a search result fragment was opened. Simplified that code.
Change-Id: I7f8efb3a5aab1a275193f7de15ac50ca33bdad16
Fabrice Di Meglio [Fri, 4 Apr 2014 18:32:28 +0000 (11:32 -0700)]
Fix bug #
13758772 Crash when hitting back after clicking on add a restricted...
... profile under Users
- no need to show the dialog again when we have pressed on BACK
Change-Id: I76f155a488512689c5af40ff35b80ce034da4ffe
Fabrice Di Meglio [Fri, 4 Apr 2014 17:18:22 +0000 (17:18 +0000)]
Merge "Add more logging for onHeaderClick(...)"
Fabrice Di Meglio [Fri, 4 Apr 2014 17:16:59 +0000 (10:16 -0700)]
Add more logging for onHeaderClick(...)
- log Header title and position
Change-Id: I07f7e8c50613b97609a3ea462b7a8e8fcc415f70
Baligh Uddin [Fri, 4 Apr 2014 15:00:02 +0000 (15:00 +0000)]
am
1c89073d: (-s ours) am
87132265: (-s ours) am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:53:11 +0000 (14:53 +0000)]
am
87132265: (-s ours) am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
871322653c4109a9640b56374a246120c65f8241':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:52:31 +0000 (14:52 +0000)]
am
31e51bab: (-s ours) am
44e3e56f: (-s ours) am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
31e51bab1530c93183467d7fa5371a725ed910d6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:54 +0000 (14:45 +0000)]
am
44e3e56f: (-s ours) am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
44e3e56fe20c2fc59d90b6ef6564458cffb1efa7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:45 +0000 (14:45 +0000)]
am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3f3469aecc1da8bf72482ddae53e11d0245fddd9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:44:36 +0000 (14:44 +0000)]
am
6c87824b: (-s ours) am
457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
6c87824b86cd7e3420d3f600139648f6927b4b6c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:38:19 +0000 (14:38 +0000)]
am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
216b5c501bb81977407b5977e6ee709b34f3a37d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)]
am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cc01536f7755da6560a23057ac3dbdec10e3993f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:19 +0000 (14:37 +0000)]
am
457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
457681d5f15aaa32edf76e0765d1e9e2b532893e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:04 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:59 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:57 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Lawrence [Fri, 4 Apr 2014 14:06:09 +0000 (14:06 +0000)]
Merge "Show OwnerInfo on CryptKeeper screen"
Fabrice Di Meglio [Fri, 4 Apr 2014 02:31:07 +0000 (19:31 -0700)]
Fix bug #
13735413 Particular settings name changing on device orientation changes
- restore the title correctly when we are restoring the Settings App
Change-Id: Ibd56c52b703620e3d2b8e524e6b3caf35f3c8980
Fabrice Di Meglio [Fri, 4 Apr 2014 01:40:38 +0000 (18:40 -0700)]
Fix Up affordance when restoring Settings app state
- save the state of the Up affordance and restore it
Change-Id: Ia00e929b1bbcdaa51280f9b2bb9322f8594c5a37
Fabrice Di Meglio [Fri, 4 Apr 2014 01:11:21 +0000 (01:11 +0000)]
Merge "Code cleaning"
Fabrice Di Meglio [Fri, 4 Apr 2014 01:11:37 +0000 (18:11 -0700)]
Code cleaning
- remove dead code and some constants that were no more used
Change-Id: I32d19d74e5b271f9e7c8938e4b3c79175bdf69ee
Fabrice Di Meglio [Thu, 3 Apr 2014 23:45:54 +0000 (23:45 +0000)]
Merge "Fix bug #
13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent"
Fabrice Di Meglio [Thu, 3 Apr 2014 23:43:26 +0000 (16:43 -0700)]
Fix bug #
13794200 Settings crash when screen is locked and Power Usage...
...Settings is launched with an Intent
- fix the NPE by checking if mSearchMenuItem / mSearchView references are null
Change-Id: I7518c8360af88a20df780be8cb89360a26cdb8d0
Fabrice Di Meglio [Thu, 3 Apr 2014 21:02:51 +0000 (21:02 +0000)]
Merge "Re-enable on/off switch for Wi-Fi and Bluetooth Settings"
Fabrice Di Meglio [Thu, 3 Apr 2014 20:57:56 +0000 (13:57 -0700)]
Re-enable on/off switch for Wi-Fi and Bluetooth Settings
- the switch was no more there when launching from an Intent (it was a regression)
Change-Id: I1fc95cad4523a1d3812323fb26908f925a9e623e
Adrian Roos [Thu, 3 Apr 2014 17:03:11 +0000 (19:03 +0200)]
Merge commit '
e63ac36f' into master
Add lockout after trying to enter PIN / Password too often
Bug:
13647935
Conflicts:
src/com/android/settings/ConfirmLockPassword.java
Change-Id: I0bf69d6d7fa8d5be9ad0fb42fe500e0a377af53b
Adrian Roos [Thu, 3 Apr 2014 14:57:22 +0000 (14:57 +0000)]
am
79a17924: am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
79a179244612b09368209e2c95e48fe836aeab59':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:51:39 +0000 (14:51 +0000)]
am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
0b55caf01af1efa15ff0bfbf50a1726fce788660':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)]
am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
a52a37b0fe17109877abbc25943d0d74232f3e5f':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:38:30 +0000 (14:38 +0000)]
am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
90630f6a6d19e169befb8ad8117d53200eb562c4':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
Fabrice Di Meglio [Thu, 3 Apr 2014 02:39:57 +0000 (02:39 +0000)]
Merge "Add indexing for SwitchPreferences"
Fabrice Di Meglio [Thu, 3 Apr 2014 02:37:39 +0000 (19:37 -0700)]
Add indexing for SwitchPreferences
- now support the SwitchPreferences and save the "switchOn" and "switchOff"
attributes
- update Index database schema (and increment its version)
- fix an issue with some previous schema not rebuilt
Change-Id: I9cd48c666525f19474ef9bd5746d61b589058063
Fabrice Di Meglio [Thu, 3 Apr 2014 02:09:16 +0000 (02:09 +0000)]
Merge "Add indexing for ListPreferences"
Fabrice Di Meglio [Thu, 3 Apr 2014 02:05:45 +0000 (19:05 -0700)]
Add indexing for ListPreferences
- now support ListPreferences and save the "entries" attribute
- update Index database schema (and increment its version)
- do some clever stuff when showing Search results: if there is
a "$s" or "%s" in the summary (replacement strings), just use
the entries instead
Change-Id: If36595c3816706b6349faff7d3c2e725d3ea33f4
Fabrice Di Meglio [Thu, 3 Apr 2014 00:20:21 +0000 (00:20 +0000)]
Merge "Add indexing for Storage preferences"
Fabrice Di Meglio [Thu, 3 Apr 2014 00:07:36 +0000 (17:07 -0700)]
Add indexing for Storage preferences
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
Change-Id: I131e9176c47ccd697d05961b09546ba0e51059f7
Fabrice Di Meglio [Wed, 2 Apr 2014 22:51:01 +0000 (22:51 +0000)]
Merge "Blow up the Settings Search Index database if there is a Database downgrade detected"
Fabrice Di Meglio [Wed, 2 Apr 2014 22:43:39 +0000 (15:43 -0700)]
Blow up the Settings Search Index database if there is a Database downgrade detected
- use the onDowngrade(...) callback for blowing away the Search Index database and
recompute the Index.
Change-Id: I137b22e710dd3205063cf8ce239105b2f1c5278b
Fabrice Di Meglio [Wed, 2 Apr 2014 21:27:23 +0000 (21:27 +0000)]
Merge "Add indexing for Limited Interruptions (notifications) preferences"
Fabrice Di Meglio [Tue, 1 Apr 2014 21:30:07 +0000 (14:30 -0700)]
Add indexing for Limited Interruptions (notifications) preferences
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
- some code styling too
Change-Id: I106d1d9493eb945ea71e500acd43a1fc6096bb1f
Baligh Uddin [Wed, 2 Apr 2014 18:56:38 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4d32ca1bcd5304c2dbe5933591434cd7b1ccd9c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:52:34 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id18f3fec7657dd9eba74e4fd0f5c34eeea264fd2
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:49:10 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2521114c59686637b57ea802bbb72aa7fa01615c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:47:25 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife01297eb460bb5881d86ed7c0f672ecb461cb48
Auto-generated-cl: translation import
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often
Enforce the same lockout that is already enforced when entering the pattern.
Bug:
13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
Xia Wang [Wed, 2 Apr 2014 03:55:59 +0000 (03:55 +0000)]
am
2f633ca3: am
8361a97c: am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
2f633ca3a5813eb3fece716448308bf8e7d351ee':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:51:38 +0000 (03:51 +0000)]
am
8361a97c: am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
8361a97c43a49b5e7528afd5baeca624d909bbf9':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:45:56 +0000 (03:45 +0000)]
am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
3e23823015d2ad0679d89adc2a62c7d568adada8':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:40:26 +0000 (03:40 +0000)]
am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
836eff87a93f5b2857b41763197ab6782581aafc':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:36:50 +0000 (03:36 +0000)]
Merge "Add legacy VPN test framework and test cases" into klp-dev
Xia Wang [Sat, 29 Mar 2014 00:20:53 +0000 (17:20 -0700)]
Add legacy VPN test framework and test cases
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases
Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
Paul Lawrence [Tue, 18 Mar 2014 17:59:18 +0000 (10:59 -0700)]
Show OwnerInfo on CryptKeeper screen
Depends on framework change from
https://googleplex-android-review.git.corp.google.com/#/c/435138/
Bug
13526708
Change-Id: I16189b629b5515ec5175e05155ba4ec0c27d22fb
Fabrice Di Meglio [Tue, 1 Apr 2014 20:25:16 +0000 (20:25 +0000)]
Merge "Add indexing for Notifications preferences"
Fabrice Di Meglio [Tue, 1 Apr 2014 02:46:42 +0000 (19:46 -0700)]
Add indexing for Notifications preferences
- also add indexing of CheckBoxPreferences
- also some code cleaning
Change-Id: I2943caaec3d64fb2a6be85168454fc76fe572afe
Baligh Uddin [Tue, 1 Apr 2014 01:25:38 +0000 (01:25 +0000)]
am
b89c4d71: (-s ours) am
cf743762: (-s ours) am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
b89c4d713bd33072961ace7743d391ed6339d410':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Apr 2014 01:21:22 +0000 (01:21 +0000)]
Merge "Fix bug #
13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)."
Fabrice Di Meglio [Mon, 31 Mar 2014 23:52:06 +0000 (16:52 -0700)]
Fix bug #
13727850 Input values are not visible when setting up the lockscreen...
...security(PIN/Passwor/Pattern).
- remove hardcoded colors...
- define a text appearance style for the password / pin
Change-Id: I425a2daa016cb782f18de320b5696d076f576600
Baligh Uddin [Tue, 1 Apr 2014 00:24:35 +0000 (00:24 +0000)]
am
b3545a54: (-s ours) am
518a5037: (-s ours) Import translations. DO NOT MERGE
* commit '
b3545a548fe336024dae011ac1c4e643d4f4b114':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:21:31 +0000 (00:21 +0000)]
am
cf743762: (-s ours) am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
cf743762611ceb918aabee179ef10f81ccc90aaf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:15:49 +0000 (00:15 +0000)]
am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
88adaa72a385c3199787ecd3dae826f25d38572d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:09:19 +0000 (00:09 +0000)]
am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
112916b59634a86195880a1368d8d60a86f33188':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:08:46 +0000 (00:08 +0000)]
am
518a5037: (-s ours) Import translations. DO NOT MERGE
* commit '
518a503740bcb900fe8a69c86f5826466f99ee6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 22:15:05 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 31 Mar 2014 21:47:58 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40361b20546a4fa949b75623315040f0d32127fa
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:42:20 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
Adrian Roos [Mon, 24 Mar 2014 20:21:51 +0000 (21:21 +0100)]
Add initial trust agent settings
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.
Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
John Spurlock [Mon, 31 Mar 2014 16:02:35 +0000 (12:02 -0400)]
Zen mode settings update.
- Fix master switch placement, hide search option.
- New text-based design for bucket configs.
- Automatically turn on = Never
- Still read-only.
Bug:
13670014
Change-Id: I33e7614515cc4ce1ca957d922b844d4865e35c9a
John Spurlock [Mon, 31 Mar 2014 14:16:04 +0000 (10:16 -0400)]
Fix NPE in notification settings.
Show/hide the apps category safely every time.
Default apps category to hidden to avoid startup blip.
Change-Id: I4c18c57754e5d0a6a73e7271844ff71c0a66ad8d
Fabrice Di Meglio [Sat, 29 Mar 2014 01:49:03 +0000 (01:49 +0000)]
Merge "Go Quantum Go!"
Fabrice Di Meglio [Sat, 29 Mar 2014 01:48:05 +0000 (18:48 -0700)]
Go Quantum Go!
- use the Quantum Theme light version
Change-Id: I81c40813b8fb59286a370bde33076cdcd73390e5
Lajos Molnar [Fri, 28 Mar 2014 23:15:41 +0000 (23:15 +0000)]
Merge "Add temporary developer setting to use NuPlayer as default media player"
Fabrice Di Meglio [Fri, 28 Mar 2014 23:08:20 +0000 (23:08 +0000)]
Merge "Settings - update for new UI (no more Drawer)"
Fabrice Di Meglio [Sat, 22 Mar 2014 02:24:43 +0000 (19:24 -0700)]
Settings - update for new UI (no more Drawer)
- follow the UX spec by no more using a Drawer
- the Dashboard is now a Fragment that contains the list of Headers
- the search results are also put into a Fragment that is replacing
the initial one (Dashboard or other) when expanding the SearchView
- use a SearchView for query input
- when tapping on a Header or a Search Result, re-launch Settings as
an Activity so that we are benefiting from the Activity stack for
UP affordance and BACK button
- manage UP affordance to show it only when needed
- move some Actions to the Menu in the ActionBar for allowing space
to the Search action and removing some clutter
- fix an issue with the Index and WiFiEnabler and their cached Context
that was not updated when there was a Configuration change
- simplify the SettingsActivity code by extracting some inner classes
Change-Id: I50b5f77bb44a7fade1886114dbbc820609a5e63d
John Spurlock [Fri, 28 Mar 2014 19:07:37 +0000 (19:07 +0000)]
am
ce1b22cf: (-s ours) am
c4231382: DO NOT MERGE Settings: Implement new required method.
* commit '
ce1b22cf66b853ba834bf963ab8a6a45e829fd15':
DO NOT MERGE Settings: Implement new required method.
John Spurlock [Fri, 28 Mar 2014 19:01:12 +0000 (19:01 +0000)]
am
c4231382: DO NOT MERGE Settings: Implement new required method.
* commit '
c423138247857312a4ac6ad32cb482868315bd61':
DO NOT MERGE Settings: Implement new required method.
Dan Sandler [Fri, 28 Mar 2014 18:51:04 +0000 (18:51 +0000)]
Merge "List apps that advertise notification settings."
Dan Sandler [Wed, 26 Mar 2014 23:09:21 +0000 (19:09 -0400)]
List apps that advertise notification settings.
Apps that have a CATEGORY_NOTIFICATION_PREFERENCES +
CATEGORY_DEFAULT activity will be listed in notification
settings, with a convenient link to that activity so the
user can tweak those settings.
Change-Id: Idc97b2aee3f070225822ebee1ecbeab79e7b9c2d
Lajos Molnar [Fri, 28 Mar 2014 16:48:58 +0000 (09:48 -0700)]
Add temporary developer setting to use NuPlayer as default media player
Bug:
11784824
Change-Id: Id42cc40d08ada06ec9e57e24473f7f833bc90dca
John Spurlock [Fri, 28 Mar 2014 13:41:30 +0000 (09:41 -0400)]
DO NOT MERGE Settings: Implement new required method.
Only required since it uses the non-public version
of the api.
Bug:
13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa