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

196143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei Stingaceanu
15f4dd7219 resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297
 2015-06-10 15:46:44 +01:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Alex Chau
ad9141817f am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit 'ccfa54f4a226196aff49f81fa6c809ad05afccb6':
  Add strings for notification shown upon work profile deletion
 2015-06-10 10:53:42 +00:00
Alex Chau
ccfa54f4a2 Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 2015-06-10 10:44:02 +00:00
Alex Chau
9c8d2b0620 Add strings for notification shown upon work profile deletion 
Bug: 18543323

Change-Id: I87713da6684044b95b2e6c38882e20fe798f8deb
 2015-06-10 11:42:14 +01:00
Chris Banes
d64c5befd6 am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd9b0acd2eb8d844b9f901fc62e0de74c1a7d8430':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:48:45 +00:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
b1c579df0b am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '706f23ddb9f18663d5ae70626e118e815a308c84':
  Make peer LLCP version an int.
 2015-06-10 07:08:15 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
f355a22d14 am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'e687929f33f272fff9585bd0752d85ad519bc66d':
  Flags to select storage volume for app installs.
 2015-06-10 04:56:19 +00:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Yao Chen
72df690ce0 am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:36:57 +00:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00
Adrian Roos
b46211746c am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '5b7793cacf3910a386182a9b78460934d00dfdae':
  Expand scrim all the way to the right
 2015-06-10 01:40:51 +00:00
Svetoslav
60022334b7 am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit 'a1e60f1f45dce19f9dc15b97cbb0821ffeb54d9d':
  Use who when requesting permissions
 2015-06-10 01:40:46 +00:00
Adrian Roos
dcd6ef27ed am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit '9454847618c3b799a0acfa0a2495cf8a120c4f26':
  Add content description to keyguard user avatar
 2015-06-10 01:40:42 +00:00
Adrian Roos
5b7793cacf Merge "Expand scrim all the way to the right" into mnc-dev 2015-06-10 01:29:56 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Adrian Roos
2f2bd9a8f8 Expand scrim all the way to the right 
Fixes a bug where the scrim would not cover
the area occupied by the nav bar which looks weird
when the nav bar is hidden.

Bug: 19582019
Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-10 01:29:12 +00:00
Adrian Roos
9454847618 Merge "Add content description to keyguard user avatar" into mnc-dev 2015-06-10 01:28:31 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Dianne Hackborn
4f8fdd9332 am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '113769d70b2221697ad9a9553da68ec6483cbfa1':
  Fix NPE.
 2015-06-10 01:16:41 +00:00
Lajos Molnar
a390a202d2 am 53858ced: Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 
* commit '53858ced4cfe4717d90b298e7fb4ffa18effcfcf':
  media: hook up OnFrameRenderedListener events to framework events
 2015-06-10 01:16:36 +00:00
Adrian Roos
8aa14b59d3 am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'dbcf0a9e7d36545b73225ba2c164beb4b0ad9a06':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:16:32 +00:00
Adrian Roos
ffc9097d10 Add content description to keyguard user avatar 
Bug: 20535812
Change-Id: I32ff0878c2332681ebd848c9da6e2dc42363b9be
 2015-06-09 18:09:49 -07:00
Dianne Hackborn
113769d70b Merge "Fix NPE." into mnc-dev 2015-06-10 01:06:29 +00:00
Lajos Molnar
53858ced4c Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 2015-06-10 01:04:50 +00:00
Adrian Roos
dbcf0a9e7d Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 2015-06-10 01:02:48 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07:00
Christopher Ferris
0a77826257 am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:38:44 +00:00
Stefan Kuhne
e6581b11a9 am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit '011c133e3c98ccf95fe4626d30c739c5a35d986e':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:26:11 +00:00
Fyodor Kupolov
1f6cbb5d76 am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit 'c2ae0090d2f6b9f36b4027e79f0430d29853a193':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:26:07 +00:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Stefan Kuhne
011c133e3c Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 2015-06-10 00:21:49 +00:00
Fyodor Kupolov
c2ae0090d2 Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 2015-06-10 00:16:14 +00:00
Fyodor Kupolov
b615799504 Do not create profile if FEATURE_MANAGED_USERS is not available 
Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
 2015-06-09 16:51:13 -07:00
Adrian Roos
9b9947de5d ImageWallpaper: Atomically fetch display info 
Previously we fetched rotation and dimens separately
which had the potential to cause inconsistencies.

Bug: 21440533
Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
 2015-06-09 16:48:57 -07:00
Dianne Hackborn
549aacfe9a am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '476695227393b6c35c6777754b0e3b6448ceb7d2':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-09 23:47:23 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Erik Kline
69b0dcab4f am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit '64d6ce8a661fd63b90b4c9f3f7d400208cb2430a':
  initial revision of NetworkDiagnostics
 2015-06-09 23:32:50 +00:00
Erik Kline
64d6ce8a66 Merge "initial revision of NetworkDiagnostics" into mnc-dev 2015-06-09 23:23:03 +00:00
Robin Lee
9e46757d85 am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit '63cc6458ace9da6a064f254323fe493618a6c518':
  Switch over to updated VPN warning strings
 2015-06-09 23:21:27 +00:00
Filip Gruszczynski
24ebdf9c28 am 2bad67b1: am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '2bad67b16fbfbfa56081bfbd6a43c0b1793ce8a3':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:21:22 +00:00
Wale Ogunwale
36748a43ae am d648975f: am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit 'd648975f514dfbe694a905fabc554ed267b1bfb3':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:21:18 +00:00
Luan Nguyen
7bfd2d9e74 am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'e44643b15cbe4a5ba9a77bbdcffba1622bd5a03d':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:21:12 +00:00
Wale Ogunwale
d43ee1260e am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit '2c4643dd802d18ca0088fa860076fe917c69335f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:13:54 +00:00
Robin Lee
63cc6458ac Merge "Switch over to updated VPN warning strings" into mnc-dev 2015-06-09 23:13:38 +00:00
Filip Gruszczynski
2bad67b16f am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '6974f22d1148f0140b4abc76cc58e6bd6ad7842a':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:10:32 +00:00