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

172329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
39d672ada5 am 424518ff: am 1e9f44f1: am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '424518fff4397af27077dbc24b740cab3a05f748':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 03:55:11 +00:00
Dirk Dougherty
c7c4e34b5d am 8345fb97: am ac70173d: am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '8345fb9731bf842e1044d7c6fd4d4c19f4284ca4':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 03:55:07 +00:00
Dirk Dougherty
ff8e05fe19 am 14f77b4f: am 3c7e1f4a: am 0b315994: am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit '14f77b4ffb87f060a53859104ee83c365c0bd550':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 03:55:02 +00:00
Joe Fernandez
7dc3e9dbd7 am 36b61f6a: am 03d3a6e4: am 0c03031b: am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '36b61f6a26f5962c2d0b79d1331b057f6f598b8e':
  docs: Add more information for getting started with TV app
 2014-11-07 03:54:57 +00:00
Justin Koh
96c93f3f38 am 402a3601: (-s ours) am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '402a360111c4be079cd86b389aba64859e938f8c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 03:54:53 +00:00
Dirk Dougherty
0e16428287 am b3c71567: am 768344f7: 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 'b3c715675aefcb2a9be7204754a65db74d72e9be':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-07 03:54:45 +00:00
Ricardo Cervera
424518fff4 am 1e9f44f1: am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '1e9f44f1322d8500cc91bfaf74d41e992ba184a7':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 00:06:20 +00:00
Dirk Dougherty
8345fb9731 am ac70173d: am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit 'ac70173db22d8632466c46f338a334c7f83635ba':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 00:06:15 +00:00
Dirk Dougherty
14f77b4ffb am 3c7e1f4a: am 0b315994: am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit '3c7e1f4a71e43dcaeadeb868dfbada198eed61d4':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 00:06:09 +00:00
Joe Fernandez
36b61f6a26 am 03d3a6e4: am 0c03031b: am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '03d3a6e48a4a5048c68aa90edbb98581dd3c2f3a':
  docs: Add more information for getting started with TV app
 2014-11-07 00:06:00 +00:00
Justin Koh
402a360111 am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 00:05:54 +00:00
Dirk Dougherty
b3c715675a am 768344f7: 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 '768344f73da843f9cb2cf5dd5261412fde97c938':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-07 00:05:47 +00:00
John Spurlock
6065f7d03b am 9d3abdd7: am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 
* commit '9d3abdd74231a645107740f831b72797605584e1':
  Zen: Track next-alarm condition across reboots.
 2014-11-06 21:08:55 +00:00
Jason Monk
63c8b5bc58 am 81cdc2ae: am 49f4493b: am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '81cdc2ae35030af9166666fc4ce147ce6a57e215':
  Show recents button while pinned and locked
 2014-11-06 21:08:49 +00:00
xinhe
3ac3c7106c am 9ac600c7: am eb6990ac: am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 
* commit '9ac600c721e522083b96444c2b05af0072fd1f76':
  RSSI indicator says that SIMless device has a SIM
 2014-11-06 21:08:41 +00:00
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
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master 
Change-Id: I469905bef7361c18aab725778694567d1987c06d
 2014-11-06 13:04:49 -08: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
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
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
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
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
Jason Monk
265160e03a Merge "Show recents button while pinned and locked" into lmp-mr1-dev 2014-11-06 20:13:07 +00: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
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