Commit Graph

53 Commits

Author SHA1 Message Date
Svetoslav
85dcef1226 Fix settings crash in print job screen.
The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.

bug:17471952

Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0
2014-09-11 14:30:18 -07:00
Svetoslav
031e8b1432 Fix print icons in settings.
The print icons are in the framework resources and are not tinted
to enable usage from various places such as print spooler and
settings with different tinting. Settings was using not-tinted
print icons which were invisible on the white background. This
change switches settings to user tinted drawables.

bug:16966145

Change-Id: I2cf55d36d90b0192ba23686aac4f1d8e7e23f75a
2014-09-10 18:33:32 -07:00
Alexandra Gherghina
80cd373263 Merge "Reset Settings task when using the user switcher" into lmp-dev 2014-09-08 08:04:44 +00:00
Alexandra Gherghina
56645002b2 Reset Settings task when using the user switcher
Bug: 17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
2014-09-05 11:39:39 +01:00
Svetoslav
4a361df54b Fix an occasional crash in print job state fragment in Settings.
There is a NPE in the print settings if the following occurs:
We open the print job state UI in settings for an ongoing print
job (now we have action bar buttons for cancel and restart);
now the print job gets completed and we update the UI and
since the print job is not longer present we nullify the current
job reference and finish the activity. But since activity
is not finished immediately there is an opportunity for the
user to click on the action bar options which results in NPE.
The fix is to not update the print job instance in the update
UI method if the job is not available, i.e. the update method
does not mutate state if the job is no longer present, as we
are finishing and performing an operation on a finished job will
have no effect.

bug:17387134

Change-Id: I501ed1e05b8b70584b3299a16e93ead5ab7f155f
2014-09-04 19:54:21 -07:00
Alexandra Gherghina
80e1f1bfdb Extract common functionality for profile spinner into Utils
Bug: 16645615
Change-Id: Ic8928fff8294cd99eeb86b69b44b8e4128cadf92
2014-07-31 18:38:47 +00:00
Svetoslav
01daaca547 Remove unnecessary code.
Change-Id: I4a81cd7f855bb075ab71f6c6c812288e3677c90a
2014-07-29 13:16:12 -07:00
Alexandra Gherghina
fe47a8dc89 Toggle between primary and managed profile in Print Settings
This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
2014-07-29 10:22:15 +01:00
Fabrice Di Meglio
d729029b90 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
2014-07-01 14:32:03 -07:00
Fabrice Di Meglio
006b2cca13 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
2014-06-27 19:13:19 -07:00
Fabrice Di Meglio
204521626f resolved conflicts for merge of f9360dbc to master
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
2014-06-12 15:46:41 -07:00
Fabrice Di Meglio
138ff8c045 Make the SwitchBar appear immediately
- change the way the SwitchBar is shown and hidden
- save its state
- remove the delay transition code

Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
2014-06-12 11:13:23 -07:00
Alan Viverette
2c461006b8 am 6bfec2d6: Remove all dialog icons in Settings
* commit '6bfec2d6b197068dd355bd1742179fe3da07136f':
  Remove all dialog icons in Settings
2014-06-11 13:07:58 +00:00
Alan Viverette
6bfec2d6b1 Remove all dialog icons in Settings
BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
2014-06-10 13:41:07 -07:00
e12b2f047a Merge "Update the settings due to a framework API change." 2014-06-06 20:37:20 +00:00
24a746b958 Update the settings due to a framework API change.
Change-Id: I5248b2a6c9f6d9ac60e9b21a0f5377b19c9a3b36
2014-06-04 13:14:09 -07:00
Fabrice Di Meglio
11a67c14a2 Push Local Printer Search action to the ActionMenu
See bug #14325350 Printing > CloudPrint ActionBar is overcrowded

Change-Id: I9c7ca08ecbcf2a918239d952dc8c23315c46f152
2014-06-02 15:38:45 -07:00
Fabrice Di Meglio
00b5e6b247 This CL is not working (even after careful testing) but when I tried I was not completely ToT.
Revert "Fix bug #15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"

This reverts commit 1e52db8063.

Change-Id: I73bdfeba4a4b3e993e37cdae1e3733ffe272b9eb
2014-05-28 17:36:37 +00:00
Fabrice Di Meglio
1e52db8063 Fix bug #15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads
- refactor all the code that was using the Switch to control it thru the SwitchBar
- start the Switch as View.GONE and make it View.VISIBLE when it is set
as "enabled" or "checked" so that you dont see the Switch transition (it shows
only with it final state)

