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

196998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
02f91c024e am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '9201385f2e59d58bc52a5fbe5a3b666850dcae5f':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-08 23:23:44 +00:00
Ian Pedowitz
baad8d36a1 am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit '224f0369ca2ab6265379ce170c8779a7385a33f3':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:10:53 +00:00
Sasha Levitskiy
ce3da9839c am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '12328ef422027f2f5f033ed65c8a09535f9ca81d':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:10:49 +00:00
Jim Miller
cd065639ae am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit 'e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
  Don't use fingerId when creating names
 2015-07-08 23:10:42 +00:00
Vineeta Srivastava
3af271a957 am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '99b8820fd7357f6287e65468b23751279562807b':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:10:38 +00:00
Selim Cinek
9201385f2e Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 2015-07-08 23:08:48 +00:00
Ian Pedowitz
224f0369ca Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 2015-07-08 23:01:19 +00:00
Ian Pedowitz
de8d3a53a8 com.android.mms is no more, so removing from default_sms_application 
Fixing a minor comment typo

Bug: 22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
 2015-07-08 23:00:22 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Jim Miller
e6fd76c235 Merge "Don't use fingerId when creating names" into mnc-dev 2015-07-08 22:58:23 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface. 
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 15:38:07 -07:00
Vineeta Srivastava
99b8820fd7 Use fingerid 0 when checking failed attempts. 
It is valid to have finger id as Hex value which is not necessarily less than 0.
Always compare with finger id 0 to make sure we are not locking out user.

Bug: 22354158
Change-Id: I19ded12ae4ee335621fd278163c652fc154be6cf
 2015-07-08 22:36:15 +00:00
Roshan Pius
f08a7ada3a am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev 
* commit '8f596907a5241badad821a6d3490eb2cd7dd23c5':
  Change sequence of call removal from Phone's db.
 2015-07-08 22:08:46 +00:00
Jorim Jaggi
b0ca502645 am 6d712e06: Remove volume motion delay 
* commit '6d712e06f7c35d4120ce8ded5961d3bb97c44cab':
  Remove volume motion delay
 2015-07-08 22:08:38 +00:00
Roshan Pius
8f596907a5 Merge "Change sequence of call removal from Phone's db." into mnc-dev 2015-07-08 22:03:25 +00:00
Jeff Sharkey
46552cfff1 am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit '9d587a97b9cf89f85d1782a6af66bff487568945':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:01:32 +00:00
Jeff Sharkey
612aac4e50 am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.
 2015-07-08 22:01:28 +00:00
David Friedman
ec951af550 am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '2a33526b70fbf471b89451b2c2b4553efc286698':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 22:01:24 +00:00
Jorim Jaggi
6d712e06f7 Remove volume motion delay 
Disable window animations, so we can start the show animation directly.

Bug: 21335976
Change-Id: I1d25d0ce46b9a068efed0a1561051072cda226a9
 2015-07-08 21:57:14 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev 
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 21:55:54 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Roshan Pius
1ca6207a1e Change sequence of call removal from Phone's db. 
Since the Call API's callbacks are now fired from handlers, they end up
changing the order in which the callbacks from the Phone and Call API's
are fired. To preserve the below ordering, we move the call removal from
Phone's db to after all the onCallDestoryedcallbacks have executed.
1. Call->onStateChanged
2. Call->onDetailsChanged
3. Call->onCallDestroyed
4. Phone->onCallRemoved

BUG: 22127504
Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
 2015-07-08 14:47:36 -07:00
David Friedman
2a33526b70 am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '9568a412377eb5ef247f843c1845b433eb648645':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 21:46:25 +00:00
Robert Greenwalt
8e7b195474 am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 
* commit '8b0f3873a04103f6886fdc2fb79b9a3963567720':
  Add/Fix Permission check on SubscriptionManager.
 2015-07-08 21:41:06 +00:00
David Friedman
9568a41237 am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview. 
* commit '3d52c10e217c4a622b5e7c0767a46ab5d14e58ea':
  Docs: Adds fugu system-image links and hashes for M-Preview.
 2015-07-08 21:33:35 +00:00
