Commit Graph

457 Commits

Author SHA1 Message Date
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent.
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
2015-05-28 11:44:58 -07:00
John Spurlock
008232acbd Merge "Zen: Store notification zen policy per-user." into mnc-dev 2015-05-28 13:53:43 +00:00
John Spurlock
21258a3703 Zen: Store notification zen policy per-user.
- Keep a zen config per user in NoMan.
 - Add zen config for all users to xml policy storage mechanism.
 - Initialize config to default for new secondary users.
 - Re-evaluate global zen on user switch.
 - Remove some unused code in NoMan.
 - Make ZenModeHelper aware of multiple users, keep all configs,
   add to dump.
 - Log config diffs in addition to the config itself in ZenLog.

Bug: 15845915
Change-Id: Ic847451e5d111c74916def1ea0948db5a76966c9
2015-05-28 09:23:58 -04:00
Zach Johnson
5c04bd767b Update intents for CarrierService
Keep the bind intent and the config intent separate.

Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412
2015-05-27 16:53:09 -07:00
Zach Johnson
42ecc9eb90 Drop the "Config". Just "CarrierService". It's cleaner.
b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
2015-05-27 15:30:31 -07:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
2015-05-26 19:48:51 -07:00
John Spurlock
12e0b390ef Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 2015-05-26 19:41:53 +00:00
John Spurlock
1b8b22b1a4 Zen: Calendar auto-rule tracks primary calendar for corp profile.
- Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
2015-05-26 15:39:05 -04:00
Chet Haase
fd98809873 Clarify example for Deep Share
Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.

Issue #21418354 Clarify doc example for ChooserTargetService

Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d
2015-05-25 08:47:36 -07:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
This reverts commit c7becb7ee7, reversing
changes made to 8562b08f04.
2015-05-22 16:34:44 -07:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
2015-05-20 20:15:29 -07:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Dianne Hackborn
38a499edf5 Remove screenshot APIs.
Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b
2015-05-18 17:48:40 -07:00
Adam Powell
01f280d376 Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.

Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.

Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
2015-05-18 16:07:42 -07:00
Jose Lima
8783d3fe76 Make all icon fields & extras sent to listeners backward-compatible.
This also had to be done for when retrieving existing notifications.
For final release, we will only be doing this for
notification listeners targeting older SDKs.

Bug: 21207612
Change-Id: I351f9e13cd052410e7355c956c750c3859f972cb
2015-05-18 14:51:33 -07:00
Daniel Sandler
f5a7838e19 Make all icon fields & extras sent to listeners backward-compatible.
For final release, we will only be doing this for
notification listeners targeting older SDKs.

Bug: 21207612
Change-Id: I28fdaa5666698150ab455f9bfb63251b9418519e
2015-05-18 11:55:26 -04:00
Zach Johnson
cdaaa91f7c Create unified BIND_CARRIER_SERVICES permission
Replace BIND_CARRIER_MESSAGING_SERVICE and
BIND_CARRIER_CONFIG_SERVICE since we don't really
need one permission for each carrier service type.

Deprecate BIND_CARRIER_MESSAGING_SERVICE since it
already shipped, but remove BIND_CARRIER_CONFIG_SERVICE
since it hasn't.

b/21165906

Change-Id: I716f3f1c98a228afcfee84cf4a48911f0736ce8c
2015-05-14 15:10:39 -07:00
John Spurlock
fb13d497ae Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 2015-05-13 20:10:49 +00:00
John Spurlock
bbde26774f Zen: Use shorter version of countdown condition summary in footer.
To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
2015-05-13 15:45:40 -04:00
Jonathan Basseri
4f9ad1678e Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
2015-05-13 10:45:29 -07:00
Adam Powell
13036beab1 Apply API feedback for ChooserTarget
* Add better docs to ChooserTarget
* Change ChooserTarget to use android.graphics.drawable.Icon instead
  of Bitmap
* Preserve EXTRA_REFERRER when starting ChooserTargets

Bug 21045119

Change-Id: If859b86344cebaed3eaae477af132e7d7600aba6
2015-05-12 15:06:24 -07:00
Adam Powell
7d7580019e Bringing new Chooser UI closer to spec
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.

Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
2015-05-11 12:16:19 -07:00
John Spurlock
4755cb3e5d Merge "Zen: Tweak default automatic rules." into mnc-dev 2015-05-08 22:29:12 +00:00
John Spurlock
cb9aa20bdd Zen: Tweak default automatic rules.
- Add a new default rule for calendar events.
 - Rename all default rules to singular form. i.e. Weekend/Weeknight/Event

