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

158526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
26d8d1d5cb Merge "Fix singleUser provider grants" into lmp-mr1-dev 
automerge: 775d104

* commit '775d104db29dc8bdd8922fd7627cf646869d90c8':
  Fix singleUser provider grants
 2014-11-06 21:37:06 +00:00
Craig Mautner
39f6be1216 Merge "More fixes for keyguard animations." into lmp-mr1-dev 
automerge: 7b1b0f6

* commit '7b1b0f63bcb76585621e856ecc8c8b71450735ee':
  More fixes for keyguard animations.
 2014-11-06 21:34:25 +00:00
Amith Yamasani
775d104db2 Merge "Fix singleUser provider grants" into lmp-mr1-dev 2014-11-06 20:51:02 +00:00
Craig Mautner
7b1b0f63bc Merge "More fixes for keyguard animations." into lmp-mr1-dev 2014-11-06 20:49:36 +00:00
Vinod Krishnan
c6c5c7d6db am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'efec89f2edd09c021e4e52f9aa37b6a6ca6f31b8':
  Adding wallpaper animations
 2014-11-06 20:41:35 +00:00
Ricardo Cervera
5c3ba70634 am a2c2014d: am 126eda32: am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit 'a2c2014d399c9637c06614872c6d5c08d33a1267':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 20:41:31 +00:00
Paul Lawrence
202ab2986c am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit 'b282cc308f13a464c7e2455e5b2b67c622ffce30':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 20:41:26 +00:00
Ricardo Cervera
1e9f44f132 am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit 'f90d9c235435116fbefc8b92f73553355ccec87e':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 20:41:21 +00:00
Dirk Dougherty
ac70173db2 am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '1d270087a30a3610c56c65700f61c800a9797dc3':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 20:41:17 +00:00
Dirk Dougherty
3c7e1f4a71 am 0b315994: am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit '0b315994f079be109d5ddcfff382b5c72c85bad6':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 20:41:11 +00:00
Joe Fernandez
03d3a6e48a am 0c03031b: am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '0c03031b3e4db987df8af25360f97f4d5c3207ea':
  docs: Add more information for getting started with TV app
 2014-11-06 20:41:06 +00:00
Justin Koh
4ca342cdba am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '2d42f484494e4183c42114ce5918fc4592a33fb6':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:40:56 +00:00
Dirk Dougherty
768344f73d am 012849f4: am c6f2ec20: am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit '012849f452ee7cc72a28df3054fdbe68b5133cee':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-06 20:40:50 +00:00
Vinod Krishnan
efec89f2ed am 1d6d4272: Adding wallpaper animations 
* commit '1d6d427278d22d08ef60e5d76162b823e8ad58ed':
  Adding wallpaper animations
 2014-11-06 20:34:58 +00:00
Ricardo Cervera
a2c2014d39 am 126eda32: am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit '126eda32ebc1c61ff0a6a7a93093c71f2ac73d43':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 20:34:53 +00:00
Paul Lawrence
b282cc308f am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit '3bde026aebffdaea8ab1315977b05e53e4a75185':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 20:34:49 +00:00
Ricardo Cervera
f90d9c2354 am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '0a285d4a3483011a57ecd4201db3fd38bb1d628f':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 20:34:45 +00:00
Dirk Dougherty
1d270087a3 am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '61a76f2d7919cd6375cf4463b8bd69a608057d93':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 20:34:28 +00:00
Dirk Dougherty
0b315994f0 am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit '2acfc3b9e2aca9277e8e4763352fc2976d0c2094':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 20:34:18 +00:00
Joe Fernandez
0c03031b3e am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '93f8965768484e758c2c87b919340ee932fcfd9d':
  docs: Add more information for getting started with TV app
 2014-11-06 20:34:14 +00:00
Justin Koh
2d42f48449 am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:33:36 +00:00
Dirk Dougherty
012849f452 am c6f2ec20: am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit 'c6f2ec20a6a8ed30801debf9715aff3ddb982933':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-06 20:33:12 +00:00
John Spurlock
df2fe4306f am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 
* commit 'd69dacb06f98e85f5624737f376e89108f11cb23':
  Zen: Track next-alarm condition across reboots.
 2014-11-06 20:31:08 +00:00
John Spurlock
d69dacb06f Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 2014-11-06 20:27:07 +00:00
Jason Monk
49f4493bb3 am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '265160e03a9e3447a4874e5820108730dcd05194':
  Show recents button while pinned and locked
 2014-11-06 20:17:11 +00:00