Robert Greenwalt
8b0f3873a0 Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 2015-07-08 21:26:17 +00:00
Adrian Roos
4a94dca13a am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev 
* commit '7f806ec2288df739a0ec03a2363cc912ad49f443':
  Dump internal state of ImageWallpaper
 2015-07-08 21:16:42 +00:00
Jeff Sharkey
14cbe52150 Kill MediaProvider during drastic changes. 
Sadly MediaProvider makes a ton of assumptions about storage paths
not changing.  To ensure that it picks up radical storage changes,
kill it and let it restart to pick up new paths.

Also give ourselves a longer timeout when benchmarking.

Bug: 20275423
Change-Id: I9971c4667dabdc685cb23528443f085f152c461d
 2015-07-08 14:06:40 -07:00
Adrian Roos
7f806ec228 Merge "Dump internal state of ImageWallpaper" into mnc-dev 2015-07-08 21:01:27 +00:00
Chien-Yu Chen
be0a7a0d02 am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 20:47:16 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
Tingting Wang
0f4595afd0 am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 20:20:20 +00:00
David Friedman
3d52c10e21 Docs: Adds fugu system-image links and hashes for M-Preview. 
This is for English and non-English pages, alike.

Change-Id: I6ad68cee7d416279a5db0a39192fdca14f1f3709
 2015-07-08 13:10:47 -07:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00
Selim Cinek
9c17b77493 Cleaned up the clipping logic for the dismiss motion. 
Notifications are now not clipped anymore during the animation
and it is ensured that the State is always correctly reset after
the animation.

Bug: 22232352
Change-Id: Ic873a0b119d5f71c29f5fd9b76a7bee1ae74638b
 2015-07-08 13:05:20 -07:00
Tingting Wang
d55b348e62 Don't display Custom for PHONE_TYPE=CUSTOM part 1. 
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
 2015-07-08 12:55:22 -07:00
Alex Klyubin
b5501efcdd am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 
* commit 'd25093d2fd151638a108a110484e579cc1dcaf54':
  Reject AlgorithmParameters of wrong type.
 2015-07-08 19:41:07 +00:00
Alex Klyubin
d25093d2fd Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 2015-07-08 19:32:32 +00:00
Etan Cohen
e35c2d2fbc am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev 
* commit '3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf':
  Lock screen text: consider possible WFC service in APM
 2015-07-08 19:10:19 +00:00
Selim Cinek
7617f55ed1 am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 
* commit 'a8c247e0b4e14123f85cec00500144ff28aaf6ed':
  Fixed a bug where collapserunnables where dropped
 2015-07-08 19:10:15 +00:00
Etan Cohen
3aa1b1e5ec Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev 2015-07-08 19:02:34 +00:00
Selim Cinek
a8c247e0b4 Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 2015-07-08 18:55:34 +00:00
Chien-Yu Chen
72333917a7 Camera: Enforce ZERO_SHUTTER_LAG mode 
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
 2015-07-08 11:55:19 -07:00
Etan Cohen
47051d8e6d Lock screen text: consider possible WFC service in APM 
Bug: 22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
 2015-07-08 11:38:25 -07:00
Jason Monk
0caac8ea19 am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev 
* commit 'fede4258fa1bf880c2b88ebea3c886003662fc74':
  Remove bang from not connected wifi
 2015-07-08 17:38:57 +00:00
Eric Laurent
070df44493 am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev 
* commit 'c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
  audio: add definitions for devices connected over IP
 2015-07-08 17:38:53 +00:00
Jason Monk
fede4258fa Merge "Remove bang from not connected wifi" into mnc-dev 2015-07-08 17:26:34 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Geoff Mendal
3c573bc569 am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4f5630e51d03980e80fde93154f5a0302c8179a2':
  Import translations. DO NOT MERGE
 2015-07-08 17:00:13 +00:00
Geoff Mendal
4f5630e51d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 16:45:22 +00:00