Paul Lawrence
1231a89e5e
Merge "Allow encryption when keyguard is set to pattern or no protection"
2014-04-10 14:31:03 +00:00
Fabrice Di Meglio
981efd1778
Code cleaning for the SettingsSearchIndexablesProvider
...
- use the real constants SearchIndexablesContract.COLUMN_INDEX_XML_RES_XXX
for the colum names
Change-Id: I820ce9d3b048345365639fe049aedccaf3f203d8
2014-04-09 19:33:47 -07:00
Fabrice Di Meglio
063e7cfd78
Code cleaning for DataUsageSummary
...
- remove unused import
- remove dead code
Change-Id: I4e8f24e57fc4ca6d731e68da93ac7f748e709c26
2014-04-09 19:02:54 -07:00
Fabrice Di Meglio
b1648e6c54
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
2014-04-09 16:24:10 -07:00
Fabrice Di Meglio
b914322590
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
2014-04-09 13:30:50 -07:00
Fabrice Di Meglio
7d39310c8d
Fix bug #13928293 Search - remove "switchTextOn" / "switchTextOff" from indexing
...
- remove all related code
- update the Index database schema and its version
Change-Id: Iaa5219b77efe5db3a404708663fdf82f10d043d3
2014-04-09 12:09:42 -07:00
Fabrice Di Meglio
82de8707af
Fix Switch button creation for PrintService
...
- setup the ActionBar switch in the onStart()
Change-Id: I92d8bb34dd7925da79a10fe01790131d22f7d0d8
2014-04-08 18:58:33 -07:00
Fabrice Di Meglio
3b22695670
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
2014-04-08 17:49:01 -07:00
Fabrice Di Meglio
e2b9e07e5f
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
2014-04-08 14:27:08 -07:00
Fabrice Di Meglio
821a0729ad
Fix bug #13883976 Settings crash on long-tapping and swiping in Language & Input screen
...
- fix potential NPE
Change-Id: I12045f420d5b2a4f349e59a04141153cd2e46378
2014-04-08 13:56:06 -07:00
Fabrice Di Meglio
e5687b1b32
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
2014-04-08 13:35:06 -07:00
Fabrice Di Meglio
c1457323d2
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
2014-04-08 13:08:44 -07:00
Jaewan Kim
ac6a3c3cb3
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
2014-04-07 08:59:27 +00:00
Jaewan Kim
34dcbefe5c
Revert "Refactor IpConfiguration from WifiConfiguration"
...
This reverts commit 16ff27d3f7
.
Change-Id: Ide9c9af358f63a6e73bb2172111929c2022f862b
2014-04-07 08:55:02 +00:00
Jaewan Kim
1af4788f06
Merge "Refactor IpConfiguration from WifiConfiguration"
2014-04-07 04:40:47 +00:00
Fabrice Di Meglio
911fb2ad90
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
2014-04-04 17:55:57 -07:00
Fabrice Di Meglio
6068967fd9
Re-enable the switch into Location Settings
...
- get rid of that onIsHidingHeaders()
Change-Id: If0b3fc6900f70cb6dfb54094d1b46b44aba6290f
2014-04-04 17:02:46 -07:00
Fabrice Di Meglio
bb16fd836a
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
2014-04-04 15:08:39 -07:00
Fabrice Di Meglio
7f111811e0
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
2014-04-04 11:35:55 -07:00
Fabrice Di Meglio
45d3c5130f
Merge "Add more logging for onHeaderClick(...)"
2014-04-04 17:18:22 +00:00
Fabrice Di Meglio
bbdada8fab
Add more logging for onHeaderClick(...)
...
- log Header title and position
Change-Id: I07f7e8c50613b97609a3ea462b7a8e8fcc415f70
2014-04-04 10:16:59 -07:00
Paul Lawrence
2b664e0713
Merge "Show OwnerInfo on CryptKeeper screen"
2014-04-04 14:06:09 +00:00
Fabrice Di Meglio
1800a9f3e7
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
2014-04-03 19:31:07 -07:00
Fabrice Di Meglio
b731dd0554
Fix Up affordance when restoring Settings app state
...
- save the state of the Up affordance and restore it
Change-Id: Ia00e929b1bbcdaa51280f9b2bb9322f8594c5a37
2014-04-03 19:18:37 -07:00
Fabrice Di Meglio
ef724a0f95
Merge "Code cleaning"
2014-04-04 01:11:21 +00:00
Fabrice Di Meglio
086c76791f
Code cleaning
...
- remove dead code and some constants that were no more used
Change-Id: I32d19d74e5b271f9e7c8938e4b3c79175bdf69ee
2014-04-03 18:11:37 -07:00
Fabrice Di Meglio
04a09d519e
Merge "Fix bug #13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent"
2014-04-03 23:45:54 +00:00
Fabrice Di Meglio
d6985df419
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
2014-04-03 16:43:26 -07:00
Fabrice Di Meglio
d2693a82ad
Merge "Re-enable on/off switch for Wi-Fi and Bluetooth Settings"
2014-04-03 21:02:51 +00:00
Fabrice Di Meglio
86ea97f452
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
2014-04-03 13:57:56 -07:00
Paul Lawrence
d71c31ef94
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
2014-04-03 19:45:52 +00:00
Adrian Roos
5de92cca6f
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
2014-04-03 17:05:36 +00:00
Adrian Roos
e63ac36f41
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
2014-04-03 14:57:22 +00:00
Adrian Roos
79a1792446
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
2014-04-03 14:51:39 +00:00
Adrian Roos
a52a37b0fe
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
2014-04-03 14:38:30 +00:00
Adrian Roos
1b0b38cfeb
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
2014-04-03 14:35:13 +00:00
Adrian Roos
90630f6a6d
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
2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065
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
2014-04-03 14:17:11 +00:00
Adrian Roos
c4bfea207a
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
2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad
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
2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157
am 8184ea52
: Add lockout after trying to enter PIN / Password too often
...
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:49:53 +00:00
Fabrice Di Meglio
dd41dfc483
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
2014-04-02 19:37:39 -07:00
Fabrice Di Meglio
a41707200b
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
2014-04-02 19:05:45 -07:00
Fabrice Di Meglio
f66eb7a8c8
Add indexing for Storage preferences
...
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
Change-Id: I131e9176c47ccd697d05961b09546ba0e51059f7
2014-04-02 17:18:56 -07:00
Fabrice Di Meglio
fb5e639b30
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
2014-04-02 15:50:34 -07:00
Fabrice Di Meglio
019b87f17a
Add indexing for Limited Interruptions (notifications) preferences
...
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
- some code styling too
Change-Id: I106d1d9493eb945ea71e500acd43a1fc6096bb1f
2014-04-02 14:26:59 -07:00
Adrian Roos
8184ea5245
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
2014-04-02 16:28:10 +02:00
Paul Lawrence
9ac2d81d9f
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
2014-04-01 13:47:01 -07:00
Fabrice Di Meglio
627ef9706b
Merge "Add indexing for Notifications preferences"
2014-04-01 20:25:17 +00:00
Fabrice Di Meglio
9593782d15
Add indexing for Notifications preferences
...
- also add indexing of CheckBoxPreferences
- also some code cleaning
Change-Id: I2943caaec3d64fb2a6be85168454fc76fe572afe
2014-04-01 13:21:01 -07:00