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

99099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alon Albert
0a35dd5660 Copy EVENT_COLOR_KEY as String 
Change-Id: I84eda41d0b9c091f3d152cc3e899cb40b52ed949
 2013-02-05 11:07:56 -08:00
Robert Ly
a2cd828b74 am 9fcde2e7: am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9fcde2e7466c29b302cc15ed2d1233f93d7f0b0e':
  docs: update javadocs for gms and gcm
 2013-02-05 10:29:49 -08:00
Daniel Sandler
fc12f1e37b Merge "Log messages to debug stuck status bars." 2013-02-05 18:25:50 +00:00
Robert Ly
9fcde2e746 am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cb8156996a3bf5f75ea3dd7c289970bae32079ce':
  docs: update javadocs for gms and gcm
 2013-02-05 10:23:04 -08:00
Robert Ly
cb8156996a am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '00e9db5d927e1c725665159f6b5c15e0c33a4c1b':
  docs: update javadocs for gms and gcm
 2013-02-05 10:21:41 -08:00
Robert Ly
00e9db5d92 am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b23a35a3b9f44f3f673e9cacc3684d034414df27':
  docs: update javadocs for gms and gcm
 2013-02-05 10:20:42 -08:00
Daniel Sandler
2b99a49c2e Log messages to debug stuck status bars. 
Bug: 7686690
Change-Id: If9660767a8ce6315dcd4b0c52f377069fefeb7a1
 2013-02-05 13:18:07 -05:00
Robert Ly
b23a35a3b9 am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'ba84a04a2f98683f08cc7c73ec60341dc77d1eb9':
  docs: update javadocs for gms and gcm
 2013-02-05 10:15:57 -08:00
Robert Ly
ba84a04a2f Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 2013-02-05 18:12:56 +00:00
Victoria Lease
080df3f38f Merge "dual-mode switching single/multiuser ServiceWatcher" 2013-02-05 17:38:48 +00:00
Alon Albert
2d6ef86241 Merge "Add EVENT_COLOR's to Event Entity Iterator" 2013-02-05 17:30:50 +00:00
Robert Ly
f6f5cf484c docs: update javadocs for gms and gcm 
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
 2013-02-05 09:26:35 -08:00
Martin Kosiba
5ee743eef7 Ensure the WebView provider is created onVisibilityChanged. 
It is possible for onVisibilityChanged to be called during
WebView construciton.

BUG=7622923

Change-Id: Ie87dae537e1e6dd44d96e9e56982abbc134a31a0
 2013-02-05 15:26:39 +00:00
