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

26632 Commits

Author SHA1 Message Date
Eric Laurent
b46857d228 am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 
* commit 'b1f45c4a587e5adda39774a867c78b56682c5f0d':
  AudioService: improve initial safe volume delay
 2012-11-30 09:31:03 -08:00
Eric Laurent
b1f45c4a58 am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 
* commit 'c3eb57b22f930f07448e877f0814eb5659bfc3c5':
  AudioService: improve initial safe volume delay
 2012-11-30 09:28:56 -08:00
Eric Laurent
c3eb57b22f Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 2012-11-30 09:26:30 -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
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
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
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
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
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
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
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
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
Adam Powell
7232b0ad67 Fix time-related ScaleGestureDetector methods 
Bug 7626515

Change-Id: Ie7abf9c166284a74b4e7bcf9de25520cf08e3b2d
 2012-11-28 18:29:22 -08:00
Dianne Hackborn
bac91ebdd0 am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit '860d0cd452529e7a01152582e6535c2129a46af7':
  Cleaner initial boot.
 2012-11-28 18:21:47 -08:00
Dianne Hackborn
860d0cd452 Merge "Cleaner initial boot." into jb-mr1.1-dev 2012-11-28 18:19:25 -08:00
Adam Cohen
224daede9e am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '035352b4d62e259c86576dd3d1495b21bed172ff':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:32 -08:00
Dianne Hackborn
13579ed330 Cleaner initial boot. 
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.

Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
 2012-11-28 18:09:01 -08:00
Adam Cohen
035352b4d6 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:22 -08:00
Fabrice Di Meglio
13705eda8c Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode 
- fix onMeasure() in RTL mode: need to compute width before computing layout params
that are used for layout
- fix getRelatedView() so that it uses the resolved rules
- add some extra "final" statements

Change-Id: I7c3bf841cd18c5f77b010a9be20fa78069e88d94
 2012-11-28 17:13:54 -08:00
Adam Cohen
d9e5af3851 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
 2012-11-28 16:36:56 -08:00
Fabrice Di Meglio
075817450c am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '71175f727bc1e094e72a410aca62392badffbf11':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-28 15:08:12 -08:00
Dianne Hackborn
afdd978ccd am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '68e0da7e397f6808a90509615c08c62bb00af6ba':
  Quiet down a lot of logging.
 2012-11-28 15:06:36 -08:00
Fabrice Di Meglio
71175f727b Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 2012-11-28 15:05:55 -08:00
Dianne Hackborn
68e0da7e39 Merge "Quiet down a lot of logging." into jb-mr1.1-dev 2012-11-28 15:03:39 -08:00
Fabrice Di Meglio
b878ddb56e Fix bug #7621927 Radio button/TextView drawable regression in 4.2 
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw

Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
 2012-11-28 11:59:27 -08:00
Adam Powell
1cf2ca8358 Clean up behavior of type arguments for MediaRouter#getSelectedRoute 
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.

Behavior of getSelectedRoute is now:

* If the selected route matches at least one type with the requested
  type flags, it is still considered selected for that request.

* If the caller specifically requested the selected user route and the
  currently selected route is not a user route, return null.

* If the requested type flags do not match any types with the selected
  route, return the default system route.

Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.

Bug 7588042

Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
 2012-11-28 11:22:01 -08:00
Scott Main
33a8b28f04 am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '1cc041f7d7e76b77375ec03a1c626cb3a7952fc7':
  docs: update dreamservice description
 2012-11-28 11:02:41 -08:00
Scott Main
1cc041f7d7 am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '7538ff0920a8cbdfe68885221d1275633eafc613':
  docs: update dreamservice description
 2012-11-28 10:43:22 -08:00
Scott Main
7538ff0920 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
  docs: update dreamservice description
 2012-11-28 10:40:18 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
8fac23f23d am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit '8be8ee4c4a2f6386680bc8c6aeb88c597d5f4dcd':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:44:44 -08:00
Andreas Huber
8be8ee4c4a am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit 'f0afad008bf78576ff364bcd8bc93b7aa8090b34':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:43:29 -08:00
Andreas Huber
f0afad008b Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 2012-11-28 09:39:27 -08:00