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

87948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
e5b70b73e3 am 068bdbfd: am fd5be708: Merge into jb-mr1-dev 
* commit '068bdbfdb1ae8c13ebe36eae5e9adb989aaf7eda':
 2012-09-25 13:22:54 -07:00
Jean-Baptiste Queru
335142dc5f am 61b38718: am 0de06b7e: Merge into jb-mr1-dev 
* commit '61b38718f0a42fd3edc0125296345d508b6c7d82':
 2012-09-25 13:22:50 -07:00
Jean-Baptiste Queru
f4cdb448c4 am ad1712ff: am c68accd3: Merge into jb-mr1-dev 
* commit 'ad1712ff08bfb88ef5407fbceb4fb0eec9fbb8ed':
 2012-09-25 13:22:47 -07:00
Jean-Baptiste Queru
aa10bfc29e am 9d9859da: am ca940507: Merge into jb-mr1-dev 
* commit '9d9859daffaf617fba6b940dbc1a675317032c24':
 2012-09-25 13:22:42 -07:00
Jean-Baptiste Queru
cd86a369e8 am 0154e11d: am 93fd0f7a: Merge into jb-mr1-dev 
* commit '0154e11d2c5ce4b74f74907aead5524a08dc3ca8':
 2012-09-25 13:22:38 -07:00
Jean-Baptiste Queru
8e85eb7fa9 am 4d35fd9b: am 908a4323: Merge into jb-mr1-dev 
* commit '4d35fd9b1ccf0499ecb89bc422dd70ec1e549d52':
 2012-09-25 13:22:35 -07:00
Jean-Baptiste Queru
6d5c992436 am 8c9ee36d: am 6fb2514c: Merge into jb-mr1-dev 
* commit '8c9ee36dc822d3c17b095dec196b089472a68f6d':
 2012-09-25 13:22:31 -07:00
Martijn Coenen
d36716da67 am 2b6685b8: (-s ours) am 8f862ef9: Add NfcBarcode technology API. 
* commit '2b6685b88cec2e9750cbc69ff021af6598989cf5':
  Add NfcBarcode technology API.
 2012-09-25 13:22:23 -07:00
Jean-Baptiste Queru
068bdbfdb1 am fd5be708: Merge into jb-mr1-dev 
* commit 'fd5be7087be67adc0abc73ded5a0b72b025e2a80':
  pause music playback when switching user.
 2012-09-25 12:29:11 -07:00
Jean-Baptiste Queru
61b38718f0 am 0de06b7e: Merge into jb-mr1-dev 
* commit '0de06b7e19e4c6329cc966198d249d12c2b19d40':
  TaskStackBuilder and intents without an explicit target
 2012-09-25 12:29:08 -07:00
Jean-Baptiste Queru
ad1712ff08 am c68accd3: Merge into jb-mr1-dev 
* commit 'c68accd35e9ee0a49172ef144664f0fe9187ccd7':
  Add extra error check when eglCreateContext fails Bug #7216919
 2012-09-25 12:29:04 -07:00
Jean-Baptiste Queru
9d9859daff am ca940507: Merge into jb-mr1-dev 
* commit 'ca94050705ff1886e622a09c2691a76e92c0f9d8':
  Allow multiple 'parcelable' declarations in aidl files
 2012-09-25 12:29:00 -07:00
Jean-Baptiste Queru
0154e11d2c am 93fd0f7a: Merge into jb-mr1-dev 
* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
  Camera: Improve enableShutterSound documentation.
 2012-09-25 12:28:56 -07:00
Jean-Baptiste Queru
4d35fd9b1c am 908a4323: Merge into jb-mr1-dev 
* commit '908a43234aca51af5021249c03030cec6b36417f':
  Add a property to disable libhwui's scissor optimization Bug #7158326
 2012-09-25 12:28:52 -07:00
Jean-Baptiste Queru
8c9ee36dc8 am 6fb2514c: Merge into jb-mr1-dev 
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-25 12:28:48 -07:00
Martijn Coenen
2b6685b88c am 8f862ef9: Add NfcBarcode technology API. 
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
  Add NfcBarcode technology API.
 2012-09-25 12:28:44 -07:00
Jean-Baptiste Queru
fd5be7087b Merge into jb-mr1-dev 
Change-Id: Ic10d3201218c7045e03e563996ac04239c75b52c
 2012-09-25 09:29:56 -07:00
Jean-Baptiste Queru
0de06b7e19 Merge into jb-mr1-dev 
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
 2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e Merge into jb-mr1-dev 
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
 2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
ca94050705 Merge into jb-mr1-dev 
Change-Id: I5a9970a011de789aaeb1c4c4ed58ae750071b135
 2012-09-25 09:27:45 -07:00
Jean-Baptiste Queru
93fd0f7a83 Merge into jb-mr1-dev 
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
 2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
908a43234a Merge into jb-mr1-dev 
Change-Id: I7b777c7a4818d699582419d2eb4fc1f5cc0f4f46
 2012-09-25 09:26:09 -07:00