Romain Guy
74fbeb48d6 Merge "Fix graphics corruption in WiFi password dialogs" 2013-02-05 03:05:18 +00:00
Romain Guy
15a4620b18 Fix graphics corruption in WiFi password dialogs 
The ActionBarContextView popup window was set to use the "layout in screen"
and "inset decor" flags even though it's not a fullscreen window. This was
causing the popup window to be created by taking up all the available space.
Because the views inside the popup window are wrap_content, this would cause
part of the window to not be drawn and since the window is, correctly,
marked opaque, we would get random graphics corruption on screen (the user
would see the content of the tiles on a tiled renderer such as QCOM's.)

This change simply removes the two unnecessary flags from the popup window,
forcing it to be created and laid out at the exact size it needs. It will
be properly positioned by the window manager underneath the status bar.
An interesting side effect is that the window is now smaller than before
(since it doesn't extend underneath the status bar) which saves a bit of
memory.

The popup window also contains an unncessary black background behind the
action bar context view. This helps in a way because it allows us to
create an opaque window but it increases the required bandwidth to draw
that window. Given the benefits for SF it's probably best we keep the
window the way it is for now.

Change-Id: I4aeeb42a6232ff6b71811e766846d45635eb3365
 2013-02-04 18:49:38 -08:00
Svetoslav
69ced73b35 Merge "Updating AccessibilityNodeInfo JavaDoc" 2013-02-05 02:17:53 +00:00
Svetoslav
901309ce59 Updating AccessibilityNodeInfo JavaDoc 
Change-Id: I8f80ed127c73dd4d8bcf9fe81575bb438b3d0f57
 2013-02-04 18:16:52 -08:00
Kenny Root
791fc1669d am 2697f082: am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error" 
# Via Android Git Automerger (2) and others
* commit '2697f082010c9eb34298dbe7b5c4967d745709d2':
  AndroidKeyStore: return error code on error
 2013-02-04 17:39:13 -08:00
Kenny Root
2697f08201 am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error" 
# Via Android Git Automerger (1) and others
* commit '887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
  AndroidKeyStore: return error code on error
 2013-02-04 17:37:34 -08:00
Kenny Root
887c523646 am 74637db2: Merge "AndroidKeyStore: return error code on error" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '74637db21eb0b3c0167378e2b5c866fdc02e51f2':
  AndroidKeyStore: return error code on error
 2013-02-04 17:35:35 -08:00
Scott Main
ebbdbe6488 am d3c150e5: am e218ac96: am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (4) and Scott Main (1)
* commit 'd3c150e5efcb884ee5791b8bc07d334caeb50144':
  docs: followup update for dashboard; add platform pie
 2013-02-04 17:20:06 -08:00
Scott Main
850c32e723 am 9045b1d1: am a6404338: am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9045b1d1e34fcf591f76244294d81f3ad80c8199':
  docs: update dashboard platform data for feb
 2013-02-04 17:20:01 -08:00
Kenny Root
9e807d4d15 am 86416202: am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test" 
# Via Android Git Automerger (2) and others
* commit '864162026dace9de4d75836f2acacce277c93ada':
  AndroidKeyStore: add key wrapping test
 2013-02-04 17:19:54 -08:00
Kenny Root
46c26bd0f0 am f2f84601: am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests" 
# Via Android Git Automerger (2) and others
* commit 'f2f84601922f890c12b63ceaea54ee33c0aca83b':
  AndroidKeyStore: fix tests
 2013-02-04 17:19:50 -08:00
Adam Powell
9c684aab21 am 638af2fb: am 6a33c403: am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev 
# Via Android Git Automerger (3) and others
* commit '638af2fbb6ecb6ca0e58b06d5b2c6ecabbc7f812':
  Fix regression in expanded action view up
 2013-02-04 17:19:43 -08:00
Dirk Dougherty
35a5108f58 am 05cc5c65: am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds. 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '05cc5c65ab044e20123f1a10b2a41cc5ed1b062a':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
 2013-02-04 17:19:39 -08:00
Kenny Root
35e832730c am 3789b2fb: am ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections." 
# By Yury Zhauniarovich
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '3789b2fb823b7632e410c0191ddf77dc1e875196':
  Function uri.getAuthority is called twice. Minor doc corrections.
 2013-02-04 17:19:31 -08:00
Irfan Sheriff
77a0ce1233 am 3274e60a: am ac20bf1f: am 43a601e7: Merge "Change default intent" 
# Via Android Git Automerger (2) and others
* commit '3274e60a47c9333080fb094e4c91094e3f3cd10c':
  Change default intent
 2013-02-04 16:44:03 -08:00
Kenny Root
74637db21e Merge "AndroidKeyStore: return error code on error" 2013-02-05 00:20:47 +00:00
Scott Main
d3c150e5ef am e218ac96: am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e218ac96f4b3229879256926595b080cc5266172':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:58:51 -08:00
Scott Main
e218ac96f4 am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (2) and Scott Main (1)
* commit '1dba73f64c60d25776c937be146a7880b85a193a':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:51:44 -08:00
Kenny Root
e66769ad51 AndroidKeyStore: return error code on error 
Instead of blindly multiplying return value by 1000 to convert to
milliseconds, check to see if it's an error condition first.

Change-Id: I8eab1e7a86d78c13458fcbbc79d590e452fc9791
 2013-02-04 15:50:58 -08:00
Scott Main
1dba73f64c am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (1) and Scott Main (1)
* commit '83359e824d35a4c8a91c73efadb6d1a537c521cc':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:49:40 -08:00
Scott Main
83359e824d am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Scott Main
* commit '5439e0c2f7978a06c549f19531aee1ab2003fa35':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:47:59 -08:00
Scott Main
5439e0c2f7 docs: followup update for dashboard; add platform pie 
Change-Id: I70b8d4e0384d995761a66afc34a66bcb03e5e74e
 2013-02-04 15:42:13 -08:00
Scott Main
9045b1d1e3 am a6404338: am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'a64043382309c60c86b48ad45e752f44a5a71ca1':
  docs: update dashboard platform data for feb
 2013-02-04 15:23:50 -08:00
Scott Main
a640433823 am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'd042b849df13e700f4b73dcec28220cafcc3a595':
  docs: update dashboard platform data for feb
 2013-02-04 15:22:06 -08:00
Scott Main
d042b849df am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '641f74aefea7bd055307c22443839918438f6477':
  docs: update dashboard platform data for feb
 2013-02-04 15:19:53 -08:00
Scott Main
641f74aefe am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dde4eedfb1b488fb02b2a54fb1c64f0a9ca70cfb':
  docs: update dashboard platform data for feb
 2013-02-04 15:18:36 -08:00
Kenny Root
864162026d am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test" 
# Via Android Git Automerger (1) and others
* commit 'c4a768c87e03a5e6d8b4435aaca6893546006321':
  AndroidKeyStore: add key wrapping test
 2013-02-04 15:12:04 -08:00
Kenny Root
f2f8460192 am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests" 
# Via Android Git Automerger (1) and others
* commit '516fab2404f550aca03b3774bd5b279d4e69dd9f':
  AndroidKeyStore: fix tests
 2013-02-04 15:12:01 -08:00
Scott Main
dde4eedfb1 Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 2013-02-04 23:10:46 +00:00
Kenny Root
c4a768c87e am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '5a720bb9b031d44e593d2054bda586ccc3752aa4':
  AndroidKeyStore: add key wrapping test
 2013-02-04 15:10:26 -08:00
Kenny Root
516fab2404 am 133c5f5e: Merge "AndroidKeyStore: fix tests" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '133c5f5e91e72cff1a9a3a4903a0efc96b39165b':
  AndroidKeyStore: fix tests
 2013-02-04 15:10:22 -08:00
Kenny Root
5a720bb9b0 Merge "AndroidKeyStore: add key wrapping test" 2013-02-04 23:05:08 +00:00
Kenny Root
133c5f5e91 Merge "AndroidKeyStore: fix tests" 2013-02-04 23:01:01 +00:00
Kenny Root
656f92f2c6 AndroidKeyStore: add key wrapping test 
Change-Id: Ib21ab37d22689dd87f014eaa1f7919a575367cdd
 2013-02-04 14:53:11 -08:00
Kenny Root
8b58c52bf4 AndroidKeyStore: fix tests 
Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d
 2013-02-04 14:52:23 -08:00
Scott Main
d799ffc235 docs: update dashboard platform data for feb 
Change-Id: Ie248bf69bcdca4434e53ab31a82a55fd9da4825b
 2013-02-04 14:02:48 -08:00
Romain Guy
b377853123 Merge "Set the scissor from OpenGLRenderer::drawColorRects Bug #8131254" 2013-02-04 21:56:40 +00:00