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

86952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
61a82a116a am ca10e561: am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit 'ca10e561a396049adb9c8e6cb961dace20d72bb7':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:55:53 -07:00
Andy Stadler
224ed25f2c am 37c6ec36: am ab3d0fd6: Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit '37c6ec36b8dc81781b737793e14d080d93ca5017':
  Move files to make eclipse-java happy
 2012-09-18 14:55:49 -07:00
Chet Haase
88bd5cc664 am d9a3dac7: am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit 'd9a3dac7dde36a917b7cc614ff271f50ee11456c':
  Fix GL shader bugs
 2012-09-18 14:55:46 -07:00
Jamie Gennis
ca10e561a3 am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit '94998c9c4e19d5b439228646f1b283201367b7a0':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:51:58 -07:00
Andy Stadler
37c6ec36b8 am ab3d0fd6: Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit 'ab3d0fd684eabecd6b290ef3cb9799739db04ca3':
  Move files to make eclipse-java happy
 2012-09-18 14:51:54 -07:00
Chet Haase
d9a3dac7dd am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit '48618c987eed656bf3d8baa6ce25b7f5d3f4a43e':
  Fix GL shader bugs
 2012-09-18 14:51:50 -07:00
Jamie Gennis
94998c9c4e Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 2012-09-18 14:32:01 -07:00
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Chet Haase
48618c987e Merge "Fix GL shader bugs" into jb-mr1-dev 2012-09-18 14:13:57 -07:00
Chet Haase
0990ffbc4d Fix GL shader bugs 
Fixing errors in emitted shader code that caused GL errors
at runtime

Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
 2012-09-18 14:10:10 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy 
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
 2012-09-18 14:08:30 -07:00
Geremy Condra
13f9a21c87 am afc4fba7: am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'afc4fba7cc97ab90c58f19ca42c0ecdfc3b6d942':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 13:59:51 -07:00
Christopher Tate
b7688e78d5 am 0bd04ff4: am 6b58fde9: Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev 
* commit '0bd04ff4104c14d3c8d3dc71c8b85c275095f64d':
  Settings provider needs to send notifications as itself
 2012-09-18 13:59:46 -07:00
Daniel Sandler
d3d26cd0d3 am cb1ec20a: am 63bcc14c: Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 
* commit 'cb1ec20a2c27f5dd9e6e31f385990c6bec4b9a5a':
  Remove settings and rotation buttons from notification panel.
 2012-09-18 13:59:42 -07:00
Geremy Condra
afc4fba7cc am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'cdf964eab3cb9381745886f35b8c5a73ba61e28d':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 13:53:05 -07:00
Christopher Tate
0bd04ff410 am 6b58fde9: Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev 
* commit '6b58fde99a2c78e4ef66679dd62eb29848e9a9f7':
  Settings provider needs to send notifications as itself
 2012-09-18 13:48:37 -07:00
Daniel Sandler
cb1ec20a2c am 63bcc14c: Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 
* commit '63bcc14c433b754c234bb593e6fdeaf08db1b106':
  Remove settings and rotation buttons from notification panel.
 2012-09-18 13:48:30 -07:00
Geremy Condra
cdf964eab3 Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 2012-09-18 13:47:17 -07:00
Geremy Condra
cb4c581975 Fix bad isinstance check in X509TrustManagerExtensions and add test. 
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
 2012-09-18 13:43:32 -07:00
Christopher Tate
6b58fde99a Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev 2012-09-18 13:35:59 -07:00
Daniel Sandler
63bcc14c43 Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 2012-09-18 13:33:21 -07:00
Jason Sams
8767b3cedc am 1d27cd2b: am a2163607: Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev 
* commit '1d27cd2bef28337b51da38a232f8b4dc780255c6':
  Add Kernel, Method, and field IDs bug 7182873
 2012-09-18 13:31:11 -07:00
Christopher Tate
c8459dc85e Settings provider needs to send notifications as itself 
... and not as its ultimate caller, who may be a less-privileged
application.  Fixes bug 7188309

Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
 2012-09-18 13:27:36 -07:00
Jason Sams
1d27cd2bef am a2163607: Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev 
* commit 'a21636074aee3a4291ba3bb7b0eb038dfeccfbb5':
  Add Kernel, Method, and field IDs bug 7182873
 2012-09-18 13:27:29 -07:00
Jason Sams
a21636074a Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev 2012-09-18 13:24:56 -07:00
Jason Sams
08a81583c1 Add Kernel, Method, and field IDs 
bug 7182873

Change-Id: I066a359bb04027e9376dac088560f042c496b10e
 2012-09-18 12:32:10 -07:00
Irfan Sheriff
bb326e1445 am bebf9f7b: am 24ed2769: Merge "WFD fixes" into jb-mr1-dev 
* commit 'bebf9f7b7d7498bca9fe4b7e3ddd473dafb69c5d':
  WFD fixes
 2012-09-18 12:31:37 -07:00
Irfan Sheriff
bebf9f7b7d am 24ed2769: Merge "WFD fixes" into jb-mr1-dev 
* commit '24ed2769130a8f9df44e7fc22be52b6282e724c3':
  WFD fixes
 2012-09-18 12:24:20 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes 
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
 2012-09-18 12:20:37 -07:00
