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

174743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoffrey Borggaard
9a5974734f am e400f811: am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e400f811f28fbf8b6055b9efc8afbee11ba08f67':
  Fix null handling in proxies.
 2014-11-21 12:20:00 +00:00
Ricardo Cervera
dc12af4ec6 am 0b3963e3: am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit '0b3963e358a4f664aa215292551371cfb07c1d6f':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 12:19:55 +00:00
Ricardo Cervera
537c91efcc am bc250401: am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'bc250401fe0baacb8880ba7d85364de3e6df11b9':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 12:19:50 +00:00
Filip Gruszczynski
b898936a00 am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5a429758e9df7b49c616105b510eff42bf7bde69':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 12:19:45 +00:00
Andrew Solovay
eeb06d941f am a1c2b6a9: am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b automerge: 5a75a66 
* commit 'a1c2b6a9e9dc9e41a7a7dce609ab77ba45ada36e':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 12:19:40 +00:00
Elliott Hughes
021b03c91b am 7e28e78b: am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 automerge: 889a259 
* commit '7e28e78b651769d64543e7e83d3f46a07d807ae7':
  Fix and be more explicit about plurals best practices.
 2014-11-21 12:19:36 +00:00
Dirk Dougherty
36dfe4cb15 am 448d1ffc: am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a automerge: 1896e58 
* commit '448d1ffcadab7cee678100137aad9435a2088695':
  Doc change: localized content.
 2014-11-21 12:19:31 +00:00
smain@google.com
845e81e220 am 2dc4cfa0: 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 automerge: 39d6b21 
* commit '2dc4cfa09617cfa660728b3c972f840853a80583':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 12:19:23 +00:00
Quddus Chong
5bd45a6671 am 5b51858d: am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit '5b51858dc29f7892c17c82ef1c2fecf767c89f41':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 12:19:19 +00:00
Deepanshu Gupta
7cfcfba9d3 am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit 'fbff0191f60722894291529af28f14af7bb967e4':
  Fix setTextAppearance for styles with dots.
 2014-11-21 12:19:14 +00:00
Deepanshu Gupta
3dd0d906ae am 7676f576: am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours 
* commit '7676f57608d1a3327799853511cf97d1ab437cbc':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 12:19:09 +00:00
John Spurlock
46803a438c am dc3e7d28: am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit 'dc3e7d282c7be63388190fcf0c168735ceb9cafe':
  Doze: Make proximity check configurable.
 2014-11-21 12:18:54 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Alan Viverette
d679cf04de am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9 
* commit 'ac280c48d05c4d23f0d2b0e2622376b374198fef':
  Update scrollbars to match Material spec
 2014-11-21 12:18:26 +00:00
Alan Viverette
ced4c827af am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f 
* commit 'a35d07a4f0bb743e03fc5422b45851e639c2f0a8':
  Update overflow menu alignment to match spec
 2014-11-21 12:18:21 +00:00
Dianne Hackborn
caff64dfe7 am 676b1d88: am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b 
* commit '676b1d886c95a2481dc377a9c2a6e045f08326e0':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 12:18:15 +00:00
Geoffrey Borggaard
609a71cfa7 am 235fcdce: am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa automerge: 6a110c1 
* commit '235fcdceb439fe676f6876c6c74626718363c540':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 12:18:05 +00:00
Alan Viverette
2c44d8ab1f am ea28d459: am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev automerge: 9eb4ee24 
* commit 'ea28d4594d24c118def2f16ee98b771d5e704f69':
  Make DeviceDefault alert dialog themes public
 2014-11-21 12:18:00 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
John Reck
565e9be4ac am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev automerge: d3e5777 
* commit '51efa8ef3f3faeec5772fccf46f629f2e44853c2':
  If the surface is lost, release it
 2014-11-21 12:17:33 +00:00
Narayan Kamath
57616d3e55 resolved conflicts for merge of 18e3727f to master 
Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066
 2014-11-21 11:57:07 +00:00
Geoffrey Borggaard
e400f811f2 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
 2014-11-21 10:31:03 +00:00
Ricardo Cervera
0b3963e358 am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit 'd9e6f658a5bf3e5356a433f275bf2a60921b5a6c':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:43 +00:00
Ricardo Cervera
bc250401fe am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'd4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:37 +00:00
Filip Gruszczynski
5a429758e9 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:26:31 +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
Andrew Solovay
a1c2b6a9e9 am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b 
automerge: 5a75a66

* commit '5a75a660c0db30fcf0ab748d9907ec2374603232':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:23:22 +00:00
Elliott Hughes
7e28e78b65 am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 
automerge: 889a259

* commit '889a259118754af51699e06208feb668af3e6220':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:22:21 +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
Dirk Dougherty
448d1ffcad am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a 
automerge: 1896e58

* commit '1896e5890489842aad280402d6144d272bce6730':
  Doc change: localized content.
 2014-11-21 10:21:02 +00:00
smain@google.com
2dc4cfa096 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 
automerge: 39d6b21

* commit '39d6b21ee5021d3efd1bb4e8f2041d9d8251c298':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:19:49 +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
Quddus Chong
5b51858dc2 am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit 'ecccf10b42e0964bd5ee77f1f3fe3094b53d788c':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:17:06 +00:00
Deepanshu Gupta
fbff0191f6 am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit '58238d900b43f6b780890b7ea93c11a877936ed7':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:17:00 +00:00
Deepanshu Gupta
7676f57608 am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours 
* commit 'b4a237987602b4243e20eb2d6858685cb54cf0a9':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:16:55 +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
Dirk Dougherty
403433401b am ef629f1f: am a79acc03: Doc change: localized content. 
automerge: 4d82f8a

* commit '4d82f8ad32f9caa3aff237600c4693f8907009e9':
  Doc change: localized content.
 2014-11-21 10:10:32 +00:00