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
738b190338
Merge "Import assets from UX" into jb-mr1.1-dev
2012-11-28 18:49:26 -08:00
Dianne Hackborn
2c41c4a276
Fix build.
...
Change-Id: Icc1f2913b4e889609066b0ff1dddcd9be0230897
2012-11-28 18:46:45 -08:00
Adam Powell
20b9cd2064
Import assets from UX
...
Fixes issues with scaling/dithering artifacts in dialog/menu panel
assets.
Bug 7589786
Change-Id: I1285f9de5f8bcd0decfa7765c1463e444a56b335
2012-11-28 18:41:10 -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
860d0cd452
Merge "Cleaner initial boot." into jb-mr1.1-dev
2012-11-28 18:19:25 -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
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
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
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
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
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
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
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
f3a39f2df4
Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
2012-11-28 11:27:21 -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
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
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
c7f55f5595
Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
2012-11-28 06:22:53 -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
bf0e106a7d
Merge "Cleanups in Notification.java." into jb-mr1.1-dev
2012-11-27 18:38:33 -08:00
Daniel Sandler
54525d8e4b
Merge "Clean up the Builder test." into jb-mr1.1-dev
2012-11-27 18:13:29 -08:00
Daniel Sandler
5bff551710
Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
2012-11-27 18:12:47 -08:00
kmccormick@google.com
1f301634d3
am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit '58d55b0456a72daaf31c4e02227e82a8707ecf73':
Doc update: new Notify User AU class
2012-11-27 16:57:51 -08:00
kmccormick@google.com
58d55b0456
am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'd60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
Doc update: new Notify User AU class
2012-11-27 16:56:03 -08:00
kmccormick@google.com
d60ea46fe7
am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'a880436f4416168d256822a23bd23f936136706d':
Doc update: new Notify User AU class
2012-11-27 16:54:01 -08:00
kmccormick@google.com
a880436f44
am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'b7863a3ce4db964322783ff7e84acc5713e04d1d':
Doc update: new Notify User AU class
2012-11-27 16:52:00 -08:00
&& repo sync -j8
b7863a3ce4
Merge "Doc update: new Notify User AU class" into jb-dev-docs
2012-11-27 16:49:37 -08:00
&& repo sync -j8
0aae00051c
Doc update: new Notify User AU class
...
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
2012-11-27 16:37:36 -08:00
Robert Ly
e3a94e9dd2
am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
...
* commit 'd29457e40379d6df0cbf8bbbe5945f0827a0d19c':
docs: add new GMS landing and reference
2012-11-27 16:35:19 -08:00
Robert Ly
d29457e403
Merge "docs: add new GMS landing and reference" into jb-mr1-dev
2012-11-27 16:32:05 -08:00
Dirk Dougherty
cf62cbca10
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
...
Change-Id: I45de360c45426ab6d2e04ef6a9e5fa920ff63c57
2012-11-27 16:29:40 -08:00