Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Erik Kline
dedd42a2bd am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 00:10:12 +00:00
Alan Viverette
7d5bcd7990 Update scrollbars to match Material spec 
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
 2014-11-20 16:07:59 -08:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
John Reck
d3e5777e79 am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev 
* commit '83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2':
  If the surface is lost, release it
 2014-11-21 00:04:18 +00:00
John Reck
83fb64e8ec Merge "If the surface is lost, release it" into lmp-mr1-dev 2014-11-21 00:00:08 +00:00
Eino-Ville Talvala
6aee1d2ba5 Camera: Add new capability flags as system features as well 
Also add all the L and L MR1 new system features to the uses-feature documentation.

Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
 2014-11-20 15:52:40 -08:00
John Reck
9b5d427fe0 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
* commit '0b2dac3452a58e76be7379b85e7505c531842b57':
  Rename callDrawGLFunction
 2014-11-20 23:29:31 +00:00
John Reck
0b2dac3452 Merge "Rename callDrawGLFunction" into lmp-mr1-dev 2014-11-20 23:26:07 +00:00
Jaewan Kim
52dcc7fb0a am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 
* commit '18ab5c216c62d90a4b86f37a4c993c1c8b56835d':
  Add an API to check availability of Ethernet interface.
 2014-11-20 23:10:27 +00:00
Jaewan Kim
18ab5c216c Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 2014-11-20 23:07:43 +00:00
John Reck
680df8d60e Rename callDrawGLFunction 
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
 2014-11-20 14:40:52 -08:00
Eino-Ville Talvala
b22de13fdb am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 
* commit 'df84cb90df6f4a98c853dd61e858f62a584cdac5':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-20 22:04:54 +00:00
Eino-Ville Talvala
df84cb90df Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 2014-11-20 22:03:07 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
George Mount
d3a6338cfb am b986f82c: am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev automerge: bf50b88 
* commit 'b986f82cff447fa7f76796d03f210cbfb48291ab':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:34:31 +00:00
George Mount
6bc03efd12 am e8a4055a: am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev automerge: b883579 
* commit 'e8a4055a0910538ec9b4c2959d3bbdf8d7ef6fc1':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:34:20 +00:00
George Mount
b986f82cff am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
automerge: bf50b88

* commit 'bf50b88ed70c2f34b2426ce80213698e46d09eb0':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:28:33 +00:00
George Mount
e8a4055a09 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
automerge: b883579

* commit 'b8835791e2d2fab41277597008010a5681dacb41':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:27:17 +00:00
Chet Haase
ab11cfa2d3 am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8 
* commit 'a2b3a75ca599c3a2334b9c81a5abd6f544615d2f':
  Fix seeking and scaled duration behavior
 2014-11-20 21:19:27 +00:00
Alan Viverette
8c359de059 am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06 
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:19:17 +00:00
Alan Viverette
51c1803c2b am ee53586a: am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev automerge: 6a6b828 
* commit 'ee53586acb0e4b64d25313ccbab7e9310cdd9e2c':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:19:12 +00:00
Chet Haase
a2b3a75ca5 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
automerge: a79d2e8

* commit 'a79d2e86649dfb96159c2aebd94b4a5e19d66eb1':
  Fix seeking and scaled duration behavior
 2014-11-20 21:13:10 +00:00
Alan Viverette
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:10:56 +00:00
Alan Viverette
ee53586acb am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
automerge: 6a6b828

* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:09:34 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper 
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
 2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Wink Saville
1caab41f31 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
* commit '816e19eb6d5795f98f072494c763b20fe3412c30':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-20 20:38:40 +00:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e1.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
68c21d6736 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4a57e908177c86819ade1ebb813677698f1a526a':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:23:17 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Adam Lesinski
b7ce6d6db1 am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
* commit '825e0da22a672ada95da2175bb2d48579bf88a0d':
  Fix race when cleaning up receivers/services in Context
 2014-11-20 20:18:51 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00
Adam Lesinski
23d40c40aa Fix race when cleaning up receivers/services in Context 
Bug:18135575
Change-Id: I2c69c8189d9ebd297c8a83fe84658b26cbb0528f
 2014-11-20 12:00:52 -08:00
Ruben Brunk
f721ba0463 Camera2: Doc updates for aeExposureCompensation. 
Bug: 18467471

Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b
 2014-11-20 11:46:36 -08:00
Alan Viverette
a19f057792 am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit '8ccf071ab83510c8ef7b4d311d894d5c4a352f6c':
  Move default token handling into WindowManagerImpl
 2014-11-20 19:21:11 +00:00
Alan Viverette
8ccf071ab8 Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 2014-11-20 19:16:58 +00:00
Dianne Hackborn
42fec57f3a am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit 'd9968438bcf439e7a8c6058a95b85286a632dc1c':
  Fix issue with call backs from media process.
 2014-11-20 18:33:34 +00:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
Martijn Coenen
a603f083ff am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
* commit '2bf6529bf8f81d1b9f0ff103f12d004937d0f59f':
  Verify NFC permission immediately on API calls.
 2014-11-20 18:05:04 +00:00
Martijn Coenen
2bf6529bf8 Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 2014-11-20 17:59:24 +00:00
Chris Craik
57b641a2ed am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev 
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
  Improve logging around performance critical events
 2014-11-20 17:50:20 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Filip Gruszczynski
96c5d37fb5 Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 2014-11-20 15:51:09 +00:00
John Reck
b13de07f0b If the surface is lost, release it 
Bug: 18403246

Surface#isValid() is used throughout ViewRootImpl to
determine Surface validity. However, this will return true
until Surface#release() is called, even if the underlying
BufferQueue is abandoned. We have a very strong signal
from EGL that the Surface is now dead, so use that signal
to call Surface#release() so ViewRootImpl's isValid() usage
will be valid.

Change-Id: Ib355560ef4ca7625c3c784174863d2d55267d93d
 2014-11-20 07:38:00 -08:00
George Mount
bf50b88ed7 am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
* commit '419754545ea0768a7fa715daddedef75b7b31bfa':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 15:33:13 +00:00