Commit Graph

10342 Commits

Author SHA1 Message Date
Anna Galusza
ffce406d6d Merge "Add A11y SUW hub page after verifying build fix." 2016-01-08 17:30:00 +00:00
Jason Monk
480c5ac083 Merge "Add suggestions to settings" 2016-01-08 14:50:17 +00:00
Andrei Stingaceanu
36504833e0 Merge "'Lock Screen Message' option is in enable state for 'None'." 2016-01-08 10:25:52 +00:00
Philip P. Moltmann
ef7c7fe196 Merge "Small corrections to the code that generates the print summary in the settings." 2016-01-08 00:34:58 +00:00
Philip P. Moltmann
43335444ef Small corrections to the code that generates the print summary in the settings.
- Optimize when the listener is active and rely on it to be cleaned up
  automatically
- Only count print jobs that should be shown (i.e. not ones that are
  already finished.)

Change-Id: Idba995f1036e736f47ca7402d493210600eae91c
2016-01-07 14:22:20 -08:00
Jason Monk
d4f03ec86f Add suggestions to settings
Use an XML to define the categories that Settings will look for,
and surface enabled activities under those categories as suggestions.

When clicked on the activity will be started for result.  If the result
is not cancelled, then the operation is assumed successful and the
suggestion is disabled.  Users can also use an overflow -> remove
flow to get rid of unwanted suggestions.

Change-Id: I767abf8efe103af0509bc6b6b55888ae82643512
2016-01-07 16:25:34 -05:00
Umair Khan
58c83824d7 [2/3] Remove unnecessary throws statement in ServiceManager
Signed-off-by: Umair Khan <omerjerk@gmail.com>

(cherry picked from commit fee616c31a)

Change-Id: I52d3078358f38061f4ec724ca0cc2a18d2cc43b1
2016-01-07 12:54:21 -08:00
Anna Galusza
6bc8144e97 Add A11y SUW hub page after verifying build fix.
Original CL: 
https://googleplex-android-review.git.corp.google.com/#/c/828444/.

Diff (fixes build and adds a period):
https://googleplex-android-review.git.corp.google.com/#/c/841247/

This reverts commit 44be967e95.

Change-Id: I971806022dcd791de2d7819fa19df7801f51b673
2016-01-07 17:45:31 +00:00
Philip P. Moltmann
fae4a88530 Use disabled print services instead of enabled print services in print settings.
Change-Id: I32bc8a8dda86f92b180f043a98b304fe676db98c
2016-01-07 09:30:43 -08:00
Andrei Stingaceanu
7a24019194 'Lock Screen Message' option is in enable state for 'None'.
Also take the 'lock screen enabled' state into account besides
the 'owner info enabled' when deciding if the lock screen message
tile should be enabled or not.

Bug: 26350729
Change-Id: Ic64a64b4757252f2bef3c385c725611de14b2798
2016-01-07 16:33:16 +00:00
Philip P. Moltmann
738e6db7b8 Display number of print jobs as summary in settings app.
Change-Id: I4309c67fb62171c7b4f0f5fdd86454f155a3ec01
2016-01-07 08:28:18 -08:00
Jeff Sharkey
c24d360328 Merge "Follow PackageManager refactoring." 2016-01-06 22:26:15 +00:00
Jeff Sharkey
df828405b1 Follow PackageManager refactoring.
Change-Id: Iae8b40acf6317366f0de780e367e0c21a9966477
2016-01-06 14:51:32 -07:00
Anna Galusza
7e78bedb67 Merge "Revert to fix build breakage." 2016-01-06 21:44:59 +00:00
Anna Galusza
44be967e95 Revert to fix build breakage.
Revert "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs."

This reverts commit bf95133f75.

Change-Id: I4559dfdcf5c0f6eea316a190d507a3bccd195149
2016-01-06 21:42:43 +00:00
Anna Galusza
c4f8dfe449 Merge "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs." 2016-01-06 19:55:43 +00:00
Kenny Guy
e526cf20bb Merge "Add support messages to device admin pages." 2016-01-06 19:55:35 +00:00
Mark Salyzyn
3f48575e17 Merge "Settings: switch to using ctl.start property instead of exec logcat" am: 5987a26e78
am: e938d6e6e7

