Svetoslav Ganov
5e900e3a17
Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev
2012-09-11 18:16:14 -07:00
Svetoslav Ganov
3e1476a697
Adding a scaling threshold in ScreenMagnifier
...
Change-Id: I1fdd7c93de571a61d88d7386c5c2a423a6b83fb9
2012-09-11 18:15:17 -07:00
Jean-Baptiste Queru
cdb22217cf
am d057e73e: am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
...
* commit 'd057e73e7ea9ea665686b0e61d4af7d006f8278d':
Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 18:06:20 -07:00
Jean-Baptiste Queru
d057e73e7e
am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
...
* commit 'c095eb04fa931c1d838fc4505089502ecc9eba62':
Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 18:03:43 -07:00
Jean-Baptiste Queru
c095eb04fa
am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
...
* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 17:59:14 -07:00
Jean-Baptiste Queru
70a5967e0b
am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
...
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 17:57:19 -07:00
Svetoslav Ganov
0d6e17b468
am b1ee5886: Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev
...
* commit 'b1ee58860280e2dfad63170495393a914ab34804':
Refactoring the scale and pan detection in the ScreenMagnifier.
2012-09-11 17:53:56 -07:00
Svetoslav Ganov
b1ee588602
Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev
2012-09-11 17:50:53 -07:00
Svetoslav Ganov
d420e3ac94
Refactoring the scale and pan detection in the ScreenMagnifier.
...
Change-Id: I8560f53f88ef0c9244e2b48d40119574cacb544f
2012-09-11 17:48:28 -07:00
Jean-Baptiste Queru
5c09d60567
Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
2012-09-11 17:48:09 -07:00
Fabrice Di Meglio
be06e3292b
Fix bug #7148393 Switch can crash when hierarchyviewer is connected
...
Change-Id: I1713138a60358cc76f6cf373082a94199e85c717
2012-09-11 17:42:45 -07:00
Romain Guy
0c5e2cfd1c
am 0585744a: Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev
...
* commit '0585744a2d9402f4197d2a9fdb162058f1492c32':
Discard framebuffer commands when we redraw the entire buffer
2012-09-11 17:35:15 -07:00
Romain Guy
0585744a2d
Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev
2012-09-11 17:32:05 -07:00
Romain Guy
45e4c3df6c
Discard framebuffer commands when we redraw the entire buffer
...
Change-Id: I32e3014832cbd3bdbace8c3d2206eb20a2002d64
2012-09-11 17:30:43 -07:00
Fabrice Di Meglio
a40627daee
Enforce encapsulation for MarginLayoutParams startMargin and endMargin
...
Change-Id: Ibaf5ade22612dfa52173978e4b520a6407162d13
2012-09-11 17:16:36 -07:00
Winson Chung
4bd63054bb
am 709c542b: Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev
...
* commit '709c542b6758d2e40ed15ab8aa2a2dc0e52a342d':
Fixing crash in emulator due to missing bluetooth.
2012-09-11 17:13:28 -07:00
Winson Chung
709c542b67
Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev
2012-09-11 17:10:43 -07:00
Winson Chung
6072b00b62
Fixing crash in emulator due to missing bluetooth.
...
Change-Id: I0f652198cc759fac44f0de1729fcb52f515071a3
2012-09-11 17:10:32 -07:00
Jeff Brown
f8f0eddd07
Improve reporting of wifi connection state.
...
We should only report that the wifi display is connected
after the RTSP connection has been fully established.
Change-Id: Ifc6bc5d5cebd42d551026885b31cbc74b7ece2b1
2012-09-11 17:05:11 -07:00
Geremy Condra
a913e70f81
Added event logging for config installation failures.
...
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.
Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65
2012-09-11 17:02:48 -07:00
Jim Miller
ff2aa0bc89
Initial pass at adding Music control to new keyguard.
...
- View is now added or removed based on AudioManager status
- Reduced depth of hierarchy by making KeyguardTransportControl a KeyguardWidgetFrame
- Return to the status view when we return to keyguard (onScreenTurnedOn)
Change-Id: Id7f9310ce4e7daf663471117564e5670f61b1471
2012-09-11 16:21:29 -07:00
Benoit Goby
d5e190312d
am 73e0d75c: Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev
...
* commit '73e0d75c9d3869a39635e55461349b3f5dd75604':
UsbDebuggingActivity: Strings update after review
2012-09-11 16:17:58 -07:00
Benoit Goby
73e0d75c9d
Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev
2012-09-11 16:14:47 -07:00
Amith Yamasani
ac3ef9dbe1
am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev
...
* commit '9c673b0536f0c19be289e15fe0e5fb9825769a3f':
Go back to keyguard if user is switched in lock screen
2012-09-11 16:13:38 -07:00
Amith Yamasani
9c673b0536
Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev
2012-09-11 16:12:16 -07:00
Benoit Goby
45f6aaa558
UsbDebuggingActivity: Strings update after review
...
Bug: 7056209
Change-Id: I447b021973332414e5e57a3b7066bf25dfccb628
2012-09-11 16:10:35 -07:00
Svetoslav Ganov
2b5c5b640d
am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
...
* commit '0bb4d078afeadf4996240d0ac41514c28e5f795a':
Screen magnifier should handle window rebuilds correctly.
2012-09-11 15:54:41 -07:00
Amith Yamasani
d979dd7fbc
Go back to keyguard if user is switched in lock screen
...
This is not the preferred solution, but at least it is not incorrect.
Bug: 7144478
Change-Id: Iec26723b21ff5c64546d57f9d8744a3bf2929862
2012-09-11 15:53:37 -07:00
Svetoslav Ganov
0bb4d078af
Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
2012-09-11 15:52:33 -07:00
Svetoslav Ganov
9b4125e435
Screen magnifier should handle window rebuilds correctly.
...
1. The way for computing the magnified region was simplistic and
incorrect. It was ignoring window layering resulting in broken
behavior. For example, if the IME is up, then the everything else
is magnifed and the IME not. Now the keyguard appears and covers
the IME but the magnified region does not expand while it would
since the keyguard completely covers the not magnified IME window.
bug:7138937
Change-Id: I21414635aefab700ce75d40f3e913c1472cba202
2012-09-11 15:50:58 -07:00
Geremy Condra
c023c434aa
Create intermediate directories when installing config data.
...
This prevents an issue where a user factory data resets and
hoses the default directory layout- it will now be recreated
on first update.
Change-Id: I7e3cb47a0fa3aa941a74d46fba7e15865484b66d
2012-09-11 15:46:56 -07:00
Irfan Sheriff
8a2cf2ca3d
am 85cf4a15: Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev
...
* commit '85cf4a15197391c99720c85951655ef19c3cd157':
Disable suspend optimizations during DHCP
2012-09-11 15:46:28 -07:00
Scott Main
1d9d12d5d4
am 6434d733: am 91de90da: am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
...
* commit '6434d73376f53d5e3c46015c58ca711c9118690e':
small update to the ADT installation steps based on new ADT UI
2012-09-11 15:46:11 -07:00
Irfan Sheriff
85cf4a1519
Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev
2012-09-11 15:44:06 -07:00
Scott Main
6434d73376
am 91de90da: am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
...
* commit '91de90daad1147e1472691211a74c4ad1c17a612':
small update to the ADT installation steps based on new ADT UI
2012-09-11 15:43:53 -07:00
Irfan Sheriff
ec7d1380d3
Disable suspend optimizations during DHCP
...
We were not handling disabling suspend optimization during DHCP. This can
cause problems with certain routers when screen is off (and suspend optimizations
enabled).
Bug: 7106423
Change-Id: Ib762fff2edec28d7c6990263d4b641566e971213
2012-09-11 15:42:46 -07:00
Scott Main
91de90daad
am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
...
* commit '01f9bf3fefd7e78f8356cfcb18e945f58e6eb38b':
small update to the ADT installation steps based on new ADT UI
2012-09-11 15:41:58 -07:00
Jason Sams
0353efc1ca
am 1e26a8b3: Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
...
* commit '1e26a8b35884fbe252feb0a89035410e77688cd0':
LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test
2012-09-11 15:41:18 -07:00
Jason Sams
1e26a8b358
Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
2012-09-11 15:39:18 -07:00
Scott Main
01f9bf3fef
small update to the ADT installation steps based on new ADT UI
...
Change-Id: I1c3ddfcb6188dd0bdc87a2b2e8241dfd7fcaa4dc
2012-09-11 15:24:16 -07:00
Christopher Tate
ae25805d20
am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
...
* commit '99c0cb3b9d9fe187879ed1e03a8cc850f1906cc9':
Set up default (random) Android IDs for all users
2012-09-11 15:24:01 -07:00
Christopher Tate
99c0cb3b9d
Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
2012-09-11 15:20:34 -07:00
Robert Greenwalt
f02e72d99f
am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit 'f008ab727e46926bff018ef970ea8265ccc0f45d':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:11:23 -07:00
Robert Greenwalt
f008ab727e
am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff
am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3
am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Selim Gurun
77f02ca908
am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
...
* commit '79ccb1e8a94eec580eea54db05a7ba246dbf6d92':
Deleting the defunct SearchBox interface.
2012-09-11 15:03:59 -07:00
Robert Greenwalt
2415841c37
Merge "EthernetDataTracker: indicate link up based on flags"
2012-09-11 15:02:24 -07:00
Selim Gurun
79ccb1e8a9
Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
2012-09-11 15:01:21 -07:00
Christopher Tate
4dc7a68dbe
Set up default (random) Android IDs for all users
...
Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.
Bug 7132405
Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
2012-09-11 14:51:33 -07:00