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

97150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
9badf238ee Merge "Close InputStream after we're done reading from it External bug #40837" 2012-12-03 11:36:49 -08:00
Adam Powell
897ccbbdd8 am e4db4e2b: am 05c8f17f: Merge "resolver list is not cleared on rebuild" 
* commit 'e4db4e2b9dca065fbbf9f10dd5b9e961a9acef46':
  resolver list is not cleared on rebuild
 2012-12-03 11:35:02 -08:00
Adam Powell
e4db4e2b9d am 05c8f17f: Merge "resolver list is not cleared on rebuild" 
* commit '05c8f17f05ca83573f7670191e6dec91497dc742':
  resolver list is not cleared on rebuild
 2012-12-03 11:32:39 -08:00
Matthew Xie
90bd55f179 am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit '3b5c43825eaf8096c01eac77e03a8aac8e9fab4a':
  Clean up debug messages
 2012-12-03 11:30:56 -08:00
Matthew Xie
3b5c43825e am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit 'b8e80eb566aa5afb744db84a0067e144de831f45':
  Clean up debug messages
 2012-12-03 11:29:21 -08:00
Matthew Xie
b8e80eb566 am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit '4fd38e8d13697cd1b169487719982f32cc5fb425':
  Clean up debug messages
 2012-12-03 11:26:38 -08:00
Guang Zhu
ca4f3473b9 am 5732aaf1: am 8732bee8: am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev 
* commit '5732aaf1bb38d0d7bc3535ee934c32a8fb8e8dd6':
  app launch test fixes and improvements
 2012-12-03 11:23:58 -08:00
Matthew Xie
4fd38e8d13 Merge "Clean up debug messages" into jb-mr1.1-dev 2012-12-03 11:23:57 -08:00
Guang Zhu
5732aaf1bb am 8732bee8: am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev 
* commit '8732bee8d1e2ffc7a163769904bd799ac2730b4e':
  app launch test fixes and improvements
 2012-12-03 11:22:29 -08:00
Guang Zhu
8732bee8d1 am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev 
* commit 'fdc0d9295fbe855b14e1730447b079191f2a4f8c':
  app launch test fixes and improvements
 2012-12-03 11:19:50 -08:00
Guang Zhu
fdc0d9295f Merge "app launch test fixes and improvements" into jb-mr1.1-dev 2012-12-03 11:17:25 -08:00
Adam Powell
05c8f17f05 Merge "resolver list is not cleared on rebuild" 2012-12-03 11:04:21 -08:00
Daniel Sandler
4d58730ff5 am f80e1711: am 99931d97: am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev 
* commit 'f80e1711ea515c6310a1c31b077cd7c0b36f72a7':
  Show alarm tile for the current user.
 2012-12-03 10:28:18 -08:00
Daniel Sandler
f80e1711ea am 99931d97: am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev 
* commit '99931d97f7da8460e5d3696069bbb2cbda6b0d2a':
  Show alarm tile for the current user.
 2012-12-03 10:26:18 -08:00
Daniel Sandler
99931d97f7 am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev 
* commit 'f87488095e49028eb3be5a8a53a372e38eba537c':
  Show alarm tile for the current user.
 2012-12-03 10:23:08 -08:00
Daniel Sandler
f87488095e Merge "Show alarm tile for the current user." into jb-mr1.1-dev 2012-12-03 10:21:15 -08:00
Romain Guy
3614394c85 Close InputStream after we're done reading from it 
External bug #40837

Change-Id: Ic7f3fefb7aabf4d006f9928b6f67d1263f039487
 2012-12-03 10:10:22 -08:00
Daniel Sandler
0f92a8083d Show alarm tile for the current user. 
We were already refreshing the tile on user switch, but we
were only pulling the information (and observing changes)
for the owner.

Bug: 7596329
Change-Id: I33959af405bc79037b5b1321631d993bea65772f
 2012-12-03 12:59:26 -05:00
Marco Nelissen
8e69fa74d8 am 219acf10: am eff8dadc: am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev 
* commit '219acf10717b5a066be48dd31a260b9e8fc1b6f7':
  Change the text color of timer in MediaController
 2012-12-03 08:25:17 -08:00
Marco Nelissen
219acf1071 am eff8dadc: am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev 
* commit 'eff8dadcbd336915874485b9ae4532421c07e768':
  Change the text color of timer in MediaController
 2012-12-03 08:23:44 -08:00
Marco Nelissen
eff8dadcbd am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev 
* commit 'f688ee5dcce1c30a0fd2092722bbbfc99ed9d445':
  Change the text color of timer in MediaController
 2012-12-03 08:22:01 -08:00
Marco Nelissen
f688ee5dcc Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev 2012-12-03 08:19:51 -08:00
Daniel Sandler
d92883c904 am e8366528: am 5046ae56: Merge "framework: fix notification icons not animating till ticker is updated" 
* commit 'e83665284a4e661636471de846a2b569754379ef':
  framework: fix notification icons not animating till ticker is updated
 2012-12-03 08:13:47 -08:00
Daniel Sandler
e83665284a am 5046ae56: Merge "framework: fix notification icons not animating till ticker is updated" 
* commit '5046ae56675b5e81bd7160f12709d609d8b4c19c':
  framework: fix notification icons not animating till ticker is updated
 2012-12-03 08:11:37 -08:00
Daniel Sandler
1a65efd63f am 8ea94173: am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 
* commit '8ea94173388bcd1bd0f21b4783f1e214276c1cba':
  Fix rounding error when drawing panel handles.
 2012-12-03 07:09:21 -08:00