* commit 'e938d6e6e7484d082878f493bdfbbce78eb597fc':
  Settings: switch to using ctl.start property instead of exec logcat
2016-01-06 19:21:59 +00:00
Mark Salyzyn
e938d6e6e7 Merge "Settings: switch to using ctl.start property instead of exec logcat"
am: 5987a26e78

* commit '5987a26e7862c7737acb1dcabbd6db1a795347b2':
  Settings: switch to using ctl.start property instead of exec logcat
2016-01-06 19:19:36 +00:00
Clara Bayarri
24d45deb18 Merge "Launch existing Task when taskId is given to ConfirmDeviceCredential" 2016-01-06 18:51:04 +00:00
Fyodor Kupolov
4e348fd79a Merge "Added lock screen settings section" 2016-01-06 18:33:07 +00:00
Mark Salyzyn
8f3a25bf7d Settings: switch to using ctl.start property instead of exec logcat
- Moves policy of what to do with buffer size changes to logd

Bug: 23685592
Change-Id: Ib80a755213742dbf806a6f4423d5a709de2da645
2016-01-06 10:24:30 -08:00
Kenny Guy
7a3555961d Add support messages to device admin pages.
Add support message to device admin settings pages.
Show policy information for device owners
and profile owners.
Allow a user to remove profile from profile owners
admin page.

Bug: 26416662
Change-Id: I95424da50067b7c0ba1618a083a31448d406188f
2016-01-06 17:21:45 +00:00
Robin Lee
c90e67deae Merge "[VPN] save public legacy VPN details publicly" 2016-01-06 12:16:56 +00:00
Fyodor Kupolov
8ba52d62ed Added lock screen settings section
Added lock screen settings section and moved "Add users when device is locked"
 from the overflow menu to the new section.

Bug: 25289622
Change-Id: I97c02acbacae3b6cde44180a23ea337853b0a551
2016-01-05 14:30:03 -08:00
Filip Gruszczynski
0d228a62bd Always show true value for forcing resizeable.
Change-Id: I557ad5ddd29ac20119b926e58e33c6f58145d78e
2016-01-05 13:29:33 -08:00
Julia Reynolds
a1049aea99 Merge "DND Visual interruptions: don't turn screen on." 2016-01-05 20:58:23 +00:00
Robin Lee
4c85639733 [VPN] save public legacy VPN details publicly
This does not include certificates, private keys etc. which are still
saved in the KeyStore with the encryption the user requested for them.

Makes connecting to lockdown vpn before user unlock possible.

Bug: 26108660
Change-Id: I56c1672c7a41e761c2791584b99900aff51b59e4
2016-01-05 18:48:46 +00:00
Clara Bayarri
86ebaa230e Launch existing Task when taskId is given to ConfirmDeviceCredential
When using ConfirmDeviceCredential as the Work Challenge, we sometimes
have intercepted a task launching from recents. In this case, read the
taskId given as an extra and request that task to be started from
recents instead of launching a new intent.

Change-Id: Icca92f246e8f025b64de1f138493fc4069f98829
2016-01-05 16:26:10 +00:00
Julia Reynolds
58e3eb7266 DND Visual interruptions: don't turn screen on.
Change-Id: I15b66918e53e733c779cf8f79d12e03a213fb26d
2016-01-05 10:31:13 -05:00
Jorim Jaggi
bc3a74a39f Merge "Add developer option for freeform window support (2/2)" 2016-01-05 13:30:32 +00:00
Amith Yamasani
61d1838ae2 Merge "Fix "division by zero" crash after USB mass storage disconnects" am: a44b4feed4
am: 4ed2bb1ba9

* commit '4ed2bb1ba93d8b5fe101c660d24898bf3ed44592':
  Fix "division by zero" crash after USB mass storage disconnects
