Dianne Hackborn
42e06c8d6b
am 5007dea9: am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev
...
* commit '5007dea96e357e11316f5c9a4aea1123ba9dd4c1':
Cleaner initial boot.
2012-11-29 14:32:49 -08:00
Adam Cohen
70a649ca51
am 20b9edd8: am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '20b9edd805777bf9e603d8008650c23b031dac79':
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
2012-11-29 14:32:41 -08:00
Robert Greenwalt
6bc32a73b9
am 81cf3abd: am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
...
* commit '81cf3abdd52bdf212e742c88c53b00969f7cc34f':
Secure a handful of framework broadcasts
2012-11-29 14:32:37 -08:00
Fabrice Di Meglio
b75fb5daf6
am 52c3833e: am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
...
* commit '52c3833e20d0e78fcb367c1e81cd2c83f9165a0a':
Fix bug #7621927 Radio button/TextView drawable regression in 4.2
2012-11-29 14:32:30 -08:00
Dianne Hackborn
36893b16ce
am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
...
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
Quiet down a lot of logging.
2012-11-29 14:32:25 -08:00
Dianne Hackborn
84ea428d24
am ed8c323a: am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 14:28:24 -08:00
zzy
de95a276e7
am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size
...
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
timeout support for accept() and added check for signal size
2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad
am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
...
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2
am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
...
* commit '462633695774a3cfd84b5c729266d039ec686a64':
Fix time-related ScaleGestureDetector methods
2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975
am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
...
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-29 14:26:57 -08:00
Adam Powell
1126c2a693
am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev
...
* commit '76ee9a9c171d08802b44883be54b32dc31aa680b':
Import assets from UX
2012-11-29 14:26:49 -08:00
Dianne Hackborn
5007dea96e
am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev
...
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
Cleaner initial boot.
2012-11-29 14:26:37 -08:00
Adam Cohen
20b9edd805
am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5
am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
...
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
Secure a handful of framework broadcasts
2012-11-29 14:26:20 -08:00
Fabrice Di Meglio
52c3833e20
am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
...
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
Fix bug #7621927 Radio button/TextView drawable regression in 4.2
2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723
am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
...
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
Quiet down a lot of logging.
2012-11-29 14:25:40 -08:00
Romain Guy
b8dca777ca
Merge "Use LruCache instead of GenerationCache in libhwui"
2012-11-29 13:58:57 -08:00
Michael Jurka
fff5614cae
Disable adding keyguard widgets until setup is done
...
Bug: 7504154
Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
2012-11-29 13:15:39 -08:00
Romain Guy
a4caee0115
Merge "Cleanup: remove unused property"
2012-11-29 13:15:22 -08:00
Robert Greenwalt
b8da0376f2
Secure a handful of framework broadcasts
...
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.
bug:7622253
(cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b)
Conflicts:
core/res/AndroidManifest.xml
Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
2012-11-29 13:06:23 -08:00
Romain Guy
215dcb1caa
Merge "Fire view removed event *after* a View is removed"
2012-11-29 13:05:21 -08:00
Romain Guy
1741d73441
Cleanup: remove unused property
...
Change-Id: I09b418ef8888c42a876cb9014b22231ec31ca7eb
2012-11-29 13:05:16 -08:00
Romain Guy
8e0d7bcef1
Merge "Improve profiling by using Choreographer"
2012-11-29 13:04:18 -08:00
Daniel Sandler
c08cd02649
Add constant for Daydream settings.
...
Bug: 7480927
Change-Id: I383170c6c543b5ffe81568d273389585498d369b
2012-11-29 15:24:39 -05:00
Dianne Hackborn
ed8c323a6c
am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049
Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc
Fix issue #7585876 : When changing the font settings, the movie...
...
...just keeps attempting to load and doesn't play on the TV
Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
2012-11-29 11:59:58 -08:00
Romain Guy
059e12ccd2
Use LruCache instead of GenerationCache in libhwui
...
Change-Id: Ic26ddc7151eb5462bcd243b21daf7187ed6d3bec
2012-11-29 11:44:02 -08:00
Romain Guy
d075031944
Improve profiling by using Choreographer
...
This will avoid jank and lead to better measurements.
Change-Id: Id18587a0a0b7d45adb3a65dfc427800565cc5d0b
2012-11-29 11:34:43 -08:00
Romain Guy
6fb05630cf
Fire view removed event *after* a View is removed
...
Change-Id: Ia4066002b19c438c90a57ef9c513d82564425640
2012-11-29 10:50:33 -08:00
Elliott Hughes
7905db94ad
am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."
...
* commit '878da6532836ec09f6d27e8f5af79444c79e78b6':
Fix AndroidHttpClient documentation error.
2012-11-29 10:24:14 -08:00
Elliott Hughes
878da65328
am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."
...
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
Fix AndroidHttpClient documentation error.
2012-11-29 10:21:23 -08:00
Elliott Hughes
a0e1f91b98
am 565de5f6: am 820b3e29: Merge "Make transactGetSockaddr locale safe"
...
* commit '565de5f6cb75631f6b23011fcac4fcf8be8d5c5e':
Make transactGetSockaddr locale safe
2012-11-29 09:49:40 -08:00
Elliott Hughes
9ed4abd875
Merge "Fix AndroidHttpClient documentation error."
2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb
am 820b3e29: Merge "Make transactGetSockaddr locale safe"
...
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
Make transactGetSockaddr locale safe
2012-11-29 09:14:35 -08:00
Baligh Uddin
b377e5b621
Import translations. DO NOT MERGE
...
Change-Id: I2c44f925196a13859e6e1da2571ae08252fa9f4a
Auto-generated-cl: translation import
2012-11-29 09:11:57 -08:00
Baligh Uddin
6abe146700
Import translations. DO NOT MERGE
...
Change-Id: Ie73d50cbd57de973c7a01c51eedbf807fb7526e4
Auto-generated-cl: translation import
2012-11-29 09:02:02 -08:00
Baligh Uddin
eeac626809
Import translations. DO NOT MERGE
...
Change-Id: I5ba3917c7ad5b6ec719f22aa79ce6132aea74b39
Auto-generated-cl: translation import
2012-11-29 08:59:36 -08:00
Baligh Uddin
5cf78cc48c
Import translations. DO NOT MERGE
...
Change-Id: I342da4dadf4edafa807354d324efc15af94f70a3
Auto-generated-cl: translation import
2012-11-29 08:57:01 -08:00
Elliott Hughes
820b3e29ca
Merge "Make transactGetSockaddr locale safe"
2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3
Fix AndroidHttpClient documentation error.
...
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.
Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
2012-11-29 08:32:13 -08:00
zzy
3fe63ce4a9
am 652678af: timeout support for accept() and added check for signal size
...
* commit '652678af4d18b9a6c18ce6a860de01d958bc82fe':
timeout support for accept() and added check for signal size
2012-11-29 00:30:28 -08:00
zzy
652678af4d
timeout support for accept() and added check for signal size
...
bug 7592240
Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
2012-11-28 22:12:27 -08:00
Fabrice Di Meglio
146b129075
am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
...
* commit 'cdc6d5cf88e8eb73a557052679c436e864cb1853':
Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
2012-11-28 19:50:49 -08:00
Adam Powell
4626336957
am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
...
* commit '66cedab63bf0c17e59a5815200bd9200164d89ec':
Fix time-related ScaleGestureDetector methods
2012-11-28 19:50:46 -08:00
Adam Powell
57c23a464a
am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
...
* commit '10479a29cbdc55cfd25b30cd792a151234b55fa6':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-28 19:50:43 -08:00
Adam Powell
76ee9a9c17
am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev
...
* commit '738b19033850df899c20865ba4152a6028b3bb23':
Import assets from UX
2012-11-28 19:50:35 -08:00
Fabrice Di Meglio
cdc6d5cf88
Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
2012-11-28 19:08:45 -08:00
Adam Powell
66cedab63b
Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
2012-11-28 19:06:51 -08:00
Adam Powell
10479a29cb
Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
2012-11-28 19:03:01 -08:00