Daniel Sandler
5046ae5667 Merge "framework: fix notification icons not animating till ticker is updated" 2012-12-03 07:06:29 -08:00
Daniel Sandler
8ea9417338 am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 
* commit '56f0d47ed86f9eb483db4f464971b2e17743b87d':
  Fix rounding error when drawing panel handles.
 2012-12-03 07:06:22 -08:00
Daniel Sandler
56f0d47ed8 am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 
* commit '025b43cd51580701221ad74d24276498418fce37':
  Fix rounding error when drawing panel handles.
 2012-12-03 07:04:01 -08:00
Daniel Sandler
025b43cd51 Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 2012-12-03 07:00:59 -08:00
Scott Main
11bfc99464 am fb60f1f2: am ba7d95ae: am 16cf6436: am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev 
* commit 'fb60f1f233cd914f7425d7cda7c60c2c863dbb70':
  docs: update reference links and misc revisions
 2012-12-03 00:30:50 -08:00
Scott Main
fb60f1f233 am ba7d95ae: am 16cf6436: am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev 
* commit 'ba7d95ae3bedb998d6fc0ca9cd9583252be68fd8':
  docs: update reference links and misc revisions
 2012-12-03 00:29:12 -08:00
Scott Main
ba7d95ae3b am 16cf6436: am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev 
* commit '16cf643694194176954b709e5ee4dfcb711f2a57':
  docs: update reference links and misc revisions
 2012-12-03 00:27:29 -08:00
Scott Main
16cf643694 am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev 
* commit 'fbcb624be82e184482b547b09765a03db2305039':
  docs: update reference links and misc revisions
 2012-12-03 00:25:11 -08:00
Scott Main
fbcb624be8 Merge "docs: update reference links and misc revisions" into jb-mr1-dev 2012-12-03 00:22:23 -08:00
Scott Main
fbe0a2b20f am bd3b1ca8: am 97fab2ca: am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api 
* commit 'bd3b1ca82c8c511e7a8bee2baa43808cedc73f48':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:20:58 -08:00
Scott Main
bd3b1ca82c am 97fab2ca: am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api 
* commit '97fab2ca0213696fa140c4ecc7fcb61d0d75e804':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:18:18 -08:00
Scott Main
97fab2ca02 am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api 
* commit 'b86695d699bf8058466fe56994c8232cab0a8f33':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:16:36 -08:00
Scott Main
b86695d699 am b00e37de: docs: update location/maps doc with info for maps api 
* commit 'b00e37de181dc2f816962bc9301f64dd2a773c2a':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:14:11 -08:00
Scott Main
b00e37de18 docs: update location/maps doc with info for maps api 
Change-Id: I793f47791883efe88ff0d6c8effe0787d9654a88
 2012-12-02 19:00:48 -08:00
Robert Ly
4ed59f285c am 5f1904d8: am 5820bf97: am 92e0b07f: am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev 
* commit '5f1904d8ef8aaca7677b163342c0d652ba1dfa11':
  docs: add javadocs for gcm
 2012-12-02 18:28:53 -08:00
Robert Ly
5f1904d8ef am 5820bf97: am 92e0b07f: am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev 
* commit '5820bf97d6aa0a3aaf72bf0afeedf86a23720565':
  docs: add javadocs for gcm
 2012-12-02 18:26:44 -08:00
Robert Ly
5820bf97d6 am 92e0b07f: am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev 
* commit '92e0b07fd25a43e0fd816c68ead335b8740989ed':
  docs: add javadocs for gcm
 2012-12-02 18:24:30 -08:00
Robert Ly
92e0b07fd2 am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev 
* commit 'd81751facb585e678ae0a85fc8a0d144d615e7e6':
  docs: add javadocs for gcm
 2012-12-02 18:22:24 -08:00
Robert Ly
d81751facb Merge "docs: add javadocs for gcm" into jb-mr1-dev 2012-12-02 18:20:15 -08:00
Scott Main
1903f93bb7 am 171de8be: am 44292d59: am 223ef52a: am 1a9e7a61: docs: add sdk manager launch info for eclipse 
* commit '171de8be474d3e3ffc5487a6af0ce03c9229d4ac':
  docs: add sdk manager launch info for eclipse
 2012-12-02 18:12:47 -08:00
Scott Main
171de8be47 am 44292d59: am 223ef52a: am 1a9e7a61: docs: add sdk manager launch info for eclipse 
* commit '44292d5924402f2daa57c1b26c91e33cb8a614d0':
  docs: add sdk manager launch info for eclipse
 2012-12-02 18:10:43 -08:00
Scott Main
44292d5924 am 223ef52a: am 1a9e7a61: docs: add sdk manager launch info for eclipse 
* commit '223ef52aa1df95b73e04dc5269082117e9b9f95d':
  docs: add sdk manager launch info for eclipse
 2012-12-02 18:08:32 -08:00
Scott Main
223ef52aa1 am 1a9e7a61: docs: add sdk manager launch info for eclipse 
* commit '1a9e7a61e4cab8a857e1184c6205c8866ccab367':
  docs: add sdk manager launch info for eclipse
 2012-12-02 18:06:24 -08:00
Scott Main
1a9e7a61e4 docs: add sdk manager launch info for eclipse 
Change-Id: I91f23456fd57afa3cf55cba6ed63d746fb94f2fd
 2012-12-02 18:01:07 -08:00
Robert Ly
4779ffa728 docs: add javadocs for gcm 
Change-Id: I6c4c0990f1a9eec51cc2bf0fd857607b90ac184e
 2012-12-02 17:52:29 -08:00