OSDN Git Service
Baligh Uddin [Thu, 10 Apr 2014 16:06:25 +0000 (16:06 +0000)]
am
119758c9: (-s ours) am
2632b25f: (-s ours) am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
119758c972e786a538f5db6510b3e6ec3a2ea36c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:03:05 +0000 (16:03 +0000)]
am
2632b25f: (-s ours) am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
2632b25fae55411ff4974d510d599af75d35045a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:02:54 +0000 (16:02 +0000)]
am
bb58405f: (-s ours) am
8bec9dba: (-s ours) Import translations. DO NOT MERGE
* commit '
bb58405fee2366802ad9f6cefec7808af1e36ebc':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:59:28 +0000 (15:59 +0000)]
am
8bec9dba: (-s ours) Import translations. DO NOT MERGE
* commit '
8bec9dba479ba901c913f59c7585369af1bf639d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:44 +0000 (15:57 +0000)]
am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
fba8cd35b71853118508eab15a3cbef96a539dec':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:54:28 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Lawrence [Thu, 10 Apr 2014 14:31:03 +0000 (14:31 +0000)]
Merge "Allow encryption when keyguard is set to pattern or no protection"
Fabrice Di Meglio [Thu, 10 Apr 2014 02:33:47 +0000 (19:33 -0700)]
Code cleaning for the SettingsSearchIndexablesProvider
- use the real constants SearchIndexablesContract.COLUMN_INDEX_XML_RES_XXX
for the colum names
Change-Id: I820ce9d3b048345365639fe049aedccaf3f203d8
Fabrice Di Meglio [Thu, 10 Apr 2014 02:02:54 +0000 (19:02 -0700)]
Code cleaning for DataUsageSummary
- remove unused import
- remove dead code
Change-Id: I4e8f24e57fc4ca6d731e68da93ac7f748e709c26
Fabrice Di Meglio [Wed, 9 Apr 2014 23:24:10 +0000 (16:24 -0700)]
Fix bug3
13933442 Search - for security reasons only index data...
...from wellknown SearchIndexablesProvider
Check if the SearchIndexablesProvider is:
- having the correct android.permission.READ_SEARCH_INDEXABLES
read/write permissions
- a privileged one (like Settings App, Phone App)
Change-Id: I5fd1fef46716cca0e439196e24b607ff5506495c
Fabrice Di Meglio [Wed, 9 Apr 2014 20:57:09 +0000 (13:57 -0700)]
Fix bug #
13915380 Inconsistency in showing the action bar of Bluetooth settings.
- remove those "splitActionBarWhenNarrow" in the AndroidManifest for all
the activities so that the ActionBar behavior is always consistent and
does not split.
Change-Id: I54cb10528ba3a751a7d2843cc9e9c518a5f3531a
Fabrice Di Meglio [Wed, 9 Apr 2014 20:19:39 +0000 (13:19 -0700)]
Code cleaning for Search Remote Provider queries
- use colums indices that are now defined into SearchIndexablesContract
- ... and at the same time fix an issue with some wrong column indices
that were used
Change-Id: If72ddc7d7171329ca533cb2763431902099769b9
Baligh Uddin [Wed, 9 Apr 2014 19:51:17 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6fd74caf628d760ffcf191733d47b86ffb453864
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:46:43 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:43:07 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 9 Apr 2014 19:09:42 +0000 (12:09 -0700)]
Fix bug #
13928293 Search - remove "switchTextOn" / "switchTextOff" from indexing
- remove all related code
- update the Index database schema and its version
Change-Id: Iaa5219b77efe5db3a404708663fdf82f10d043d3
Fabrice Di Meglio [Wed, 9 Apr 2014 01:58:33 +0000 (18:58 -0700)]
Fix Switch button creation for PrintService
- setup the ActionBar switch in the onStart()
Change-Id: I92d8bb34dd7925da79a10fe01790131d22f7d0d8
Fabrice Di Meglio [Wed, 9 Apr 2014 00:42:29 +0000 (17:42 -0700)]
Fix issue about at which time Bluetooth devices name are indexed
- remembered devices name were only indexed when BT was turned on/off
- allow the same when they are paired
- remove device name from the Index if it is un-paired
Change-Id: I1206a591b0132789c3b003e52c7ffac630e80758
Fabrice Di Meglio [Tue, 8 Apr 2014 21:21:10 +0000 (14:21 -0700)]
Fix bug #
13880310 Toggle On/Off buttons disappear on hitting Search...
... and back button in sub-settings
- move code managing the Switch from onCreate(...) to onStart()
Change-Id: I747180bea3880e84635134373bf4c681378f3ec8
Fabrice Di Meglio [Tue, 8 Apr 2014 20:56:06 +0000 (13:56 -0700)]
Fix bug #
13883976 Settings crash on long-tapping and swiping in Language & Input screen
- fix potential NPE
Change-Id: I12045f420d5b2a4f349e59a04141153cd2e46378
Fabrice Di Meglio [Tue, 8 Apr 2014 20:35:06 +0000 (13:35 -0700)]
Fix bug #
13744434 Stability: ISE in Settings: Can't switch to header...
..that has no Fragment nor Intent at SettingsActivity.onHeaderClick(SettingsActivity.java:654)
- satisfy the Monkeys has they were able to click on "WIRELESS &
NETWORK" header which is a Category and normally non clickable...
(so probably a race condition)
Change-Id: Ia33d2b6e55e910409a566e5f05c1e3bae8008807
Fabrice Di Meglio [Sat, 5 Apr 2014 02:07:50 +0000 (19:07 -0700)]
Add support for saving and using the Preference's key value
- modify the SQlite data model
- update Index code for managing the key value
- pass the key when launching a Fragment or and Activity
- implement a small animation for highlighting the Preference
from a Search result
Change-Id: I617643a4e5e3b752ece8f45ce7d5429037e479da
Baligh Uddin [Tue, 8 Apr 2014 02:46:14 +0000 (02:46 +0000)]
am
c5c89671: (-s ours) am
ffa6f523: (-s ours) am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
c5c896719998d30e29657a74372beb9c7bce9888':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:39:06 +0000 (02:39 +0000)]
am
4193b7d1: (-s ours) am
b282957b: (-s ours) am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
4193b7d18cafa1571b3b153deec29be287c8650c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:39:05 +0000 (02:39 +0000)]
am
ffa6f523: (-s ours) am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
ffa6f52358f0f732d83decbfa6be558207969654':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:59 +0000 (02:31 +0000)]
am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
f56d838afe7f813fb2ed761d3ebeb79b79d910a0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:50 +0000 (02:31 +0000)]
am
b282957b: (-s ours) am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
b282957b48df3ede7a0628e2ef6a2ad5dbe73179':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:46 +0000 (02:31 +0000)]
am
6163642d: (-s ours) am
b9abc323: (-s ours) Import translations. DO NOT MERGE
* commit '
6163642daf60c92aa793c4af77bcb9b3cff18a81':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:46 +0000 (02:24 +0000)]
am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
0f2228a5480759551b1faf93d510fc9c1c16ea06':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
2319553cdc644c4fae21ca3ad55564729f409cf4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
b9abc323: (-s ours) Import translations. DO NOT MERGE
* commit '
b9abc323b95650e30589c957062fec790436ec0d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:14:13 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a6ce8a6f86819a4ab7bae336b299c640adf906d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:10:30 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c4dadd6e7a78db976f67c0c494b06495a69e45b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:07:10 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c9953f71809e215404a0e150abbba7bb098504a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I933f503cae1b0ae72af3c9f3513ff86355d8e095
Auto-generated-cl: translation import
Jaewan Kim [Mon, 7 Apr 2014 08:59:27 +0000 (08:59 +0000)]
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
Jaewan Kim [Mon, 7 Apr 2014 08:55:02 +0000 (08:55 +0000)]
Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit
16ff27d3f79cc90e6149a9d4982193b8e69dd3fa.
Change-Id: Ide9c9af358f63a6e73bb2172111929c2022f862b
Jaewan Kim [Mon, 7 Apr 2014 04:40:47 +0000 (04:40 +0000)]
Merge "Refactor IpConfiguration from WifiConfiguration"
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
Paul Lawrence [Thu, 3 Apr 2014 16:18:45 +0000 (09:18 -0700)]
Allow encryption when keyguard is set to pattern or no protection
Don't block based on keyguard type, and pass type to encryption function.
Circular dependency on
https://googleplex-android-review.git.corp.google.com/#/c/444200/
Bug:
13749169
Change-Id: Ica95713adca9552ae56341ff33badd1d4b748af8
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
OSDN Git Service
