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

162758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update 
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
 2015-01-15 16:20:44 -08:00
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Eric Laurent
4772f8b841 am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '16cfa8ddfd6c18577f5d38e545597a63889d9779':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:16:28 +00:00
Eric Laurent
16cfa8ddfd Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 2015-01-15 22:10:53 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Eino-Ville Talvala
1334a6f342 am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
  Camera: Clarify JNI exception message
 2015-01-15 20:06:34 +00:00
Eino-Ville Talvala
8d47bc97e6 Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 2015-01-15 20:00:02 +00:00
Luan Nguyen
b47cf562bb am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'e184b2f2355e572fa67e748e625e4eea0ac29201':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:42:21 +00:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:36:35 +00:00
Luan Nguyen
d5a114cd0e am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:30:08 +00:00
Winson Chung
5675f01868 DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531) 
We can use our normal visibility check to dismiss Recents when the screen is off,
since the system broadcast can occur after the activity is stopped.  We should use
the same mechanism we use to test visibility when launching Recents and just see
if it is the top most activity.

Change-Id: Ib9c01e78fd9221c4fb0ffcc80a01a0c58fb96836
 2015-01-15 11:27:43 -08:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Kenny Guy
212037f7cd Sync file before using JournaledFile commit. 
Ext4 doesn't guarantee that write file.new / close file.new
rename file.new to file will mean data in file.new makes it
to file atomically. The rename may happen with previous contents
of file.new and then later update to new contents
See docs for noauto_da_alloc
So rebooting the device during JournaledFile.commit may
mean we are left with an empty file.

Bug: 18590558
Change-Id: I35322c82871bed30c2c6ebbd1388338f0471f3ba
 2015-01-15 18:48:01 +00:00
Eric Laurent
f076db4070 AudioManager: make AudioPortEventHandler static 
Make AudioPortEventHandler and audio port and patch caches
static members of AudioManager. There is only one callback
per process in AudioSystem for audio port updates
and having those non static would not work when more than
one AudioManager instance exists in one app.

Bug: 18727023.
Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872
 2015-01-15 10:13:52 -08:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations. 
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
 2015-01-15 09:24:09 -08:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:35:05 +00:00
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +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
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
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
Robert Greenwalt
2ffe412b0e Rerun entitlementcheck on sim change. 
Only run if entitlement is needed and tethering is running.

bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
 2015-01-14 16:55:38 -08:00
Chris Craik
3b47713b26 Update generationId on bitmaps when decoded into by BitmapRegionDecoder 
bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
 2015-01-14 16:55:34 -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
Roozbeh Pournader
7c0e7db67e Fudge getRightPaddingOffset in TextView to match clipRect. 
A previous change (df68999dc7de3893ca80e4c736704dcc9ed94e35) adjusted
the clipRect slightly on the right side, but didn't adjust the
padding offset used in fading.

Bug: 18820846
Change-Id: I68c0918f914742d1e7b91f9ea8d5acbd41938233
 2015-01-14 16:19:48 -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
Scott Rowe
c222198a2c docs: removing code captions 
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
 2015-01-14 14:27:30 -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
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
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