Change-Id: I382076bf3c819c530b5b2c06ca2429dfb2cdc6bf
2014-05-27 17:01:10 -07:00
Fabrice Di Meglio
38f2b27c0d Fix bug #15109661 Settings crash after tap on back key from print settings
- use onResume() / onPause() for adding / removing the SwitchChangeListener

Change-Id: Ia3a4ff57075d2668e446df4f4f09e4593cc34761
2014-05-20 12:26:16 -07:00
Fabrice Di Meglio
7ba17ab12c Use SwitchBar for Print Settings
- follow up CL to 4193776698

Related to bug #14898161 On/Off switches must move down from Action Bar

Change-Id: Ife4990a52ef282563267dc0bff6d3a7f354b0bd0
2014-05-15 19:56:57 -07:00
Fabrice Di Meglio
63609c58a0 Rename SettingsUtils to PrintSettingsUtils
Change-Id: I67e9222265f6326b399de3779f2210e202777ecd
2014-04-21 15:58:41 -07:00
Fabrice Di Meglio
7e920da656 Code cleaning
- remove duplicate semicolon

Change-Id: I807ce89dfa6b46c415a95a9c6cdc71fd3e9a2502
2014-04-21 13:46:39 -07:00
Fabrice Di Meglio
c853a4282d Enable highlighting of Print services
- add to SettingsPreferenceFragment to know when the associated
RootAdapter is changing and thus being able to find the highlighted
Preference
- also, add the correct Search key during indexing. She should
match the one created when adding dynamically the Preference
- last, increase to 400ms the delay to do the highlight

Change-Id: I3a1a81fdf5c8ab5f3aaab29f16ea9879ab6df056
2014-04-21 09:28:17 -07:00
Fabrice Di Meglio
7476f5b904 Fix Print title name in search results
- use R.string.print_settings

Change-Id: I3a945aed9efbc323e865db1cdbcfd8ceeb6b2558
2014-04-18 17:14:39 -07:00
Fabrice Di Meglio
ede1435518 Make all the Settings Switches appear again
- use the ActionBar Theme context when creating the Switch for
getting the correct Theming

Change-Id: Ic3701c53662b0f245c7149b119de8bb5cbaae232
2014-04-18 16:49:35 -07:00
Svetoslav
d78d44d32a Adding search for dynamic print settings.
The print service list is dynamically constructed, therefore we need
a local provider that will emit print service data to be indexed.

bug:13929163

Change-Id: I51d5ae40c00edc6be7b212dc8aa08fd7ebfbf349
2014-04-11 17:22:57 -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
5c2d723723 Code cleaning for Printing Settings
- remove non needed code

Change-Id: I18a3992d66721dbeba6870aa2834e1c717640a15
2014-02-13 19:00:38 -08:00
Fabrice Di Meglio
10afdb82ac There are several painful issues with the initial CL. Doing a revert for now and will rework this.
Revert "Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview ...and then exit the Settings App"

This reverts commit 4cc95a53c2.

Change-Id: Iaa21d4771d0b004eff3d8e68b91b546a633d8f23
2014-02-11 19:50:56 +00:00
Fabrice Di Meglio
4cc95a53c2 Fix bug #12939786 BACK should go back into the Fragments BackStack and finally to Overview
...and then exit the Settings App

- fix the way we manage the Fragment BackStack
- revert back ChooseLockGeneric to be a PreferenceActivity

Change-Id: I3c366b4be606e2e211facd0299b9a2de5cc6ea79
2014-02-10 16:07:50 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Svetoslav
7662c1f21f am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '03360cd23910c73c78a822c559acb3eb66a8e07b':
  Show correct message for a print job that is being canceled.
2013-11-14 22:34:13 -08:00
Svetoslav
97e962cd36 Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
   message that matches what the notification shows.

2. If a print job is being canceled we do not show the cancel
   button.

bug:11696928

Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Svetoslav
b05be5fe0f am be74fb8d: am 43b8946f: am d9f156dd: Coalescing multiple print job notifications (Settings)
* commit 'be74fb8d729828642cce0514e1043c290e8ceea0':
  Coalescing multiple print job notifications (Settings)
