drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,319 Commits 1 Branch 0 Tags
Commit Graph

190319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
a00cf1276b am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '3e70c6b49ff993aef9fd554ade3444e3d3afa032':
  docs: studio 1.2 download link fix
 2015-04-30 17:59:51 +00:00
Rich Slogar
f7ef3edba4 am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '3e70c6b49ff993aef9fd554ade3444e3d3afa032':
  docs: studio 1.2 download link fix
 2015-04-30 17:59:46 +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
Rich Slogar
3e70c6b49f Merge "docs: studio 1.2 download link fix" into lmp-docs 2015-04-30 17:46:18 +00:00
Robin Lee
ef25597acf SystemUI strings: prospective VPN strings for apps 
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit 63539bd5fac53d90adff35df340562a1926d610e)
 2015-04-30 17:38:29 +00:00
Rich Slogar
c395bd2417 docs: studio 1.2 download link fix 
Change-Id: Ib0234749f64427fbada795a49d2b52d5a67dbd3b
 2015-04-30 10:25:56 -07:00
Alex Klyubin
8c82b4508f Cleanup logic for per-op auth keys. 
This streamlines the exception throwing logic for per-op auth keys of
AndroidKeyStore.

Change-Id: I7e27c17fd89d5a7f71f5d7578f584189c5236fb8
 2015-04-30 10:13:39 -07:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View 
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
 2015-04-30 09:58:35 -07:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Benjamin Franz
b7a42fda31 Improve Accessibility behaviour in recents 
Currently accessibility services use the activity label that is also
displayed in recents, which can be very confusing as it does not
represent necessarily represent the app that the recent item is
running. To improve this we use a combination of the application label
and the activity label. The application label is also badged to
distinguish between different users.

Bug: 19688800
Change-Id: Ibead6c87767649aa11cf2fe086924a4b69bf187c
 2015-04-30 17:40:26 +01:00
Chris Craik
ed375f269b Merge "Fix rendernode flag logging" into mnc-dev 2015-04-30 16:19:33 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging 
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
 2015-04-30 09:12:44 -07:00
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +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
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +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
Abodunrinwa Toki
5793f22e68 Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 2015-04-30 12:18:51 +00:00
Narayan Kamath
144b0bb605 Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev 2015-04-30 11:25:37 +00:00
Narayan Kamath
b0f3d9ea6e Fix incorrect javadoc for Uri.getQueryParameter. 
This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651

(cherry picked from commit 4356c95354d28b8ceb1b04e97c53c2ba3b3faa93)

Change-Id: I5b96bcb20aa3a1d227dd5b00926af077276fc666
 2015-04-30 12:23:19 +01:00
Zoltan Szatmary-Ban
780a9b9e12 Merge "Fix potential NPE on devices without DPMS" into mnc-dev 2015-04-30 09:48:36 +00:00
Zoltan Szatmary-Ban
cccbe885b9 Fix potential NPE on devices without DPMS 
Bug: 20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
 2015-04-30 10:38:24 +01:00
Benjamin Franz
dc4ad271f9 Merge "Add package name extra to PackageInstaller callback" into mnc-dev 2015-04-30 08:33:47 +00:00
Wei Wang
05a419aed5 Merge "Temp workaround to track max beacons." into mnc-dev 2015-04-30 07:08:43 +00:00
Wei Wang
fc9f2d71a6 Temp workaround to track max beacons. 
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
 2015-04-30 00:07:53 -07:00
Shawn Willden
7230bdf23b Merge "Add missing error codes from keymaster_defs.h." into mnc-dev 2015-04-30 05:14:51 +00:00
Shawn Willden
dbc00eb0aa Add missing error codes from keymaster_defs.h. 
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
 2015-04-29 23:13:20 -06:00
Jeff Sharkey
21df222fa8 Merge "New "frozen" state during app move/upgrade." into mnc-dev 2015-04-30 05:09:02 +00:00
Jeff Sharkey
e31b820dad New "frozen" state during app move/upgrade. 
This replaces mOperationPending, which was in an odd place.  It adds
a new PackageSetting.frozen flag that is a last-ditch effort to
prevent ActivityManager from starting an app while it's being moved
or upgraded.

