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

172452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
7b2616a9d3 am fea9a6fc: am 0fc133e0: am 5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 
* commit 'fea9a6fc627e9efc7b07ab28b70b914a98df28b2':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-06 21:08:21 +00:00
Winson Chung
6edd65a43d am b6c2d100: am 438eaf00: am e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 
* commit 'b6c2d1008dcfe8efc377166118a8809938a59ee5':
  Don't reload the layout every time we enter Recents. (Bug 18160176)
 2014-11-06 21:08:16 +00:00
ztenghui
b9af7dfac8 am c220b48a: am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit 'c220b48ab7f27f460155028716bc3af907f8b180':
  VD:test:Remove open animation AVD
 2014-11-06 21:08:12 +00:00
Sailesh Nepal
7d901cb6f5 Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev 2014-11-06 21:06:36 +00:00
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master 
Change-Id: I469905bef7361c18aab725778694567d1987c06d
 2014-11-06 13:04:49 -08:00
Jeremy Joslin
1a2b99ea26 Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev 2014-11-06 20:51:24 +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
Jeff Hao
2a83226c75 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 2014-11-06 20:45:01 +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
Rich Slogar
d47ab00cc4 am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '830790baf8c35942832c5e7fb2467be6112048f4':
  docs:Remove tools/index.jd file.
 2014-11-06 20:39:18 +00:00
John Spurlock
9d3abdd742 am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 
* commit 'df2fe4306f18da28ace2882fee669e113744a566':
  Zen: Track next-alarm condition across reboots.
 2014-11-06 20:36:02 +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
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