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

38405 Commits

Author SHA1 Message Date
Baligh Uddin
2c2b232b41 am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2138e5c0f6b78e0e248945da498bd716c928505f':
  Import translations. DO NOT MERGE
 2012-11-29 21:06:04 -08:00
Baligh Uddin
4668391b27 am 497a40e0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '497a40e0b274ecdbc7dd8e771ded57be9f0b6727':
  Import translations. DO NOT MERGE
 2012-11-29 21:04:54 -08:00
Baligh Uddin
497a40e0b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-29 21:02:10 -08:00
Matthew Xie
d77982ef29 Clean up debug messages 
bug 7626174

Change-Id: I65cdcaf2c48a78468b6cef0b8591289435068b24
 2012-11-29 20:26:19 -08:00
Eric Laurent
05274f348e AudioService: improve initial safe volume delay 
AudioService relies on a valid mmc in order to enforce the headset
volume limitation or not. There is a timeout to enforce the limitation
if no mcc is configured after boot.
Until this timeout is reached or a valid SIM is detected the headset
volume is not limited.

This change makes that the last known volume limitation state (enforced or
not) is persisted so that next time we boot, last known state is applied until
a new mcc is configured if any. In most cases, the mcc does not change from one
boot to the next and we do the right thing. If teh mcc does change, the correct
policy will be enforced when the mcc is detected or after the timeout.

Also fix a bug where the volume panel was not displayed if the limitation mechanism
is triggered at the first press on VOL+ key.

Bug 7455275.

Change-Id: Id0f2996d893d38c6a14f4f9e4a0e9e3be17ef127
 2012-11-29 17:46:05 -08:00
Michael Jurka
223172045f am 4ed32c24: am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit '4ed32c248a70fb3ab4d36def8f73e5b88b7fc3d5':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:58:14 -08:00
Michael Jurka
4ed32c248a am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'd2de8033a304e951426e66e1f2c800402271c5e3':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:56:34 -08:00
Michael Jurka
d2de8033a3 am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'a8d63ec9f328e56d9ccad385f137a30fa104c1a7':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:54:47 -08:00
Glenn Kasten
3d301cb2b1 Replace run-time modes by compile-time constants 
Simplify the code to use the constant values of MODE_STATIC and
MODE_STREAM from AudioTrack.java.

There is already a comment in AudioTrack.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

Change-Id: I6cb10ac511df4845610454d1659e64d9195d67cd
 2012-11-29 14:34:59 -08:00
Dianne Hackborn
5c1eb690bb am 84ea428d: am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit '84ea428d24dedc4b9a44bf6b2c9419b3545a03b8':
  Fix issue #7585876: When changing the font settings, the movie...
 2012-11-29 14:33:44 -08:00
zzy
0a3b9017ed am de95a276: am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit 'de95a276e7caf3b9918c21a4f43f91c7c25b3a6b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:33:14 -08:00
Fabrice Di Meglio
0feedf9982 am cd91470a: 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 'cd91470aad09ee7b501ed1d585b9a23f66a718b6':
  Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:33:10 -08:00
Adam Powell
b34aedcf68 am 8912a72c: am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '8912a72cb2e97f595d3026da973ae99db1bb64b9':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:33:06 -08:00
Adam Powell
03919d4084 am 2a1f11e9: am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '2a1f11e9750951d072d04155cfe3b7b7f7b96bb7':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:33:00 -08:00
Adam Powell
04173385b6 am 1126c2a6: am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '1126c2a693421fe178d52e0543f32d585848e506':
  Import assets from UX
 2012-11-29 14:32:56 -08:00
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