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

105805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
695be87d6e am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font 
* commit '92053f8b28ce0d035d292fa73622200990682511':
  revise docs for new sensor types. fix markup error causing tons of code font
 2013-06-14 08:45:20 -07:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font 
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
 2013-06-13 16:37:51 -07:00
Scott Main
11caa0b6d9 am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'f52532de2a3da2f41ddc28e25d2883d45f189018':
  add ninepatch search tag
 2013-06-13 14:56:03 -07:00
Scott Main
f52532de2a am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
  add ninepatch search tag
 2013-06-13 14:54:48 -07:00
Scott Main
cb2a85058e am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
  add ninepatch search tag
 2013-06-13 14:51:47 -07:00
Scott Main
695896a465 am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '46c8931ffc78f5204b34f7ba5098defbc318b7a4':
  add ninepatch search tag
 2013-06-13 14:49:20 -07:00
Scott Main
46c8931ffc Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 2013-06-13 21:47:27 +00:00
The Android Open Source Project
026cba6c66 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda
 2013-06-13 08:22:44 -07:00
The Android Automerger
06420f2eca merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:24 -07:00
Narayan Kamath
7d1fd557a3 am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '372d21ad69a43e3d0a26b23f45351511ed88e9e6':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:31:51 -07:00
Narayan Kamath
372d21ad69 am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:29:11 -07:00
Narayan Kamath
6706ca96b2 Merge "Update HttpResponseCache to use the new cache API." 2013-06-13 09:26:34 +00:00
Adam Powell
b44d66fa8e Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495
 2013-06-12 23:26:35 -07:00
Dave Burke
bafc8dcf69 am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
 2013-06-12 21:11:12 -07:00
Dave Burke
34bc73dff1 Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 2013-06-13 04:08:42 +00:00
Jeff Brown
aab3453965 Fix logspam when battery sysfs file not available. 
This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
 2013-06-12 20:55:08 -07:00
kmccormick
40609ff0fd am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '4b5a6255e096b20513468cc1f55f3038c4c53327':
  Doc update: restoring deprecation messages
 2013-06-12 19:38:51 -07:00
kmccormick
4b5a6255e0 am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
  Doc update: restoring deprecation messages
 2013-06-12 19:35:56 -07:00
kmccormick
e9abc5e935 am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
  Doc update: restoring deprecation messages
 2013-06-12 19:33:50 -07:00
kmccormick
b89c6ac4e6 am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
  Doc update: restoring deprecation messages
 2013-06-12 19:31:12 -07:00
kmccormick
9af7d40728 am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages
 2013-06-12 19:28:58 -07:00
kmccormick
227615eeb7 am bf370185: Doc update: restoring deprecation messages 
* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages
 2013-06-12 19:26:57 -07:00
kmccormick
bf37018548 Doc update: restoring deprecation messages 
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
 2013-06-12 19:15:58 -07:00
Dirk Dougherty
1e00aa877b am fa42499b: am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'fa42499bd51cb07e54c90d21ce80e4d6a8c04e41':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:44:34 -07:00
Dirk Dougherty
fa42499bd5 am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '14ef5964255730a838301d3eb7ab38a2eb745ba6':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:41:25 -07:00
Dirk Dougherty
14ef596425 am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '5161fdf3039c4e31e498c259ca4bffae18d99331':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:39:11 -07:00
Dirk Dougherty
5161fdf303 am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'e5bde8e03574a17fea7c078ee00fb882eb3ec829':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:36:31 -07:00
Dirk Dougherty
e5bde8e035 am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'bd9e41ba72014c7412f69cafbeb775c281a36d3b':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:34:24 -07:00
Dirk Dougherty
bd9e41ba72 am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'fe3da794f7fb26325951338b1951bb6fdbbc0199':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:31:26 -07:00
Dirk Dougherty
fe3da794f7 Doc change: refresh gcore/gms reference from e-release. 
Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4
 2013-06-12 18:06:08 -07:00
The Android Open Source Project
e2ae01114d Reconcile with jb-mr2-release - do not merge 
Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839
 2013-06-12 18:04:15 -07:00
Dirk Dougherty
80d5653110 am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '9579353081f4857c6a9672675dca22182b588e31':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:45:53 -07:00
Dirk Dougherty
9579353081 am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:43:07 -07:00
Dirk Dougherty
2b336ce4d8 am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:40:06 -07:00
Adam Powell
fc93d0c108 Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495
 2013-06-12 17:38:25 -07:00
Dirk Dougherty
94e207b957 am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '3574bef4625402a99224a9c1051b295ed9fa0645':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:37:26 -07:00
Dirk Dougherty
3574bef462 am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:35:17 -07:00
Dirk Dougherty
47f5c4102d am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:33:37 -07:00
Jeff Brown
18c3bbfb78 am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev 
* commit 'a37c3f18e64f45d19a019ab47429413481fded9f':
  Fix logspam when battery sysfs file not available.
 2013-06-12 17:02:43 -07:00
Jeff Brown
a37c3f18e6 Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev 2013-06-12 23:59:01 +00:00
Baligh Uddin
5ac124384f Import translations. DO NOT MERGE 
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
 2013-06-12 16:24:59 -07:00
Baligh Uddin
c4a12e1596 Import translations. DO NOT MERGE 
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
 2013-06-12 16:24:51 -07:00
Wink Saville
a8489beed5 Allow carrier provisioning to turn toggle radio power. 
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.

Bug: 9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
 2013-06-12 16:24:42 -07:00
Winson Chung
27979946cb Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309) 
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
 2013-06-12 16:24:33 -07:00
Wink Saville
ac6c862196 am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev 
* commit '30af45f47fd71feee0f9e5f8e049ba0380bc7793':
  Allow carrier provisioning to turn toggle radio power.
 2013-06-12 16:16:45 -07:00
Wink Saville
30af45f47f Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev 2013-06-12 23:13:06 +00:00
Dirk Dougherty
57bb89f0b2 Doc change: Add docs for GP Purchase Status API. 
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
 2013-06-12 16:06:36 -07:00
Jeff Brown
04c699218a Fix logspam when battery sysfs file not available. 
This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
 2013-06-12 15:57:38 -07:00
Baligh Uddin
414fec2522 am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '909b6db6a327c2102bbcaa56720428319d0d4e94':
  Import translations. DO NOT MERGE
 2013-06-12 13:17:49 -07:00
Baligh Uddin
05cb82caee am 96acc0e5: Import translations. DO NOT MERGE 
* commit '96acc0e5f16ef575e306eb8217484a5f3471f917':
  Import translations. DO NOT MERGE
 2013-06-12 13:17:47 -07:00