Geremy Condra
0409186f25 am b02e3df0: am 00bc4c0b: Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 
* commit 'b02e3df01266874ddb9d3edb6674b3fe7d50b6b7':
  Initial commit for X509TrustManagerExtensions.
 2012-09-18 12:20:09 -07:00
Mike Lockwood
15c2fa9e49 am 401c85de: am 465d7207: am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '401c85de59f3dd533f2d3ca1539367fcfe86ecd9':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 12:20:05 -07:00
Scott Main
2cef6e53fc am 2ad30328: am c95b1d88: am a59b1dac: am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit '2ad30328460abc3f63c999dccf22623b107131ae':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-18 12:20:02 -07:00
Scott Main
20fc4329be am a939e379: am 0f38c088: am 3ce6b008: am d67459ff: new Google Play badges and some updates to corresponding pages 
* commit 'a939e3798ea83898652897dd37368811549d1c9a':
  new Google Play badges and some updates to corresponding pages
 2012-09-18 12:19:58 -07:00
Scott Main
9aba23deea am 562a14fd: am bc95e937: am fe7e473d: am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit '562a14fd86f067f88a7f030087b3427f2b0e3f1b':
  small update to the ADT installation steps based on new ADT UI
 2012-09-18 12:19:55 -07:00
Katie McCormick
1174c8b413 am 0706764d: am 79d977ba: am 04afdd68: am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '0706764dbc148609e48686ea16a41a39e2158a77':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-18 12:19:51 -07:00
Scott Main
75d5088b79 am 44f7849b: am 4ca7f559: am 6c47d0a9: am ada4f081: am 61d85c43: add link to device dock lesson 
* commit '44f7849b76e360bf1ab55e248b3e5c5a2da60ee8':
  add link to device dock lesson
 2012-09-18 12:19:48 -07:00
Dirk Dougherty
f35af8437f am 17ecb688: am e7b57110: am 880051db: am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '17ecb688bd99ab0db127c696e3f07f0cd23a86cd':
  Doc change: fix typo in JB highlights.
 2012-09-18 12:19:44 -07:00
Scott Main
98e4a5a8db am 49e6045d: am 81ae8e7d: am 08ec998b: am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit '49e6045dd36f864786a7817104cc8165056838de':
  docs: update for multi apk doc for ABI support
 2012-09-18 12:19:41 -07:00
Katie McCormick
399c6a53d4 am 496dd1df: am 7e26ef6b: am 0a94b84d: am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '496dd1df270ac002a94003a22ba4247b13edcfd3':
  Doc update: Appwidgets JB additions.
 2012-09-18 12:19:37 -07:00
Scott Main
03d22e9125 am 84fa8de7: am ebeb95bf: am 21c5007e: am 8a80ac46: am 54efa69f: older not lower 
* commit '84fa8de7fbe8c68ee8af595b8dd907554b73ca90':
  older not lower
 2012-09-18 12:19:34 -07:00
Joe Fernandez
b402e7dda9 am d4966f44: am e3c672cb: am 77ae2e6f: am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'd4966f440927313632aced652e80297b8e9b2c7d':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 12:19:30 -07:00
Scott Main
0d77465d6d am 1cc39c90: am 9ecfb8d1: am db6313ce: am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '1cc39c9019fcdc05715123190e13f4da8145b373':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 12:19:27 -07:00
Katie McCormick
c0faf2e0dc am 7542207f: am f7e2e400: am f5c717a9: am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit '7542207f69d185c64e1347d3f688f9603e1b8c9b':
  Doc update: Fix typo.
 2012-09-18 12:19:23 -07:00
Scott Main
3d5f173842 am e8b6b896: am 963b2505: am 5c97d966: am 9ae01846: fix broken link for action bar pack 
* commit 'e8b6b8965b82588bf140ada3357fce391f6c7455':
  fix broken link for action bar pack
 2012-09-18 12:19:19 -07:00
Fabrice Di Meglio
1f6541693f am 876d8943: am b250e94f: Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 
* commit '876d89434adfc809cb368e262ec5cd249a2c47b7':
  Fix bug #7112174 ActionMenuView should be aware of layout direction
 2012-09-18 12:19:14 -07:00
Geremy Condra
b02e3df012 am 00bc4c0b: Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 
* commit '00bc4c0b6723bda12e846f9f1f729acb79a389a1':
  Initial commit for X509TrustManagerExtensions.
 2012-09-18 12:15:20 -07:00
Mike Lockwood
401c85de59 am 465d7207: am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '465d72073c6d47a27b51d384bd9e019faa7957c1':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 12:14:55 -07:00
Scott Main
2ad3032846 am c95b1d88: am a59b1dac: am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit 'c95b1d88477f5cd3abd6481e73a4185417e4a0bd':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-18 12:14:49 -07:00
Scott Main
a939e3798e am 0f38c088: am 3ce6b008: am d67459ff: new Google Play badges and some updates to corresponding pages 
* commit '0f38c0887cf92e1dd57e8149b2ca5ef8f586e947':
  new Google Play badges and some updates to corresponding pages
 2012-09-18 12:14:46 -07:00