Commit Graph

6509 Commits

Author SHA1 Message Date
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
Adrian Roos
5954ff505f Add initial trust agent settings
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.

Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
2014-03-31 23:00:51 +02:00
John Spurlock
3726525d50 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
2014-03-31 12:07:52 -04:00
John Spurlock
12acc58109 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
2014-03-31 11:04:26 -04:00
Lajos Molnar
a46650530f Merge "Add temporary developer setting to use NuPlayer as default media player" 2014-03-28 23:15:42 +00:00
Fabrice Di Meglio
d37e0b6a45 Merge "Settings - update for new UI (no more Drawer)" 2014-03-28 23:08:21 +00:00
Fabrice Di Meglio
d25314d330 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
2014-03-28 15:51:29 -07:00
John Spurlock
ce1b22cf66 am c4231382: DO NOT MERGE Settings: Implement new required method.
* commit 'c423138247857312a4ac6ad32cb482868315bd61':
  DO NOT MERGE Settings: Implement new required method.
2014-03-28 19:01:12 +00:00
Dan Sandler
57e109935b Merge "List apps that advertise notification settings." 2014-03-28 18:51:04 +00:00
Dan Sandler
b19460f4a1 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
2014-03-28 14:47:49 -04:00
Lajos Molnar
6b2f7c4471 Add temporary developer setting to use NuPlayer as default media player
Bug: 11784824
Change-Id: Id42cc40d08ada06ec9e57e24473f7f833bc90dca
2014-03-28 11:35:32 -07:00
John Spurlock
c423138247 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
2014-03-28 09:41:30 -04:00
John Spurlock
6a8919299f Merge "Add switch to zen mode settings preference page." 2014-03-28 13:09:51 +00:00
John Spurlock
f3e32e3410 Merge "Settings: Implement new required method." 2014-03-28 13:08:59 +00:00
Nicholas Sauer
c33baa4294 Merge "Skip bluetooth device iteration if LocalBluetoothManager is null" 2014-03-27 21:37:19 +00:00
Nicholas Sauer
cb644cc2e7 Skip bluetooth device iteration if LocalBluetoothManager is null
bug:13653239

Change-Id: I163c47b626825b2f83bb63d9f6900216ce44ae41
2014-03-27 14:28:33 -07:00
John Spurlock
7f502bf824 Add switch to zen mode settings preference page.
Bug:13670014
Change-Id: Id45841818e2fe8f57b5db47df3b0add06be6967a
2014-03-27 10:21:04 -04:00
Amith Yamasani
c96ccc8585 Merge "Don't allow user creation on phones via Settings search" 2014-03-26 23:27:10 +00:00