Commit Graph

4252 Commits

Author SHA1 Message Date
John Spurlock
0f4c6a8bdf am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
  Zen: New event condition data model.
2015-04-30 16:16:13 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00: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
Mike Lockwood
3d7765cd6f am c7bf0a6a: am 3f9dc836: Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
* commit 'c7bf0a6afb8918fa6fdd469cbd6383188b1d2564':
  MidiFramer: Support realtime messages contained within SysEx messages.
2015-04-30 00:27:36 +00:00
Mike Lockwood
3f9dc836c4 Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev 2015-04-30 00:14:26 +00:00
Dianne Hackborn
8756f9b34d am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '599a4e0ea864769e6cd1d04bd766c472b16be4c7':
  Implement user-settable power save whitelist.
2015-04-29 20:51:04 +00:00
Dianne Hackborn
9ac2718e7d Merge "Implement user-settable power save whitelist." into mnc-dev 2015-04-29 20:33:51 +00:00
Abodunrinwa Toki
ef586c12d1 am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit 'eaa44818adbe8c6ee850c530fc70809502340469':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
2015-04-29 20:21:57 +00:00
Dianne Hackborn
0b4daca9ba Implement user-settable power save whitelist.
The whitelist is now maintained by DeviceIdleController,
which is moving out into its own independent system service.
Network stats now queries it for the whitelist, instead of
collecting that itself.

Also did a few improvements in alarm manager -- made the
code for moving alarms out of the pending list more robust,
and fixed the debug output to always print the contents of
the pending list even if we aren't in a pending state.  (That
would have helped me identify the problem much earlier.)

Change-Id: I0f7119d4c553c3af4d77b2f71246fa6e2c13c561
2015-04-29 12:38:09 -07:00
Abodunrinwa Toki
c23ac32601 DO NOT MERGE: Minor fixes to FloatingToolbar.
* Changes to isShowing() method.
* Changes to initial content visibility on show().

Change-Id: I1b20cd5a3fc86ae7427b55c44efd3cc1118148ae
2015-04-29 17:57:06 +00:00
Adam Powell
57628b6295 am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
* commit '78cc38d5011df42eb8d15eef81a6bef63c5f2eaa':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets
2015-04-29 01:59:44 +00:00
Adrian Roos
66c6d0e266 am 5fb269e4: am 59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev
* commit '5fb269e4582d97a541eccf39c2484d8d2a8e16ab':
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils
2015-04-29 01:59:18 +00:00
Chris Craik
e01d4b3566 am 4f66e48d: am 2f1d09c3: Merge "Use default constructor to get anti-aliasing" into mnc-dev
* commit '4f66e48de3a66ca41916b897f0898f8eb23aa2ac':
  Use default constructor to get anti-aliasing
2015-04-29 01:59:11 +00:00
Mike Lockwood
cb2b34c755 am 1ac9018a: am 986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
* commit '1ac9018ac362adcc526311d4473471105c23ef62':
  MidiFramer: Add support for SysEx messages
2015-04-29 01:58:14 +00:00
Adam Powell
4e678ff89d Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev 2015-04-28 22:59:58 +00:00
Adam Powell
d974c7b4d1 Fix a bug when constructing a ChooserTargetAdapter without custom
targets

Bug 20667333

Change-Id: Ia35021d12c00f64f5424588f776d79e18e8d518e
2015-04-28 15:41:46 -07:00
Mike Lockwood
12e31b198e MidiFramer: Support realtime messages contained within SysEx messages.
Also fix off by one error that occurred if a SysEx message ended
in the middle of the buffer being processed.

Change-Id: I055f005610c7b091012a30b306786114c5d9bf8d
2015-04-28 15:41:35 -07:00
Adrian Roos
59a1e117ac Merge changes from topic 'roosa-lpu' into mnc-dev
* changes:
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils
2015-04-28 22:09:42 +00:00
Chris Craik
2f1d09c3c5 Merge "Use default constructor to get anti-aliasing" into mnc-dev 2015-04-28 22:06:17 +00:00
Mike Lockwood
986da92bdf Merge "MidiFramer: Add support for SysEx messages" into mnc-dev 2015-04-28 19:36:28 +00:00
Mike Lockwood
f26b72dde4 MidiFramer: Add support for SysEx messages
Change-Id: I15a605029a0e89fa75c57f180a5a951ada88461c
2015-04-28 12:35:22 -07:00
Chris Craik
58fc522a69 Use default constructor to get anti-aliasing
Change-Id: I3e078a3bc91a2fd703984ba18b5e7e98069b32f1
2015-04-28 11:49:27 -07:00
Adrian Roos
d6aa6cb0cc Remove LockPatternUtils.getCurrentUser()
Bug: 18931518
Change-Id: I177eefe466c12217cf64c85b872f71bc23c7bf05
2015-04-28 11:49:04 -07:00
Adrian Roos
8150d2a2a1 Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
2015-04-28 11:49:00 -07:00
Adam Powell
03b0f717ca am 7c420307: am 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
* commit '7c42030739a5b9418135be798885df68a03c6ac2':
  Wire up caller chooser targets for ChooserActivity
2015-04-28 14:51:07 +00:00
Benjamin Franz
518c315a75 am 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
* commit '94e3b0c509aacd8ff0395c56f06a7898eabeca5b':
  Introduce disable2 into StatusBarManager
