Fabrice Di Meglio
a9854ce9df
am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
...
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
Fix bug #7651552 resetRtlProperties() is called way too often
2012-11-30 16:41:12 -08:00
Fabrice Di Meglio
ce463847db
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
2012-11-30 16:37:17 -08:00
Nicolas Klein
04f3b12f1f
am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:41:10 -08:00
Fabrice Di Meglio
cb5f9db47a
Fix bug #7651552 resetRtlProperties() is called way too often
...
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)
Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
2012-11-30 15:32:56 -08:00
Nicolas Klein
5ea914f21b
am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 14:54:50 -08:00
Nicolas Klein
9f6cb87522
Fix some typos and missing @param in android.os.Bundle
...
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
Daniel Sandler
9e129f37b6
am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
2012-11-30 13:17:22 -08:00
Svetoslav Ganov
ed734d98d0
am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:17:08 -08:00
Daniel Sandler
924fc3e6ce
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
2012-11-30 13:03:08 -08:00
Svetoslav Ganov
0e7adaff99
am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 12:40:37 -08:00
Svetoslav Ganov
438a3b35f7
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
2012-11-30 11:43:54 -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
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
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
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
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
Dianne Hackborn
40e9f2922c
Quiet down a lot of logging.
...
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).
Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
2012-11-27 19:12:23 -08:00
Daniel Sandler
6684a2ce1a
am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
...
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
Cleanups in Notification.java.
2012-11-27 18:41:01 -08:00
Daniel Sandler
bf0e106a7d
Merge "Cleanups in Notification.java." into jb-mr1.1-dev
2012-11-27 18:38:33 -08:00
Andreas Huber
585c07e9ac
Stop caching stream duration, it might change (increase) dynamically.
...
Change-Id: Ia829f47602e6961f24464da36a0162b8c1d7d6c8
related-to-bug: 6870049
2012-11-27 15:50:43 -08:00
Chet Haase
3b2b3aaf9f
am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev
...
* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
Fix infinite recursive loop DO NOT MERGE
2012-11-27 12:49:16 -08:00