Commit Graph

8441 Commits

Author SHA1 Message Date
Craig Mautner
c1bfc347ef am a937899f: am 4be29754: Merge "Rename variables and methods for clarity." into jb-mr1-dev
* commit 'a937899f72d544c338f969b99f05484e228439ff':
  Rename variables and methods for clarity.
2012-09-13 03:22:23 -07:00
Craig Mautner
5409825bc2 am 5f3bce23: am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev
* commit '5f3bce237eb9ea18999d2c51b4cc3050a33541e8':
  Only consider hiddenRequested when deciding layout
2012-09-13 03:21:59 -07:00
rich cannings
3361340d9f am e88d6950: am 4a86019a: Temporarily turn off package verification
* commit 'e88d69508ba76150850947f73ec86c03269762ad':
  Temporarily turn off package verification
2012-09-12 17:03:38 -07:00
Craig Mautner
4be2975453 Merge "Rename variables and methods for clarity." into jb-mr1-dev 2012-09-12 16:48:15 -07:00
Craig Mautner
5c0e78c445 Rename variables and methods for clarity.
Change-Id: I2a1b2f2d5605123e55f264d45b1e7292852f2a7f
2012-09-12 16:45:36 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
2012-09-12 16:34:31 -07:00
Craig Mautner
faecd09cb7 Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 2012-09-12 16:18:37 -07:00
Craig Mautner
c516a5c58f Only consider hiddenRequested when deciding layout
This change removes the test for hidden when deciding whether to
do a layout. So layout begins as soon as hiddenRequested occurs.
Since hidden is cleared when animations starts considering hidden
in the layout decision will delay layout until it is too late.

In particular we were not executing a relayout on return to an
activity even though the screen had been rotated while away.

Fixes bug 6615859.

Change-Id: I5fb0b4bf2c253b910a7a192da04419236d8f09d9
2012-09-12 16:13:59 -07:00
Jeff Brown
eda63986fe am 81da4c77: am c7b6ec7a: Merge "Improve reporting of wifi connection state." into jb-mr1-dev
* commit '81da4c7780134b4ed5d37872b198fb6ad01b3885':
  Improve reporting of wifi connection state.
2012-09-12 15:35:48 -07:00
Svetoslav Ganov
3acdb339ac am e020020f: am 5e900e3a: Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev
* commit 'e020020f218550c97d1011c7eb6221d14fe1ea33':
  Adding a scaling threshold in ScreenMagnifier
2012-09-12 15:35:41 -07:00
Svetoslav Ganov
f210e776a0 am 0d6e17b4: am b1ee5886: Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev
* commit '0d6e17b468f00c37025bf3a0a733a49084f7ab0b':
  Refactoring the scale and pan detection in the ScreenMagnifier.
2012-09-12 15:35:24 -07:00
Svetoslav Ganov
d381c620ed am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '2b5c5b640d170518ac9ddc289a49340e54ff39d0':
  Screen magnifier should handle window rebuilds correctly.
2012-09-12 15:34:32 -07:00
Jeff Brown
984f157366 am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
* commit '2eb82513bd448757250dc8245e9c29c747397608':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
2012-09-12 15:28:20 -07:00
Adam Cohen
3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets
2012-09-12 15:14:57 -07:00
Kenny Root
bbf4fc22f7 am dba90626: am a3618092: Merge "Remove "unlinklib" command from installd" into jb-mr1-dev
* commit 'dba90626d3e8e0a9993bbc9d30094a0764dc3f55':
  Remove "unlinklib" command from installd
2012-09-12 15:13:57 -07:00
Amith Yamasani
253730061d am 59337ae6: am 8015f039: Merge "Enforce a user limit" into jb-mr1-dev
* commit '59337ae684d62c644827d782456d659b3effcef6':
  Enforce a user limit
2012-09-12 15:13:53 -07:00
rich cannings
4a86019aee Temporarily turn off package verification
Bug: 7152858
Change-Id: Ic3b1900e486224dafcf3cce5db13e5f795650b51
2012-09-12 14:45:58 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
2012-09-12 10:55:03 -07:00
Jeff Sharkey
8b29d63d08 Merge "Include user identifier in external storage paths." into jb-mr1-dev 2012-09-11 23:36:50 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
2012-09-11 23:11:14 -07:00
Jeff Brown
c7b6ec7a7c Merge "Improve reporting of wifi connection state." into jb-mr1-dev 2012-09-11 18:47:37 -07:00
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
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
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
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
Jeff Brown
9ba2a18891 Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
* changes:
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
2012-09-11 13:56:04 -07:00
Adam Cohen
aec914b130 Merge "Adding notion of keyguard widgets" into jb-mr1-dev 2012-09-11 13:18:14 -07:00
Jeff Brown
59c53c6224 Don't auto-discover peers until scan requested.
Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b
2012-09-11 12:21:55 -07:00
Jeff Brown
0f68d166e6 Use wfdInfo to filter available sinks.
Change-Id: If056267738f70835af645a8c6e7a91c0c5407816
2012-09-11 12:18:15 -07:00
Kenny Root
a36180925b Merge "Remove "unlinklib" command from installd" into jb-mr1-dev 2012-09-11 11:13:53 -07:00
Amith Yamasani
faea76ff8b Enforce a user limit
By default only 1 user is allowed. Some devices permit more than 1.
Set the real user limit in a device overlay for config.xml

Change-Id: I2e0bffa13393b954fcd20e55b92f20de980c58c0
2012-09-11 10:59:48 -07:00
Kenny Root
9bbd70a963 Remove "unlinklib" command from installd
unlinklib is no longer necessary since libraries are now either stored
in an ASEC container or in /data/app-lib

Replace lib directory with a symlink to the /data/app-lib directory even
if it's a dangling link. That way developers don't name something "lib"
in their directory which gets blown away during an update.

Change-Id: I142cf13dba9c13aafbaf0ff8d5e9872cbf1cc910
2012-09-11 10:55:17 -07:00
Adam Cohen
0aa2d42e87 Adding notion of keyguard widgets
-> Persisting certain appwidget options
-> Adding ability to specify appwidget options on bind
   so as to avoid AppWidgetProvider update call with no
   options.

Change-Id: I5631039f19f1822b8e123b559b6353c880c0192e
2012-09-11 10:53:57 -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
Jeff Brown
43aa159128 Allow adb shell am display-size to use bigger sizes.
We now support scaling the logical display to fit the
physical display, whatever size it is.  So we can allow
adb shell am display-size to use more or less arbitrary sizes
although we do enforce an upper and lower bound to
protect the user.

Change-Id: I5fe6ba32ad1f9e4fbcd6915f7d36850b987bbcc0
2012-09-10 17:50:18 -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