Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,155 Commits 3 Branches 0 Tags
bece80645e2b2d84ea65aabfa7fc01d5ad633708
Commit Graph

4272 Commits

Author SHA1 Message Date
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
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets 
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
 2015-05-01 16:16:42 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist 
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
 2015-05-01 13:33:38 -07:00
Chris Wren
b1ad8e9ea0 Merge changes from topic 'tron' into mnc-dev 
* changes:
  remove unused edge border dimension.
  log clear all button
 2015-05-01 18:46:42 +00:00
Amith Yamasani
92d420579b Merge "Exclude bound app widgets from idle app list" into mnc-dev 2015-05-01 18:21:43 +00:00
Amith Yamasani
e4a8da8ea2 Exclude bound app widgets from idle app list 
Track package names of bound app widgets and use the list when
querying for idle apps.

Bug: 20066058
Change-Id: If8039397a061ef04bb13aa38d57cd7f0221f5fc7
 2015-05-01 11:17:27 -07:00
Chris Wren
9763d42c7b log clear all button 
Bug: 20089768
Change-Id: I96d64c387b6085025df76c4aaf7ff9d7bdf51799
 2015-05-01 11:09:26 -04:00
Gus Prevas
cdc8a8bf5b am cf6f4e4e: am 25e99ce6: am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit 'cf6f4e4e4d1a6e13ac7919b03d2561bc54b9f679':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 08:47:05 +00:00
Gus Prevas
043d7a94ab am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit '12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 07:36:43 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
John Spurlock
b7ca2709c3 am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
  Zen: New event condition data model.
 2015-04-30 16:25:19 +00:00
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
Gus Prevas
12b1b8ed3b am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit '026e204ee461e101fe251742f6ffb09b1747c804':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-04-30 15:42:03 +00:00
Gus Prevas
026e204ee4 Fixes velocity tracking bug in SwipeDismissLayout. 
This is the framework version of ag/682710.
Original change description:
This change adds a missing call to offsetLocation() when tracking
swipe velocities on a SwipeDismissLayout.  This bug was causing
incorrect velocities to be measured which often resulted in an
incorrectly interpreted leftward swipe cancelling the dismiss
gesture.

Bug: 20350515
Change-Id: I4f3e3668a1f9aab963fdfa9095a43f4c5344703f
 2015-04-30 11:14:14 -04:00
Maxim Bogatov
aba56b648f Merge "Add accessibility actions for scrolling in different directions" 2015-04-30 01:16:02 +00: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
Andreas Gampe
27c39f1ade am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp 
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
  Frameworks/base: Add debug.gencfi property

(cherry picked from commit a5b55a017a)
 2015-04-28 13:46:00 -07: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
Maxim Bogatov
ac6ffce171 Add accessibility actions for scrolling in different directions 
b/20157498

ACTION_SCROLL_UP, ACTION_SCROLL_DOWN, ACTION_SCROLL_LEFT and ACTION_SCROLL_RIGHT
actionos were added in addition to ACTION_SCROLL_FORWARD/BACKWARD

Change-Id: I8d5182a8add32085a354b280496b3d38ec79be32
 2015-04-27 13:45:58 -07: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