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

159795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00: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
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
smain@google.com
74bafd41af 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 '6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:09:15 +00:00
Quddus Chong
5b944f4a3e am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
automerge: a1e1890

* commit 'a1e18907975436803bc13a65ec25f30b6606379e':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:08:07 +00:00
Deepanshu Gupta
9ab79551ac am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:06:59 +00:00
Deepanshu Gupta
1150292dac am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
automerge: a0bc2e7  -s ours

* commit 'a0bc2e7e3c2f075a23449df00659c96d0cddb417':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:05:07 +00:00
John Spurlock
ed06df1314 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit '1bd81e31f31a6d8dc06af79985ca820effab970c':
  Doze: Make proximity check configurable.
 2014-11-21 03:40:45 +00:00
John Spurlock
1bd81e31f3 Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 2014-11-21 03:36:40 +00:00
John Spurlock
686e4d57d8 Doze: Make proximity check configurable. 
Default to true, but make it available for overlay or setting
at runtime.

Bug: 18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
 2014-11-20 21:59:13 -05:00
Christopher Tate
b2b8dcba2c am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
  Recents backup helper
 2014-11-21 02:30:11 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Alan Viverette
fa4eba9637 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
* commit '8ae8500365e71c59cbe96f600371391ac8d245b8':
  Update scrollbars to match Material spec
 2014-11-21 02:16:17 +00:00
Alan Viverette
8ae8500365 Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 2014-11-21 02:12:10 +00:00
Alan Viverette
69b802fdb6 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
* commit '69fe1e8e5fef5ceac9aa476995623fe80424019d':
  Update overflow menu alignment to match spec
 2014-11-21 01:55:19 +00:00
Alan Viverette
69fe1e8e5f Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 2014-11-21 01:50:38 +00:00
Dianne Hackborn
c43613becf am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 
* commit '28096c49d81ddcdde51627e9d396947efdc4f508':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 01:34:36 +00:00
Dianne Hackborn
28096c49d8 Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 2014-11-21 01:31:10 +00:00
Dianne Hackborn
24b1c23c62 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION 
You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
 2014-11-20 17:17:39 -08:00
Alan Viverette
199ea8c0c7 Update overflow menu alignment to match spec 
BUG: 18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
 2014-11-20 17:09:27 -08:00
Geoffrey Borggaard
6a110c1adf am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa 
* commit '271ddfce2cfb9e193a1ac83459010c095d918617':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:45:01 +00:00
Geoffrey Borggaard
271ddfce2c Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf 
automerge: db1e7fa

* commit 'db1e7fa097972d4cc26447f46abd8d4367d44eb7':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:35:05 +00:00
Alan Viverette
9eb4ee244b am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
* commit 'e0a377f50951d51b5ddf3be6f0ce361affdffc56':
  Make DeviceDefault alert dialog themes public
 2014-11-21 00:14:22 +00:00
Erik Kline
dedd42a2bd am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 00:10:12 +00:00
Alan Viverette
e0a377f509 Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 2014-11-21 00:08:25 +00:00
Alan Viverette
7d5bcd7990 Update scrollbars to match Material spec 
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
 2014-11-20 16:07:59 -08:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
John Reck
d3e5777e79 am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev 
* commit '83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2':
  If the surface is lost, release it
 2014-11-21 00:04:18 +00:00
John Reck
83fb64e8ec Merge "If the surface is lost, release it" into lmp-mr1-dev 2014-11-21 00:00:08 +00:00
John Reck
9b5d427fe0 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
* commit '0b2dac3452a58e76be7379b85e7505c531842b57':
  Rename callDrawGLFunction
 2014-11-20 23:29:31 +00:00
John Reck
0b2dac3452 Merge "Rename callDrawGLFunction" into lmp-mr1-dev 2014-11-20 23:26:07 +00:00