Dianne Hackborn
f41d25a2f5
resolved conflicts for merge of 8bb779bd to master
...
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
2012-09-12 10:55:03 -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
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
Dianne Hackborn
9d9ece3c1e
Animations for user switching.
...
The window manager now has a facility to provide a full-screen
animation, which the activity manager uses every time a user
switch happens.
The current animation is just a simple dumb slide until we get
a design from UX.
Also some cleanup: moved the portrait task animations to the
default config so we always have an animation for them, and finally
got the java symbol stuff out of public.xml.
Change-Id: I726f77422b2ef5f2d98f961f8da003e045f0ebe8
2012-09-10 19:58:21 -07:00
Svetoslav Ganov
5a4e19b576
am 75ff7c33: am ce3ef0ab: Merge "Screen magnification should disengage on screen off." into jb-mr1-dev
...
* commit '75ff7c33408483b8ee8e87e0f5bbe56220325bf5':
Screen magnification should disengage on screen off.
2012-09-10 18:25:52 -07:00
Svetoslav Ganov
ce3ef0abaa
Merge "Screen magnification should disengage on screen off." into jb-mr1-dev
2012-09-10 18:21:13 -07:00
Svetoslav Ganov
36e614c110
Screen magnification should disengage on screen off.
...
1. When the screen goes off the user will be in a completely
different context upon turning the screen on. Therefore,
if magnification auto update is enabled magnification
will be disengaged on screen off.
bug:7139088
Change-Id: I790cfa5b3cf31d34e95fc9548e6246a84096c37b
2012-09-10 18:16:05 -07:00
Svetoslav Ganov
a1b5b22b9b
am 7ddeda01: am 3c396fcc: Merge "Reducing the click delay while screen magnification is enabled." into jb-mr1-dev
...
* commit '7ddeda0150f347f06cce0eaa6212ba496d88b52f':
Reducing the click delay while screen magnification is enabled.
2012-09-10 17:45:53 -07:00
Svetoslav Ganov
3c396fccd5
Merge "Reducing the click delay while screen magnification is enabled." into jb-mr1-dev
2012-09-10 17:41:28 -07:00
Svetoslav Ganov
86fe9e14f1
Reducing the click delay while screen magnification is enabled.
...
1. If screen magnification is enabled the user has to triple tap
and lift or triple tap and hold to engage magnification. Hence,
we delay the touch events until we are sure that it is no longer
possible for the user to perform a multi-tap to engage
magnification. While such a delay is unavoidable it feels a
bit longer than it should be. This change reduces the delay
between taps to be considered a multi-tap, essentially making
the click delay shorter.
bug:7139918
Change-Id: I2100945171fff99600766193f0effdaef1f1db8f
2012-09-10 17:35:35 -07:00
Christopher Tate
aba94657fa
am ee370ae1: am 4e2eb658: Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev
...
* commit 'ee370ae1f6ddaba7e7aa8a61a5566d1b4e894ced':
Update airplane-mode manipulation for the new Settings namespace
2012-09-10 17:25:19 -07:00
Jeff Brown
4dda6e872c
am db70fe83: am 53d13ecd: Merge "Fix adb am display-size." into jb-mr1-dev
...
* commit 'db70fe8331072bc536200ca37b4b40c2fbc3d196':
Fix adb am display-size.
2012-09-10 17:25:11 -07:00
Jeff Brown
fd3d44d191
am 3c2b8c74: am 3c5dab46: Merge "Make input system aware of multiple displays." into jb-mr1-dev
...
* commit '3c2b8c74ee664e2faad981f934a60fd779c7996c':
Make input system aware of multiple displays.
2012-09-10 17:25:08 -07:00
Kenny Root
b973bfba92
am 4ff58510: am 2e7d0cb5: Merge "Move native libraries to /data/app-lib" into jb-mr1-dev
...
* commit '4ff58510c039a037c72f7084fd1fc25bf038ed1f':
Move native libraries to /data/app-lib
2012-09-10 17:25:05 -07:00
Svetoslav Ganov
bf471c9149
am 58d58fd0: am 66253895: Scaling in viewport moving state locks into a magnified state.
...
* commit '58d58fd098a5de56c77b4821ab7736b5d9f6220c':
Scaling in viewport moving state locks into a magnified state.
2012-09-10 17:17:01 -07:00
Svetoslav Ganov
4515755910
am fd7b8744: am e35c54eb: Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev
...
* commit 'fd7b8744352d4c8f9cf2236f3ee0786d8685c930':
Allow simultaneous scale and pan in magnified state.
2012-09-10 17:16:37 -07:00
Dianne Hackborn
3dd94ced96
am 206aa76c: am 4573e29f: Merge "Flesh out multi-user in am commands." into jb-mr1-dev
...
* commit '206aa76cdce6bc9697833f4657e7fc5de4d8f065':
Flesh out multi-user in am commands.
2012-09-10 17:16:20 -07:00
Christopher Tate
4e2eb6581f
Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev
2012-09-10 17:16:17 -07:00
Andreas Huber
22bc786c71
am a639d58c: am dcc036c5: Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev
...
* commit 'a639d58c0d376d8c567cf387b9306d0cecff29ef':
Fix port logic in WifiDisplayController.
2012-09-10 17:15:07 -07:00
Svetoslav Ganov
82b73148f1
am a4220030: am 7e8f6c4c: Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev
...
* commit 'a422003007807f006f71c4ddbc09d06253d2a654':
Improve scaling vs pan in screen magnifier.
2012-09-10 17:14:32 -07:00
Amith Yamasani
757d55fd60
am 9b4d0517: am 3c1a2011: Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev
...
* commit '9b4d051784a67cf5d16bc773d0a32166d568677e':
Fix DevicePolicyManager crash when settings password quality (and possibly others).
2012-09-10 17:14:25 -07:00
Dianne Hackborn
8ff4baf8e4
am aaf7fdbf: am 01a7c79d: Merge "Various fixes." into jb-mr1-dev
...
* commit 'aaf7fdbf89da3064a0ef95263a71b0a754b7e136':
Various fixes.
2012-09-10 17:12:48 -07:00
Kenny Root
38a7e6798d
am 7a514989: am 69d6b534: Merge "Update PackageSetting flags when updating" into jb-mr1-dev
...
* commit '7a514989054c232c641eb6b1a6f786688f404f1d':
Update PackageSetting flags when updating
2012-09-10 17:12:10 -07:00
Jeff Brown
a804691c40
am 092d330d: am fdb5bd26: Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev
...
* commit '092d330d025ebf4250024983a8b280d21d47c71f':
Disable wifi display API when the adapter is not registered.
2012-09-10 17:11:41 -07:00
Kenny Root
d6b4f99845
am 7d06cb08: am 0c191624: Remove "protect" command from installd
...
* commit '7d06cb0840f2bbf2b91a49c900ad61cae58bcf65':
Remove "protect" command from installd
2012-09-10 17:11:31 -07:00
Svetoslav Ganov
941e49e949
am d09cd881: am add52a97: Viewport should zoom out when screen magnification is disabled.
...
* commit 'd09cd8810621b589efa33a55ce9865890ceff7d0':
Viewport should zoom out when screen magnification is disabled.
2012-09-10 17:11:22 -07:00
Svetoslav Ganov
09cd6d3e59
am fb9d384f: am 5b1720e1: Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev
...
* commit 'fb9d384f55745e711830db41f20dc2042aa5a5ac':
Viewport should zoom out when screen magnification is disabled.
2012-09-10 17:11:15 -07:00
Jeff Brown
496e48466f
am d07934db: am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev
...
* commit 'd07934dbc60d3f52c8133ae8249ef3d609ff2751':
Improve Wifi display discovery API.
2012-09-10 17:10:40 -07:00
Amith Yamasani
b69fc7b54c
am 46148f22: am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev
...
* commit '46148f22650e4e390a9488a2d31d0acd641eeffa':
More multi-user methods in PM
2012-09-10 17:10:32 -07:00
Jeff Brown
50098f820c
am 367d2e7b: am 8e810132: Merge "Make display manager tell input system about viewports." into jb-mr1-dev
...
* commit '367d2e7b74ce16cadd5d3890013acd4d1a0ac022':
Make display manager tell input system about viewports.
2012-09-10 17:10:29 -07:00
Jeff Brown
b61469c513
am de758bd0: am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev
...
* commit 'de758bd07df9bacb2c95ba9d00b3693b4e40b96b':
Enable auto-brightness adjustment feature with system prop.
2012-09-10 17:10:19 -07:00
Jeff Brown
b6e9976497
am fb7a8045: am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev
...
* commit 'fb7a80459206322468144029c06e38c084b35255':
Add new wifi display discovery API.
2012-09-10 17:10:14 -07:00
Jeff Brown
b53f6ddb00
am 10d49dcf: am 0597100f: Merge "Retry wifi display connections." into jb-mr1-dev
...
* commit '10d49dcf3d2c4b04657c038ec2dc0654fba34233':
Retry wifi display connections.
2012-09-10 17:10:10 -07:00
Christopher Tate
a22f02a256
am a59441c9: am 4ea283a0: Merge "Sanity-check existence of restore agent" into jb-mr1-dev
...
* commit 'a59441c9a90f9dc12a205e42404bb7516ee69be6':
Sanity-check existence of restore agent
2012-09-10 17:09:44 -07:00
Dianne Hackborn
234f00b9e8
am 789203ec: am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev
...
* commit '789203ec530e61f7678c9883a67135bf8cd3c679':
Add Binder.getCallingUserHandle().
2012-09-10 17:09:33 -07:00
Dianne Hackborn
452b1ce2d4
am 3374ada6: am 824b959d: Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev
...
* commit '3374ada6ef0d8368b5fba38ee12c6ff9d5de8800':
Explicitly specify current user everywhere home is started.
2012-09-10 17:09:15 -07:00
Jeff Brown
1bfb3323c7
am 131b15a5: am 4d0b5625: Disable hardcoded wifi display adapter.
...
* commit '131b15a5a6040ec5667f9a94ac7bca775b4abcfd':
Disable hardcoded wifi display adapter.
2012-09-10 17:09:10 -07:00
Svetoslav Ganov
fd6b02884c
am c0befe6a: am 0458a69d: Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev
...
* commit 'c0befe6aff6b89b8811e965d9f6ccb368900a1d3':
Fixing off by one error in the ScreenMagnifier.
2012-09-10 17:08:59 -07:00
Jeff Brown
4ef8108b7d
am 36bae4b5: am 72018294: Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev
...
* commit '36bae4b50a6f132468b1a31ad5520e70796bcfc4':
Make mirroring automatic based on Windows on display.
2012-09-10 17:08:37 -07:00
Jeff Brown
53d13ecd9a
Merge "Fix adb am display-size." into jb-mr1-dev
2012-09-10 17:08:36 -07:00
Jeff Brown
8eee7890c1
am 54b7362c: am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev
...
* commit '54b7362cd676e34a9492eba4b463d04b454b26d8':
Add support for Wifi display.
2012-09-10 17:08:33 -07:00
Nick Kralevich
93e62e2e18
am 4088457d: am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev
...
* commit '4088457d91ee4578369471e9d2ea127b799399bf':
installd: fix forward locking symlink
2012-09-10 17:08:30 -07:00
rich cannings
c491c1bf06
am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev
...
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
Move verification settings to Settings.Global
2012-09-10 17:08:26 -07:00
Dianne Hackborn
e062bf6204
am ca02a46d: am cd42ce5d: Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev
...
* commit 'ca02a46dab9607331486d5f6c2189bae42a64592':
Fix crash when setting wallpaper from non-primary user.
2012-09-10 17:08:22 -07:00
Craig Mautner
258833a0d9
am 7ff30583: am df4a94e2: Merge "Fix incorrect indexing calculation." into jb-mr1-dev
...
* commit '7ff30583962b0ab9e37747e4b56cb7a619fb8561':
Fix incorrect indexing calculation.
2012-09-10 17:08:19 -07:00
Amith Yamasani
f0d067ba44
am 4cf05484: am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev
...
* commit '4cf0548452493cabbb7f7c09ab3ecb2ebe77ff8e':
Resolve the correct home intent for secondary users
2012-09-10 17:07:59 -07:00
Christopher Tate
e6de051799
am 20779a1a: am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev
...
* commit '20779a1ace8322064575f03d10598650ba91181c':
Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
2012-09-10 17:07:28 -07:00
Jeff Brown
3c5dab46a7
Merge "Make input system aware of multiple displays." into jb-mr1-dev
2012-09-10 17:07:17 -07:00
Christopher Tate
bb8234b85b
am f1c675bc: am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev
...
* commit 'f1c675bccd4efccb5acb982602943befa85ed660':
Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
2012-09-10 17:06:39 -07:00
Dianne Hackborn
3f6f96b526
am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev
...
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
More multi-user stuff:
2012-09-10 17:06:32 -07:00