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

105821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
5be52fb5ae am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 
* commit 'a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
  Temporarily restore some support for icon==0 notifications.
 2013-06-14 13:34:55 -07:00
Daniel Sandler
a0c9b9d2a7 Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 2013-06-14 20:29:24 +00:00
Scott Main
478471b579 am 3b0205b7: am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '3b0205b7601a6fa3d7abf6dbc5a60223981103cc':
  fix transition from download to install instructions
 2013-06-14 11:07:21 -07:00
Scott Main
3b0205b760 am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
  fix transition from download to install instructions
 2013-06-14 11:02:41 -07:00
Scott Main
0b3fe0785c am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
  fix transition from download to install instructions
 2013-06-14 10:56:28 -07:00
Scott Main
a17201a816 am 7190a059: fix transition from download to install instructions 
* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
  fix transition from download to install instructions
 2013-06-14 10:53:45 -07:00
Scott Main
7190a05951 fix transition from download to install instructions 
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
 2013-06-14 10:51:29 -07:00
Scott Main
0be889dd0e am 6e594289: am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6e5942894a40ed2a199f25bf4e8a215c95d2c79b':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:25:38 -07:00
Scott Main
6e5942894a am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:16:02 -07:00
Scott Main
d2ad6dc530 am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:12:30 -07:00
Scott Main
6af13a74d3 am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:09:12 -07:00
Dirk Dougherty
b5de95d1f8 am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev 
* commit 'f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
  Doc change: diffs for API 18
 2013-06-14 09:29:50 -07:00
Dirk Dougherty
f1d2c5aeb2 Merge "Doc change: diffs for API 18" into jb-mr2-dev 2013-06-14 16:23:12 +00:00
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
Dirk Dougherty
4c43ec639b Doc change: diffs for API 18 
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
 2013-06-13 16:33:04 -07:00
Scott Main
ec025db4a7 change studio version number to use 'x' for final decimal. 
also go to install guide after download begins

Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
 2013-06-13 15:00:43 -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