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

159830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Jeff Sharkey
54c11274b5 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit 'c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4':
  Lightweight checkin output for network stats.
 2014-11-21 22:05:18 +00:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59:17 +00:00
Jeff Brown
1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.
 2014-11-21 21:53:10 +00:00
Jinsuk Kim
c86f09d714 am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 
* commit '2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef':
  CEC: Enable log for non-user builds
 2014-11-21 21:48:49 +00:00
Jeff Brown
682ed6b608 Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 2014-11-21 21:48:47 +00:00
Jinsuk Kim
2dafe6664a Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 2014-11-21 21:43:23 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Jinsuk Kim
4d1189e283 CEC: Enable log for non-user builds 
This helps get better bugreports for dogfooding. Accompanying bug
will be kept track of to ensure the log is turned off before
shipping. See ag/175890 for reference.

Bug: 18471978
Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
 2014-11-22 04:25:20 +09:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Jim Miller
eab3240c78 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard
 2014-11-21 18:53:10 +00:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
 2014-11-21 18:02:26 +00:00
Adrian Roos
26750711e1 Merge "Explicitly specify user for public mode" into lmp-mr1-dev 2014-11-21 17:57:01 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Zoltan Szatmary-Ban
b3d0580f0f am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:24:39 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode 
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
 2014-11-21 13:55:09 +01:00
Paul Jensen
934b73fb50 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:47:23 +00:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +00:00
Geoffrey Borggaard
8a2ac41dcf am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e548c3a3786a252d42b3c0ae0823f4718fcb9718':
  Fix null handling in proxies.
 2014-11-21 10:25:37 +00:00
Ricardo Cervera
d9e6f658a5 am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit '462b32011a0b5309e97c4c0bf6bed976d070127f':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:21:30 +00:00
Ricardo Cervera
d4ea7b3cb6 am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit '9aede602ff1fa23d1f97ccb0adf0967eef947977':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:21:25 +00:00
Filip Gruszczynski
5ea0411f39 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:21:19 +00:00
Geoffrey Borggaard
e548c3a378 am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
 2014-11-21 10:17:39 +00:00
Andrew Solovay
5a75a660c0 am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b 
* commit 'd3e2fd99e23ca579d22508e40e4f58282ea7279e':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:16:55 +00:00
Elliott Hughes
889a259118 am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 
* commit '2d7320066fd2622241cb388201d8b584081cc19c':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:16:50 +00:00
Dirk Dougherty
1896e58904 am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a 
* commit '403433401bf5a86405d79b6e48ac972941425ed0':
  Doc change: localized content.
 2014-11-21 10:16:40 +00:00
Ricardo Cervera
462b32011a am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
automerge: 8837ce2

* commit '8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:16:35 +00:00
smain@google.com
39d6b21ee5 am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 
* commit '74bafd41afd2291a9b28c9f2ae3baabca9f1d72d':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:16:34 +00:00
Ricardo Cervera
9aede602ff am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
automerge: 161dce4

* commit '161dce465ef528568eac119235e635b217322485':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:15:17 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Andrew Solovay
d3e2fd99e2 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
automerge: b5b9c9b

* commit 'b5b9c9b589c058d9e21ca23976d7574f9c604e38':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:12:52 +00:00
Quddus Chong
ecccf10b42 am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit '5b944f4a3e9d3fcca9cd54c08bc4a95c9cd87f80':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:11:49 +00:00
Deepanshu Gupta
58238d900b am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit '9ab79551ac9cee85e019d524dae6a5a6b4004cb5':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:11:44 +00:00
Deepanshu Gupta
b4a2379876 am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours 
* commit '1150292dacc912316a73594788f85d678faef15d':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:11:39 +00:00
Elliott Hughes
2d7320066f am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. 
automerge: 4db3fc1

* commit '4db3fc1c28d3894aed92c5aae40f25e713a69894':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:11:34 +00:00