Craig Mautner
42d04db459 More fixes for keyguard animations. 
Add a state machine for calling comeOutOfSleepIfNeededLocked() so
that it is only called after the lockscreen has started dismissing
but not before resumeTopActivityLocked(). Also keep
resumeTopActivityLocked() from being called from
comeOutOfSleepIfNeededLocked() recursively.

Have starting windows count towards notifying the keyguard that a
window has been drawn.

Do not update wallpaper animations based on their not being included
in the windows being animated if there are no windows being animated.

And always improve logging.

Fixes bug 15991916.

Change-Id: I0d21c5337f0e89d9eacc8dab2cdaa52fec43ac0b
 2014-11-06 12:13:23 -08:00
Jason Monk
265160e03a Merge "Show recents button while pinned and locked" into lmp-mr1-dev 2014-11-06 20:13:07 +00:00
xinhe
eb6990ac93 am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 
* commit '8161ed8121f88d58cb7a2bab3a7197e3d661ba49':
  RSSI indicator says that SIMless device has a SIM
 2014-11-06 19:56:06 +00:00
xinhe
8161ed8121 Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 2014-11-06 19:50:45 +00:00
Winson Chung
0fc133e07e am 5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 
* commit '5191861c8896bf4ceaca2dc210423a7f86924644':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-06 19:26:17 +00:00
Winson Chung
438eaf0015 am e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 
* commit 'e0325fe956c2a33b79added92f0e53be2246506a':
  Don't reload the layout every time we enter Recents. (Bug 18160176)
 2014-11-06 19:26:11 +00:00
ztenghui
9b14422a50 am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit '786d0a0353cdbd335b50c6b560073d8d21ec2ee8':
  VD:test:Remove open animation AVD
 2014-11-06 19:25:46 +00:00
Winson Chung
5191861c88 Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 2014-11-06 19:20:59 +00:00
Winson Chung
e0325fe956 Merge "Don't reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 2014-11-06 19:20:56 +00:00
John Spurlock
7ab8ecd053 Zen: Track next-alarm condition across reboots. 
During a reboot, wait for the initial alarm registration -
which is traditionally done in response to ACTION_BOOT_COMPLETED.

Bug: 16373455
Change-Id: I00dd737fa5c9ea15d646779c5b92e5637a69595a
 2014-11-06 14:17:37 -05:00
xinhe
8b79fb6065 RSSI indicator says that SIMless device has a SIM 
For dummy case, subId = -1/-2, we need compare the phoneId
Bug:18247106

Change-Id: I310d8b466ef83936e920d3921267241f42c2243f
 2014-11-06 10:57:04 -08:00
John Reck
327cb3184d Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev 
automerge: 9c13b8c

* commit '9c13b8cfcc6e1d8b422488596538bd8b1f38df57':
  Yank ResourceCache out of Caches
 2014-11-06 18:55:00 +00:00
ztenghui
786d0a0353 Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 2014-11-06 18:54:49 +00:00
Stuart Scott
a6fc3b1a4b Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 
automerge: c7f1ae8

* commit 'c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 18:52:29 +00:00
John Reck
9c13b8cfcc Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev 2014-11-06 18:48:17 +00:00
Stuart Scott
c7f1ae8146 Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 2014-11-06 18:25:49 +00:00
John Reck
a35778c799 Yank ResourceCache out of Caches 
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
 2014-11-06 09:45:10 -08:00
Vinod Krishnan
1d6d427278 Adding wallpaper animations 
- this has the best behavior. Sometimes the behavior is not consistent

Bug: 18058382

Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
 2014-11-06 09:43:49 -08:00
Ricardo Cervera
126eda32eb am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit 'b4a1919816f4563390f2416038a66cd36b4f06aa':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:19:00 +00:00
Paul Lawrence
3bde026aeb am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit 'afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 17:14:35 +00:00
Ricardo Cervera
b4a1919816 am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit '58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:13:58 +00:00
Ricardo Cervera
0a285d4a34 am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '9bc1b15a66647e63f15383c1f82d5ed7cca0a304':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:09:12 +00:00
Paul Lawrence
afb6b50e82 Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev 2014-11-06 17:08:27 +00:00
Ricardo Cervera
58dc8c42f2 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit 'e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:03:00 +00:00
Ricardo Cervera
9bc1b15a66 am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit 'cc0753b077abb1ad5e5e95885567261b35067ed4':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:02:56 +00:00