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
Chris Craik
2435f98d91
Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
2012-11-28 18:11:23 -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
Robert Greenwalt
10659cb1be
am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
...
* commit '5a36e06ab2289073980b6147e13c8c03b94e5a80':
Secure a handful of framework broadcasts
2012-11-28 17:42:50 -08:00
Robert Greenwalt
5a36e06ab2
Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
2012-11-28 17:40:02 -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
Robert Greenwalt
47918ae3b4
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
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
2012-11-28 16:42:32 -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
Irfan Sheriff
0cec3de337
am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
...
* commit 'b4d5a9e73b51671e25b176310bd69f2d43a1167f':
WFD: Fallback to PIN mode if PBC is not supported
2012-11-28 16:30:53 -08:00
Irfan Sheriff
b4d5a9e73b
Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
2012-11-28 16:28:41 -08:00
Irfan Sheriff
6681be2787
WFD: Fallback to PIN mode if PBC is not supported
...
Bug: 7627641
Change-Id: Ibba6114f907c67f1cb60c460d5b65479f2d1b148
2012-11-28 15:54:06 -08:00
Christopher Tate
67b38c44e8
Cache resource ID lookups in aapt
...
This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK. Windows-based
use should particularly benefit from the change.
(cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793)
Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd
2012-11-28 15:32:46 -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
Chet Haase
5181275499
am 25082e33: Merge "Another optimization of glyph cache uploads"
...
* commit '25082e3326a3133607129b3e4cea983b113e9764':
Another optimization of glyph cache uploads
2012-11-28 15:02:09 -08:00
Chet Haase
25082e3326
Merge "Another optimization of glyph cache uploads"
2012-11-28 14:46:14 -08:00
Chris Craik
d15321bbf5
Use the same interrupt/resume logic for all functor calls
...
bug:7093396
The functor was able to change the renderer's blend mode without it
being restored in process mode. This single path of updating gl caches
reduces likelihood of this occurring in the future.
Change-Id: Ie367532f9c683299f02bc4f635d7cb31f96db39f
2012-11-28 14:45:04 -08:00
Scott Main
d294d429f9
am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
...
* commit 'ceafd15df99ed77c9e9ed5e93d2c1f062a095169':
docs: revisions to gps landing pages
2012-11-28 13:19:36 -08:00
Dirk Dougherty
a539807a7c
am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
...
* commit '37f00afa4fe49730a9f7d3220c509247fd12828c':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
2012-11-28 13:19:30 -08:00
Scott Main
ceafd15df9
am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
...
* commit '23cc5d99fcb97c5a369b3ddf7f90505f6bb29363':
docs: revisions to gps landing pages
2012-11-28 13:17:36 -08:00
Dirk Dougherty
37f00afa4f
am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
...
* commit 'f4d44618aa43b85c8a2a5bdd95e7454e2736452a':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
2012-11-28 13:17:28 -08:00
Scott Main
23cc5d99fc
Merge "docs: revisions to gps landing pages" into jb-mr1-dev
2012-11-28 13:15:27 -08:00
Dirk Dougherty
f4d44618aa
Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
2012-11-28 13:14:36 -08:00
Brian Colonna
ceb87a664f
am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev
...
* commit '6f6facc17812fe529f3de0b75de5f9011d73eacc':
Ignoring FUL unlock signal if user changed fixes b/7572354
2012-11-28 12:48:32 -08:00
Brian Colonna
6f6facc178
Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev
2012-11-28 12:46:24 -08:00
Zhihai Xu
2c7dac19dd
am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
...
* commit 'e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
Settings shows it is connected to A2DP, though the device is not actually connected
2012-11-28 12:21:11 -08:00
Zhihai Xu
e3f7c45241
Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
2012-11-28 12:19:42 -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
c87b053bf9
am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
...
* commit 'b29dc7e37bc110894cd6287f071f6ba0e4d800a7':
Remove overzealous mutate() sanity check in LayerDrawable
2012-11-28 11:31:40 -08:00
Adam Powell
b29dc7e37b
am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
...
* commit 'f3a39f2df40503e8e3a91937f9f5f33b43528274':
Remove overzealous mutate() sanity check in LayerDrawable
2012-11-28 11:29:51 -08:00
Zhihai Xu
ccacaf9434
am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
...
* commit 'a64334756858b9fd3bad2c263feea00233699218':
Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
2012-11-28 11:27:55 -08:00
Adam Powell
f3a39f2df4
Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
2012-11-28 11:27:21 -08:00
Zhihai Xu
a643347568
am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
...
* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
2012-11-28 11:26:08 -08:00
Scott Main
b0d2673184
docs: revisions to gps landing pages
...
Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b
2012-11-28 11:23:35 -08:00
Zhihai Xu
5c0f3e5075
Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
2012-11-28 11:22:21 -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
Robert Ly
076a6021d3
docs: fix bug 7628699
...
Change-Id: I7e8ca29910345559993cf415c2a89a21f50e4e17
2012-11-28 10:11:22 -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
Daniel Sandler
e9316c0675
am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
...
* commit '78d2febf1f3730c8ad5a6747456529cd1f34b0c7':
New timings for default & fallback notification vibration.
2012-11-28 06:30:15 -08:00
Ken Sumrall
be473c8fd1
Merge branch 'jb-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp
2012-11-28 06:30:14 -08:00
Daniel Sandler
78d2febf1f
am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
...
* commit 'c7f55f5595fb6ffdec7796e801545156aefd3655':
New timings for default & fallback notification vibration.
2012-11-28 06:28:13 -08:00