Jean-Baptiste Queru
6fb2514cdf Merge into jb-mr1-dev 
Change-Id: I1baab28b12364213673ed7992207ad198491f286
 2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7 Add NfcBarcode technology API. 
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
 2012-09-25 09:22:16 -07:00
Chris Wren
b4bcef2430 am 76ceb290: am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev 
* commit '76ceb2900f94c41c9dbb69e4dfb9efa2cfd572a2':
  reduce notification pad on large displays.
 2012-09-25 08:17:58 -07:00
Chris Wren
76ceb2900f am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev 
* commit '7b8fbe42aabc6838c964a3a3694cba4cdd49e937':
  reduce notification pad on large displays.
 2012-09-25 08:15:23 -07:00
Chris Wren
7b8fbe42aa Merge "reduce notification pad on large displays." into jb-mr1-dev 2012-09-25 08:12:33 -07:00
Kristian Monsen
7f37a5028f am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev 
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
  Hiding a method for JB-MR1
 2012-09-25 07:32:36 -07:00
Kristian Monsen
20d2bcf899 am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev 
* commit '7ae8a60f354d7cbb56da898db5a00f3b9fa7154c':
  Hiding a method for JB-MR1
 2012-09-25 07:31:19 -07:00
Kristian Monsen
7ae8a60f35 Merge "Hiding a method for JB-MR1" into jb-mr1-dev 2012-09-25 07:29:13 -07:00
Daniel Sandler
f2efc74866 am 7f8ed064: am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 
* commit '7f8ed0647176ab8aa47b0729f8919b3ba59f4783':
  No more double-swiping to toggle panels on tablets.
 2012-09-25 07:26:24 -07:00
Daniel Sandler
7f8ed06471 am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 
* commit 'c972757de0d21c779f304ee06ce6f6ff735bd62a':
  No more double-swiping to toggle panels on tablets.
 2012-09-25 07:24:00 -07:00
Daniel Sandler
887dcdcc6d am 2e17743b: am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev 
* commit '2e17743b527db355eb5d6d9365a9b981b1daf834':
  Return carrier label to notification panel.
 2012-09-25 07:23:20 -07:00
Daniel Sandler
2e17743b52 am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev 
* commit '6b183e92a480e93a7d25180bd64b1c3e87b8e982':
  Return carrier label to notification panel.
 2012-09-25 07:20:50 -07:00
Daniel Sandler
c972757de0 Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 2012-09-25 07:20:32 -07:00
Daniel Sandler
5a8aefa6c8 No more double-swiping to toggle panels on tablets. 
This also fixes up the drag regions so that quick settings
is only assigned the right 1/3 of the display (or 100dp,
whichever is larger). It had been that more than half of the
status bar, when dragged, would pull down QS.

Bug: 7217002
Change-Id: I515b6e19deab305b99784c7287d8f04fa9b22dc7
 2012-09-25 10:20:00 -04:00
Daniel Sandler
6b183e92a4 Merge "Return carrier label to notification panel." into jb-mr1-dev 2012-09-25 07:15:20 -07:00
Baligh Uddin
1ae5a48d93 Merge "Import translations. DO NOT MERGE" 2012-09-25 07:12:29 -07:00
Ben Murdoch
06a1c6fe1c Merge "Expose resources needed by Chromium-WebView." 2012-09-25 02:31:09 -07:00
Daniel Sandler
666d47502b Return carrier label to notification panel. 
If it makes you feel any better, it was there all along...

Bug: 7027535
Change-Id: Ib1add55f1bfe1958e15fa6a2960a821ccfb9d949
 2012-09-25 01:21:06 -04:00
Romain Guy
c237882a17 am 9a9bc9bf: am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 
* commit '9a9bc9bfd8da8caecee7f0f129a9debfd69a4515':
  Fix graphics glitch and layouts in recents on 10" display
 2012-09-24 21:58:39 -07:00
Romain Guy
9a9bc9bfd8 am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 
* commit '927978a48f2577efc92bae4ea605eef718162517':
  Fix graphics glitch and layouts in recents on 10" display
 2012-09-24 21:56:53 -07:00
Romain Guy
927978a48f Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 2012-09-24 21:53:58 -07:00
Romain Guy
0c3df4308d am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 21:49:42 -07:00
Romain Guy
d38bc618bc am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'eea774a1f65c91db1caa12a32e554813f4aef434':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 21:47:52 -07:00
Romain Guy
eea774a1f6 Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 21:45:13 -07:00
Romain Guy
0709b06abc Fix graphics glitch and layouts in recents on 10" display 
Change-Id: I7fa58a84d4e899ea995aa680ee550b5ddb30b6a6
 2012-09-24 21:45:03 -07:00
Romain Guy
bf3e77d46d Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
 2012-09-24 21:42:18 -07:00
Baligh Uddin
3a070f7e8d am 61f2c43e: (-s ours) am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '61f2c43e42bf60360ef4157f5e95aed9b9498ee8':
  Import translations. DO NOT MERGE
 2012-09-24 21:31:13 -07:00
Baligh Uddin
61f2c43e42 am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7ccd703f02e2c7bedeac776178427580700e6584':
  Import translations. DO NOT MERGE
 2012-09-24 21:28:31 -07:00