2016-01-05 00:33:03 +00:00
Amith Yamasani
4ed2bb1ba9 Merge "Fix "division by zero" crash after USB mass storage disconnects"
am: a44b4feed4

* commit 'a44b4feed42d597224f9221396ef3ca1964ecc4b':
  Fix "division by zero" crash after USB mass storage disconnects
2016-01-05 00:31:12 +00:00
Amith Yamasani
a44b4feed4 Merge "Fix "division by zero" crash after USB mass storage disconnects" 2016-01-05 00:26:43 +00:00
Julia Reynolds
0c4052ceaa Merge "Allow users to choose a notification assistant." 2016-01-04 22:07:28 +00:00
Julia Reynolds
2e1e0b7ef6 Allow users to choose a notification assistant.
Change-Id: Iddfbfedbb6a3aae246058ff41324dc06852484cb
2016-01-04 16:36:56 -05:00
Jorim Jaggi
292b9fd2da Add developer option for freeform window support (2/2)
Also disable default force-resizable on non-user builds.

Bug: 25276672
Bug: 24815256
Change-Id: I26b04d73bc605da903993084ad171c42a64f0bb2
2016-01-04 15:58:18 +01:00
Jason Monk
ae969d7197 Merge "fix out of memory with continuous entry and exit InstalledAppDetail." am: d298d474e6
am: dfc6e32434

* commit 'dfc6e32434a0d208403f8ce754e079e77e34cf7f':
  fix out of memory with continuous entry and exit InstalledAppDetail.
2016-01-04 14:44:25 +00:00
Jason Monk
dfc6e32434 Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
am: d298d474e6

* commit 'd298d474e620766b4308376525ef6a2730bbb299':
  fix out of memory with continuous entry and exit InstalledAppDetail.
2016-01-04 14:42:31 +00:00
daqiangx
2396a40c90 fix out of memory with continuous entry and exit InstalledAppDetail.
A session keeps in ApplicationsState list. The fragment don't release
the session when it is destroyed. The cause of out of memory is that the
session list is increased, but it can't be released.

Change-Id: I23635610c9fdfb8a3423299a91cf9b11cb5cdb65
Signed-off-by: daqiangx <daqiangx.li@intel.com>
2016-01-04 13:40:28 +08:00
Mark Salyzyn
87a3c6fee7 resolve merge conflicts of 94ab88228e to master.
NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29
2015-12-28 11:20:58 -08:00
Mark Salyzyn
94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
2015-12-28 10:49:04 -08:00
Mark Salyzyn
f3cc23524f Merge "Settings: Add option to disable logging" 2015-12-28 17:35:26 +00:00
Xinghan Yue
b997bd989e Fix "division by zero" crash after USB mass storage disconnects
File.java will return the total size in bytes of the partition
containing the path, and if the path does not exist,
it will return 0.

Change-Id: I134d4ec787b475e38bb37b4386bafcc419971c1e
2015-12-28 18:01:51 +01:00
Nick Kralevich
bb60fe9f06 Merge "Hide usb mode chooser dialog after disconnected" am: b913bf926e
am: 6556921a1e

* commit '6556921a1edbddea64b54415967b2bacbb7bf456':
  Hide usb mode chooser dialog after disconnected
2015-12-23 11:01:05 -08:00
Nick Kralevich
6556921a1e Merge "Hide usb mode chooser dialog after disconnected"
am: b913bf926e

* commit 'b913bf926e04280d0864cc36c759eddf88cf8b21':
  Hide usb mode chooser dialog after disconnected
2015-12-23 10:58:56 -08:00
Mark Salyzyn
285afa8d15 Settings: Add option to disable logging
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
2015-12-22 15:14:56 -08:00
Philip P. Moltmann
66626910b3 Merge "Use new getIcon and getMoreInfo api to show more information in Print Settings" 2015-12-22 21:49:29 +00:00
Svetoslav
58d5d785ca DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5
am: 6e88d0b02f

* commit '6e88d0b02f48d8b4c87f197ccca927373df99758':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 11:44:00 -08:00
Svetoslav
119d589ea5 DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d)
2015-12-22 19:38:30 +00:00