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

172476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rich Slogar
830790baf8 am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit 'b0af6987aacec95b90c655f7e9bd9576baaab3df':
  docs:Remove tools/index.jd file.
 2014-11-06 20:33:30 +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
Rich Slogar
b0af6987aa Merge "docs:Remove tools/index.jd file." into lmp-docs 2014-11-06 20:30:11 +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
81cdc2ae35 am 49f4493b: am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '49f4493bb3df52caa24a6a354cd5f8ce3bb2541f':
  Show recents button while pinned and locked
 2014-11-06 20:21:59 +00:00
Sailesh Nepal
3fdf2a84c0 Make APIs to get system phone accounts public 
This is used by Wi-Fi calling to handoff and incoming
call to a cellular call.

For example, when doing an handoff we can look through
the outgoing phone accounts and find the one that the user
has verified with their google account. We can then
handoff to that phone account.

Bug: 17686424
Change-Id: I06d42aa8f4a36d11e5293ed6f7c62b796226f5c1
 2014-11-06 12:20:56 -08: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
Jason Parks
de709869ae Fix NPE for CTS. 
The effect list can be empty and will return null
from native code. This fixes the CTS crash.

Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
 2014-11-06 14:08:52 -06:00
xinhe
9ac600c721 am eb6990ac: am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 
* commit 'eb6990ac93d03bde3842c454d02d6350bed213c1':
  RSSI indicator says that SIMless device has a SIM
 2014-11-06 19:59:31 +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
Jeremy Joslin
46e3ac8bbc Implemented requestNetwork with a PendingIntent. 
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
 2014-11-06 11:43:27 -08:00
Winson Chung
fea9a6fc62 am 0fc133e0: am 5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 
* commit '0fc133e07eb9ade5dc91eb3f93623c8839ef1e39':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-06 19:31:59 +00:00
Winson Chung
b6c2d1008d am 438eaf00: am e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 
* commit '438eaf0015c929abc535a0ac4d98c6709eeaf7d5':
  Don't reload the layout every time we enter Recents. (Bug 18160176)
 2014-11-06 19:31:50 +00:00
ztenghui
c220b48ab7 am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit '9b14422a5045d908ae8a3ba78b4c4972f652b29f':
  VD:test:Remove open animation AVD
 2014-11-06 19:31:43 +00:00
Stuart Scott
1af72bff50 am 843133cd: am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8 
* commit '843133cd835b2923453bba95599aefa48fe8cb20':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 19:30:06 +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
John Reck
be70c7713d am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c 
* commit '327cb3184d5f5d9f22db9ab18a07bb71081bb446':
  Yank ResourceCache out of Caches
 2014-11-06 19:22:28 +00:00
Stuart Scott
843133cd83 am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8 
* commit 'a6fc3b1a4bc6e6da5902335273b544b577823411':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 19:22:22 +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
RoboErik
a13846ddf3 Update metadata artwork and uri docs 
This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.

Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
 2014-11-06 10:55:06 -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
Ricardo Cervera
cc0753b077 docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit 2871e05b48f0b932885986322ce01212717a6399)
 2014-11-06 16:57:50 +00:00
Ricardo Cervera
e7cd5f2e9c Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 2014-11-06 16:57:14 +00:00
Adrian Roos
e8dce89a83 am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit '34c45bb953f3fc230207bacb1a3b4d073068ca9f':
  Round charging indication to nearest minute
 2014-11-06 16:36:04 +00:00
Adrian Roos
34c45bb953 am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit 'b2a6c7b83f894922663e7144048264af96239a1e':
  Round charging indication to nearest minute
 2014-11-06 16:31:43 +00:00
Jason Monk
17488b9944 Show recents button while pinned and locked 
When an app is show when locked and in screen pinning the 'overview'
button needs to be shown, regardless of its disabled state.

Bug: 18224921
Change-Id: I896c803347738c936873c0ce5a7480562eb9f639
 2014-11-06 11:29:16 -05:00
Selim Cinek
845515f8d4 am b8b78687: am fc22dd58: am 49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 
* commit 'b8b78687fb8122d4f457cb8692bca63b5530b1c2':
  Adapted HUN behavior when swiping vertically
 2014-11-06 16:26:24 +00:00