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

172989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
b098c2dca4 am 5304649b: am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '5304649ba89c9ebdd792e83761f8f4098c6d6465':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:19:53 +00:00
Jinsuk Kim
5304649ba8 am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:11:49 +00:00
Jinsuk Kim
2cd3ac4707 Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 2015-01-15 05:07:04 +00:00
Brian Carlstrom
5baa164aec Restore write_delete_file 
Change-Id: Id93a59ae6c82f6068c58b22e2a651ff8a3b8f530
 2015-01-14 18:19:54 -08:00
Dianne Hackborn
fce232b408 am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit '5a4b4084215b1efc5308c0c914185599b4d502bf':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:52:21 +00:00
Dianne Hackborn
5a4b408421 am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:42:35 +00:00
John Reck
cefeb34e48 am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129':
  Vsyncs are hard
 2015-01-15 01:39:50 +00:00
Alan Viverette
c83245be67 am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit '628e646eeae6147578428632d7c25326b8b7ef59':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:39:44 +00:00
Alan Viverette
da562f3d51 am cf1950aa: am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 
* commit 'cf1950aaabb50b4e851ce1c5fe6fde9f8c848473':
  Make the DatePicker dialog fit on smaller screens in landscape mode
 2015-01-15 01:39:37 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
 2015-01-15 01:39:29 +00:00
Dianne Hackborn
b96a6916f6 Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 2015-01-15 01:38:23 +00:00
John Reck
2c9f86aa21 am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit '53af1cd3930a398b2008c4be9c10e5182392ffaf':
  Vsyncs are hard
 2015-01-15 01:11:48 +00:00
Alan Viverette
628e646eea am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit 'aa229902ef73f8777768414092eaf99eeff05f87':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:11:41 +00:00
John Reck
53af1cd393 Merge "Vsyncs are hard" into lmp-mr1-dev 2015-01-15 01:08:57 +00:00
Alan Viverette
aa229902ef Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 2015-01-15 01:05:53 +00:00
Alan Viverette
a0c0ca7389 Jump ripples to end when switching to a non-hardware canvas 
Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
 2015-01-14 17:05:21 -08:00
Alan Viverette
cf1950aaab am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 
* commit '4490774bc10d575ce1da3ea98ef3e6bc1f37fed2':
  Make the DatePicker dialog fit on smaller screens in landscape mode
 2015-01-15 01:03:02 +00:00
Alan Viverette
4490774bc1 Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 2015-01-15 00:58:38 +00:00
Alan Viverette
f39d650280 Make the DatePicker dialog fit on smaller screens in landscape mode 
Bug: 18933437
Change-Id: Id40351d52a7eab81e15e1f0120a9da961ef21d0a
 2015-01-14 16:58:05 -08:00
Christopher Tate
9568307cf3 am 43a4a8c7: Fix redundant file backups 
* commit '43a4a8c777fbb8f71540ac7fbe82674489ef557b':
  Fix redundant file backups
 2015-01-15 00:49:46 +00:00
Christopher Tate
43a4a8c777 Fix redundant file backups 
We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
 2015-01-14 16:36:30 -08:00
Dianne Hackborn
0ee10f6d26 Fix issue android-app doc, bump battery stats checkin version 
Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
 2015-01-14 16:16:13 -08:00
Jinsuk Kim
61c94d1a03 CEC: Support sendStandby() for MHL device 
Changed so that the API sendStandby() transform the request to
a MHL subcommand if the call is done against a MHL device.

Also hooked up the dump() to print out information on MHL.

Bug: 18451257
Change-Id: I1927855e0e4c45a731f0fd97ba572bfc2a894557
 2015-01-15 07:12:50 +09:00
Chad Brubaker
b8794c76d6 Merge "resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2015-01-14 21:55:20 +00:00
Chad Brubaker
29f4d9f9ea resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp 
Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377
 2015-01-14 13:51:45 -08:00