2013-10-10 10:24:35 -07:00
Svetoslav
d9f156ddf0 Coalescing multiple print job notifications (Settings)
We used to show a single notificaiton for every print job but
this is against th UX guidelines. Since we have to lead by
example, this change adds coalescing of multiple notifications.

bug:11155212

Change-Id: I865450495e7e85bd6620c1f42aeef07d2f83a01a
2013-10-09 23:40:56 -07:00
Svetoslav
7dfacf5f8c resolved conflicts for merge of 372cd6ab to master
Change-Id: I9232fbe01926436e8ad5c6c7e63ce95fbe842ccb
2013-10-08 17:42:25 -07:00
Svetoslav
39392ef9b0 Fix a crash in the print service settigns.
When the search view is attached and detached we announce that
 for accessibility. The trouble is that if the activity is being
 torn down we are trying to access resources from a fragment that
 is detached and the qcrash occurs. This change does not try to
 access resources if the activity is finishing and also we do not
 load resource strings if accessibility is not enabled.

bug:11127814

Change-Id: If3e97b6e94687775386a43c8fa54fd45140306eb
2013-10-08 12:08:18 -07:00
Svetoslav
4b23800471 am ef1cfe16: am 32d7ea74: am 9379d935: Make printers for a print service not react to press.
* commit 'ef1cfe16fb95a8ae0e73dbd8d2f4235386be1803':
  Make printers for a print service not react to press.
2013-10-04 18:08:26 -07:00
Svetoslav
9379d93555 Make printers for a print service not react to press.
We show a list of printers for the a print service in the
print service settings activity. This list is there to
inform the user of which printers are available and
optionally offers adding a printer affordance. The printer
list items do nothing so they should not react to press
and create a false impression they do.

bug:10983508

Change-Id: I43b19ebb0acf6662c489826c192fd6daf8ad103d
2013-10-04 17:52:39 -07:00
Svetoslav
24e49f0613 Polish print settings accessibility.
bug:10983508

Change-Id: I986e28a2cd8e52b7c8422e825de9174d6e2377c3
2013-10-02 15:16:16 -07:00
Svetoslav Ganov
ff75201aee Merge "Missing return statement if a print job is no longer present." into klp-dev 2013-10-01 21:30:36 +00:00
Svetoslav Ganov
dc00bf6483 Missing return statement if a print job is no longer present.
bug:11012251

Change-Id: I2ea925d903571aa676e4c48d78b4c0c6a91d7af1
2013-10-01 00:23:51 -07:00
Svetoslav
1b881bcc41 Merge "Show appropriate empty state if not printers are found." into klp-dev 2013-10-01 00:25:35 +00:00
Svetoslav
9a2ace9587 Show appropriate empty state if not printers are found.
One can search for printers in the print service settings
and we need to show appropriate empty state if none is found.

bug:11009053

Change-Id: If3ed6aa3a5e2eb4d7f7bae37f885e4b8eb0909b4
2013-09-30 16:22:33 -07:00
Svetoslav
5c30529368 Remove Google Play specific search URIs from Settings.
1. If there are no installed print services or NFC payment services,
   we would like to allow the user to search for one in Play. However,
   Play is Google specific and we should not have hard coded URI that
   rely on it in settings. Declare secure settings for each of these
   URI and check at runtime if the URI is non-empty, then show the
   add menu item.

bug:11011519

Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
2013-09-30 15:59:46 -07:00
Svetoslav
a749adae03 Add icons to the printer list items in settings.
bug:10955751

Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
2013-09-26 18:56:27 -07:00
Svetoslav Ganov
bc2c3db8f9 Add print job settings screen.
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.

bug:10935736

Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
2013-09-26 13:58:59 -07:00
Svetoslav
0ad40283bb Offer to enable a print service after it is installed (Settings).
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Ibfb5368a09b1e012dd6dd0f3d33a5ad10e5ee00e
2013-09-20 17:34:34 -07:00
Svetoslav
17e72aa90b Ignore print service settings activities if they are not exported.
1. The print spooler cannot start not exported activities and they
   should not be started from another application anyway. Therefore,
   we do not start them from settings too even though settings can
   do that since it is signed with the platform certificate.

2. Adding some string changes to meet the translation deadline.

bug:10680224

Change-Id: I69c189e1c502985aceb68d269492f2e86de44ec4
2013-09-15 03:00:54 -07:00