Bug: 20064962
Change-Id: Iee13238e0479fd2a05abdef4a5584455dcdd0c53
2015-05-08 17:35:22 -04:00
John Spurlock
807749301f Zen: Simplify notification policy api, add zenmode api.
- Remove the concept of a notification policy management token
   in favor of a simple grant/deny per app.  Currently, all requests
   are immediately granted.
 - Add zen mode getter/setting, limit to apps that have been granted
   policy access.
 - Add intent for zen mode changes.
 - Public name for zen mode = "interruption filter", moved from
   NotificationListenerService to NotificationManager.
 - Add settings metadata for new DND access Settings screen.
 - Add the split sender settings for calls vs messages to the public
   Policy api.
 - This change is meant to finalize the public api, persisting
   granted app status and showing the user-visible dialog will be
   done as followups.

Bug: 18298798
Change-Id: I511be98d69939f057c0c7dc1a6dfe63d1c468193
2015-05-08 13:34:30 -04:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
2015-05-06 15:57:09 -07:00
John Spurlock
bc1a2ad878 Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev 2015-05-06 00:30:26 +00:00
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
John Spurlock
a492d1d88c Zen: Maintain source filters for both calls and messages.
Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
2015-05-05 18:45:42 -04:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
2015-05-05 14:52:52 -07:00
John Spurlock
0bc8afff7e Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 2015-05-05 14:42:03 +00:00
John Spurlock
d39af2d3f8 Zen: Remove calendar rule attendance attribute.
- No longer supporting a filter based on attendance type.
 - Remove from model + condition provider logic.

Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
2015-05-05 09:49:32 -04:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
John Spurlock
d60258f2d3 Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
2015-04-30 11:42:11 -04:00
John Spurlock
d9c75dba75 Volume: Simple dialog footer, DND in quick settings.
- Show DND tile by default, this is now the only
   place to manage DND modes / end conditions.
 - Remove super footer from volume dialog, replace with
   a simplified version that displays the current mode
   and allows ending DND.
 - Remove obsolete text-only footer from codebase.
 - Migrate remaining volume items into main resource files.
 - Rename "No interruptions" to "Total silence".
 - Add new user information banner for "Total silence"
 - Crude media filtering for Total Silence.
   (deeper muting changes will be done as a followup)
 - Disable volume dialog sliders completely if muted due
   to zen.
 - Cleanup ZenModePanel: assume embedded mode, remove
   expandable subhead
 - Remember "favorite" DND mode inside the DND config panel.
 - AudioService: consult ringer-mode-delegate before voluming
   down into silent.
 - Add new hour options to time-based exit conditions.
 - Volume dialog visual updates to move closer to final visuals.
 - Unify ringer=silent with DND.

Bug: 19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
2015-04-29 09:58:38 -04:00
Amith Yamasani
f47e51ec60 More usage tracking
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
2015-04-24 16:12:01 -07:00
Cheuksan Wang
e87e4f077c add a parameter to carrier messaging calls to request delivery status
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
2015-04-24 21:51:28 +00:00
Adam Powell
c6d5e3a406 Fixes for ChooserTargetActivity
* Always ensure intent filter is supplied to a ChooserTargetService.
* Add and clarify docs for ChooserTarget constructors.
* Fix a bug where ChooserTargets were being parceled incorrectly.

Change-Id: I32b70c424b0e6bb317e2eeb810566a30c21b9d53
2015-04-23 14:29:30 -07:00
Adrian Roos
e57818a20e Merge "Allow dismissing Keyguard from TrustAgentService" 2015-04-17 02:44:09 +00:00
Filip Gruszczynski
54ce1cafb0 am cba75f31: am 47e743b9: am 4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit 'cba75f315967bba103805046b122e9a58687b85d':
  Hold a wake lock while dozing when wallpaper draws.
2015-04-17 02:09:40 +00:00
Adrian Roos
94e15a59b7 Allow dismissing Keyguard from TrustAgentService
Bug: 19900313
Change-Id: I44d13ee6fe65070327076e73a3ed96c94acdc108
2015-04-17 01:12:30 +00:00
Filip Gruszczynski
47e743b9e2 am 4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
  Hold a wake lock while dozing when wallpaper draws.
2015-04-17 00:59:39 +00:00
Andres Morales
cfb61601fa Clear secure user ID and notify keystore when lock is cleared
Change-Id: Id5bbde81b83add09e8362d439b19f1febe451003
2015-04-16 16:31:50 -07:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws.
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
2015-04-16 15:00:58 -07:00