2015-04-28 14:50:05 +00:00
Andreas Gampe
b6d14a009e resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
Change-Id: I0e3dacbdfb68d6bb31800ff2e9969b96e63634b6
2015-04-27 10:18:08 -07:00
Adam Powell
0ccc0e9348 Wire up caller chooser targets for ChooserActivity
Add the caller-supplied ChooserTargets from EXTRA_CHOOSER_TARGETS in
the default ChooserActivity. These appear before other options.

Change-Id: Ic4d23ae9ecdfd0cc8a5ac077696d7334a8f844a6
2015-04-27 17:11:29 +00:00
Benjamin Franz
cde0a2a9ea Introduce disable2 into StatusBarManager
We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.

Bug: 20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065
2015-04-27 16:46:12 +00:00
Andreas Gampe
a876b35d48 Frameworks/base: Add debug.gencfi property
Add the debug.gencfi system property that forces generation of
CFI data.

Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
2015-04-24 16:31:41 -07:00
Alan Viverette
6e37e5a006 Merge "Implement RTL support in framework ViewPager, DatePicker" 2015-04-24 18:06:50 +00:00
Mark Renouf
e2725f87b4 am f237bce8: am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit 'f237bce8c3bb4ac31a4c5eaa732de95d5b469f34':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:54:33 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:31:31 +00:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
2015-04-24 11:47:27 -04:00
Jeff Sharkey
620b32b316 Package and storage movement callbacks.
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.

Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status.  Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.

Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion.  Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume.  These values are used
for both package and primary storage movement destinations.

Persist the current primary storage location in MountService
metadata, since it can be moved over time.

Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully.  Also send broadcast
to support TvSettings launching into adoption flow.

Bug: 19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
2015-04-23 20:32:17 -07:00
Adam Powell
a40c2c46b2 Merge "Fixes for ChooserTargetActivity" 2015-04-23 22:15:27 +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
Abodunrinwa Toki
0ce3e08a84 Fix FloatingToolbar.show()
*Finer cancel animation methods so we call only the necessary ones.

*Don't set the FloatingToolbarPopup content view's alpha to 0
 before showing it's popup window.

*FloatingToolbarPopup.dismiss() should run when toolbar is hidden.

Bug: 20456876
Change-Id: I2e7ff5f2ec56af2def0976fa8e770c651daaa3a3
2015-04-23 17:33:58 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:30:43 +00:00
Alan Viverette
ddf655c49f Implement RTL support in framework ViewPager, DatePicker
Lays out ViewPager in the opposite direction when in RTL mode, e.g.
the first item's starting edge is laid out at the largest possible
scrolling distance. This preserves both the meaning of positive
scrollX values and the meaning of positive adapter positions.

Also removes clickable attribute from DayPickerView since it has a
virtual view hierarchy.

Bug: 19408740
Bug: 20134073
Change-Id: Ib6f945335bd88da59c8c593c7c270e290e15d0a5
2015-04-22 13:43:31 -07:00
Abodunrinwa Toki
d5358ffbee Fix floating toolbar touchable region bug.
The floating toolbar is rendered inside a transparent popup window
so that we can have smooth animations inside of the window (NOTE that
animating a view and a window at the same time do not work well as
both are not in sync.) Having a transparent window implies that we
can't get touch events through to the content below the window for
areas covered by the transparent window. To handle this issue we
"burn a hole" through the window by specifying it's "touchable area".
This is done using the mInsetsComputer which is set on the popup
window's root view's tree observer. When the popup is dismissed and
re-shown, we need to reset the mInsetsComputer as we most likely
won't have that root view any longer.

Change-Id: I13ea50bc19950180d339d05d82cbee03230e2f05
2015-04-22 18:19:38 +00:00
Andreas Gampe
825af5fba9 am 5d3aea2e: am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"
* commit '5d3aea2e5d052041a81bf49154ceedb9d96e2918':
  Frameworks/base: Fix comment
2015-04-22 00:00:15 +00:00
Andreas Gampe
c7f9f7656f am 189d2785: Merge "Frameworks/base: Fix comment"
* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
  Frameworks/base: Fix comment
2015-04-21 23:26:41 +00:00
Christopher Tate
f7cb8a0b50 Compress the preferred-app backup payloads
They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!

Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.

Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c
2015-04-21 14:36:22 -07:00
Chris Wren
217f93a129 Merge "Add optional package context to sysui action metrics." 2015-04-21 17:24:32 +00:00
Chris Wren
3db024afeb Add optional package context to sysui action metrics.
Bug: 20451514
Change-Id: I3c671d9aa05e02d66168211b77128443c544609d
2015-04-21 13:21:47 -04:00
Andreas Gampe
dd8e5fbe96 Frameworks/base: Fix comment
Fix comment in ZygoteInit.

Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
2015-04-21 09:01:51 -07:00
Andrei Kapishnikov
4eb6a36922 Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag
A new flag for DPM.resetPassword() method that specifies that the
device should be decrypted without asking for the password or pattern.

Bug 19250601

Related CL in Settings App: https://googleplex-android-review.git.corp.google.com/#/c/670206

Change-Id: I9ca3472dc18e66e618ff772dee16ca4a450e9997
2015-04-21 11:07:09 -04:00
Andreas Gampe
c147278276 am 3bbd87dd: am 1f4f92ed: am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '3bbd87dd1f6b7f6b767885a56ad062897bb25642':
  Frameworks/base: Use better Class.forName in ZygoteInit
2015-04-21 04:47:39 +00:00