Stuart Scott
e2b9d5b56c am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-14 21:40:06 +00:00
Stuart Scott
542f4ee619 am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit 'a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-14 21:33:35 +00:00
Michael Wright
31572ede1c am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '5497e99c4a749a46b8e9f8312d01639987ba81a0':
  Clean up graphics resources.
 2015-01-14 21:32:37 +00:00
Stuart Scott
a2fa3d219b Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 2015-01-14 21:28:54 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
 2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Craig Mautner
c626773562 am f387d3c8: am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev 
* commit 'f387d3c87a1730605726c48c7b2c2355b50f4935':
  Place window at top when adding by base layer
 2015-01-14 20:58:12 +00:00
Craig Mautner
f387d3c87a am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev 
* commit 'c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
  Place window at top when adding by base layer
 2015-01-14 20:52:23 +00:00
Adam Lesinski
5c61dfc25f am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit 'e488ce8668538b45c586eba21f5bca288d749686':
  AAPT: Handle all old unversioned attribute usage
 2015-01-14 20:47:47 +00:00
Craig Mautner
c8ba2e87a4 Merge "Place window at top when adding by base layer" into lmp-mr1-dev 2015-01-14 20:46:23 +00:00
Adam Lesinski
e488ce8668 am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit '94e30215f97157500d5f5ca1cec446c7114f54b0':
  AAPT: Handle all old unversioned attribute usage
 2015-01-14 20:40:42 +00:00
Chad Brubaker
3d64a8508a am aa7a646e: Merge "Generate IKeystoreService using aidl" 
* commit 'aa7a646eebb9b22d1421f8b09a09669bdb10d8b7':
  Generate IKeystoreService using aidl
 2015-01-14 20:36:31 +00:00
Chad Brubaker
aa7a646eeb Merge "Generate IKeystoreService using aidl" 2015-01-14 20:31:29 +00:00
Adam Lesinski
94e30215f9 Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 2015-01-14 20:22:30 +00:00
Craig Mautner
cfb13798db Place window at top when adding by base layer 
When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.

If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.

This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.

Fixes bug 17721767.

Change-Id: I037064de7604b670841e985479eb5857b47af1d7
 2015-01-14 12:20:35 -08:00
Stuart Scott
400a3f6df2 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not. 
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
 2015-01-14 12:12:02 -08:00
Adam Lesinski
28994d8d18 AAPT: Handle all old unversioned attribute usage 
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
 2015-01-14 12:02:15 -08:00
Christoph Studer
4d5e761a34 am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit 'a80da9d069ba3db60b9b43b4e10294a1700e9ca5':
  SysUI: Log lockscreen gestures
 2015-01-14 19:24:42 +00:00
Jorim Jaggi
87f536948c am c1691e3f: am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit 'c1691e3f8b148bc0a986fa7d4c4bfaee56c6442c':
  Only notify SIM state changes when it has actually changed
 2015-01-14 19:24:36 +00:00
Christoph Studer
f4e943e8a6 am 2d26435f: am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit '2d26435f0e8a46f3653fb6f25dbfd92d90b8d80e':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 19:24:30 +00:00
Nicolas Prevot
f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 19:24:16 +00:00
Paul Jensen
5fab6ad326 am be61ffa4: am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 
* commit 'be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
 2015-01-14 19:24:09 +00:00
John Reck
a22c9b2cd1 Vsyncs are hard 
Bug: 18866485
Change-Id: I7d304df0f20a3296956cb6887a72adba9243f117
 2015-01-14 10:40:15 -08:00
Christoph Studer
a80da9d069 am b018399a: SysUI: Log lockscreen gestures 
* commit 'b018399a3a2762e95126acbe14397eca15bad772':
  SysUI: Log lockscreen gestures
 2015-01-14 15:27:02 +00:00
Jorim Jaggi
c1691e3f8b am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit '86e1788db46cdbcc65331dd8d0b9e23241a534fe':
  Only notify SIM state changes when it has actually changed
 2015-01-14 15:16:12 +00:00