Also provides clearer guarding around all upgrades by freezing,
killing, upgrading, then unfreezing.

Bug: 20275579
Change-Id: I28bb0359a6f4e05080fb336b18dd2a249509d989
 2015-04-29 22:03:37 -07:00
Rich Slogar
a1c7176bdc am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'a03e2658af7a3d223655e77725e2be6d0863455b':
 2015-04-30 03:55:54 +00:00
Rich Slogar
7fbde8f508 am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '408aeb05e4edb75801f63d22771d6726a4d46ed4':
 2015-04-30 03:55:50 +00:00
Rich Slogar
ac9c751d74 am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '62cfe97d38a94bc32af9773c7f880723a7bf2f08':
 2015-04-30 03:55:43 +00:00
Rich Slogar
994d6ffec7 am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '7a258afa65a8b9174b9080dc931add9a27c62256':
 2015-04-30 03:55:38 +00:00
Rich Slogar
c3563bf7e0 am 6891f035: am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '6891f0359ba56c8132bb0b69595e40d7eab46a14':
  docs: studio 1.2 downloads
 2015-04-30 03:48:38 +00:00
Rich Slogar
88410eeb68 am cd63231f: am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit 'cd63231f9015c8da0e1f57809f171e25d7cdd75a':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:48:31 +00:00
Rich Slogar
2894c5d4de am 58b0fc56: am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '58b0fc56ef447cb78665e9324245a0af08977b14':
  docs: studio 1.2 revision updates
 2015-04-30 03:48:26 +00:00
Rich Slogar
a03e2658af am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit '7c267f663a39c314bd4ca5d831cc5cbac0d37260':
  docs: studio 1.2 updates
 2015-04-30 03:32:18 +00:00
Rich Slogar
408aeb05e4 am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit 'b6ad1ce8cb434d01e564b217c7de89fd2192c43f':
  docs: studio 1.2 downloads
 2015-04-30 03:31:59 +00:00
Rich Slogar
62cfe97d38 am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '2653774af297de133669136976418729a9f71aca':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:31:51 +00:00
Rich Slogar
7a258afa65 am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit 'af73c6e70c24f6786997d9fdb90d6a51a2a83883':
  docs: studio 1.2 revision updates
 2015-04-30 03:31:09 +00:00
Rich Slogar
edf44562b5 am b4430aa3: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'b4430aa33fa0a0a7631850d2da7112319a9ca4c7':
  docs: studio 1.2 updates
 2015-04-30 03:28:43 +00:00
Alex Klyubin
459ef1e7ce Surface KeyPermanentlyInvalidatedException for per-op auth keys. 
Bug: 20642549
Change-Id: Ibda270921f13a1fd695264583b0e4bd255f63aed
 2015-04-29 20:28:41 -07:00
Rich Slogar
6891f0359b am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '572ecb6e5e5a5ffbf2e10ef4702e9d75f097c5fe':
  docs: studio 1.2 downloads
 2015-04-30 03:28:39 +00:00
Rich Slogar
cd63231f90 am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '47bd51e63c3b3c59c354af86f400fd00a4afecae':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:28:30 +00:00
Rich Slogar
58b0fc56ef am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit 'd8293d837e50a8aaf8b365ee08f96e9d5ce26625':
  docs: studio 1.2 revision updates
 2015-04-30 03:28:26 +00:00
Andrew Solovay
4fbdbbe8f1 am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs 
* commit 'c15736b95d61033f03b1446371315bfa46252aaf':
  docs: Minor formatting cleanup.
 2015-04-30 03:14:13 +00:00
Rich Slogar
7c267f663a am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'f4b1df340379b08d6b12d0c6247e13c54de319ef':
  docs: studio 1.2 updates
 2015-04-30 03:13:47 +00:00
Rich Slogar
b6ad1ce8cb am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '541dda1cd652e733feb5acd6acd5752aa7f8b190':
  docs: studio 1.2 downloads
 2015-04-30 03:13:43 +00:00