13353 Commits

Author SHA1 Message Date
Daniel Sandler
16edf57069 am 6800dde2: am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev
* commit '6800dde2fcf4aeec358feb52831933089978edb0':
  Once again, cancel all when notifications canceled for pkg.
2013-04-18 16:23:24 -07:00
Daniel Sandler
6800dde2fc am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev
* commit '9bc3386e1dfacf6544039dc9f66d07b827632f23':
  Once again, cancel all when notifications canceled for pkg.
2013-04-18 16:19:47 -07:00
Daniel Sandler
9bc3386e1d Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev 2013-04-18 23:15:51 +00:00
Satoshi Kataoka
a1d7a123c4 am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
* commit 'f09993ca1d01823f9c60c0be45a8169e09dd27d7':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
2013-04-18 15:32:50 -07:00
Satoshi Kataoka
f09993ca1d am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
2013-04-18 15:28:18 -07:00
Jeff Brown
653dbd1f1c am 253bc750: am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev
* commit '253bc7505c890d57466ce251369367ac384cff67':
  Sent hint to Wifi driver when enabling WFD.
2013-04-18 15:22:25 -07:00
Jeff Brown
253bc7505c am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev
* commit 'a454c5732cacffdda53ae277b1e43d87b43044b1':
  Sent hint to Wifi driver when enabling WFD.
2013-04-18 15:17:53 -07:00
Jeff Brown
a454c5732c Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev 2013-04-18 22:16:05 +00:00
Craig Mautner
7bb0ae0d45 Merge "Add null test and remove redundant call." 2013-04-18 21:31:27 +00:00
Craig Mautner
f06b8c1788 Add null test and remove redundant call.
- Did not handle the case where mTaskIdToTask returned null.
Fixes bug 8646178.
- updateInputWindowsLw() was being called in removeWindows
immediately after it was called in performLayoutAndUpdateSurfaces.

Change-Id: I1b8bcfadcc93f8c6638fd4247b426af77feeee23
2013-04-18 14:27:28 -07:00
Craig Mautner
709393fc8c Merge "Fix launching logic." 2013-04-18 21:16:04 +00:00
Craig Mautner
69ada558f5 Fix launching logic.
Fixes bug 8643197.

Change-Id: Ie09a767082dc492b449111da91bc0e77b43fa2f6
2013-04-18 13:51:51 -07:00
Craig Mautner
ab0a890412 Merge "Add transparent frame around focused stack." 2013-04-18 19:57:43 +00:00
Svetoslav Ganov
33cf00a07e am 7a3e91f4: am 467a052e: Magnification does not work if no enabled accessibility services.
* commit '7a3e91f4f99c84463cc481c1d9c68003c2ca4554':
  Magnification does not work if no enabled accessibility services.
2013-04-18 11:40:34 -07:00
Svetoslav Ganov
7a3e91f4f9 am 467a052e: Magnification does not work if no enabled accessibility services.
* commit '467a052e159d5dc87b27ce94f8559576ec73040b':
  Magnification does not work if no enabled accessibility services.
2013-04-18 11:36:42 -07:00
Satoshi Kataoka
1a546dca77 Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 2013-04-18 17:43:38 +00:00
Svetoslav Ganov
467a052e15 Magnification does not work if no enabled accessibility services.
This is a regression in which the input filter of the accessibility
manager service is not set if magnification is enabled but accessibility
is not - i.e. no accessibility serivces are enabled. Fixed the logic to
install the input filter if magnification is on but services are not
enabled in addition to services being enabled.

bug:8652765

Change-Id: Ia73e1064035f95ba0f246f4cabcc42d58c12a11f
2013-04-18 10:42:30 -07:00
Craig Mautner
a9a3fb1da3 Add transparent frame around focused stack.
- Also fix bugs when removing stack.

Change-Id: I3e0e3029f512f086601add00ccf34b2fea84296d
2013-04-18 10:02:38 -07:00
Daniel Sandler
32e698b12f Once again, cancel all when notifications canceled for pkg.
Right now this only works if you go through the front door
(using setNotificationsEnabledForPackage()); if you set the
AppOps for a package otherwise the existing notifications
will not be cleared (but new ones will be blocked). Since
there's no UI for modifying AppOps today this shouldn't be a
problem.

Bug: 8489214
Change-Id: I84f8c76a0d03959127e9076ab2b7d37dbdaebb17
2013-04-18 11:31:52 -04:00
Satoshi Kataoka
5faf1985af am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit '3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180':
  Fix possible NPE
2013-04-17 20:40:25 -07:00
Satoshi Kataoka
3e3a7b3b1e am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
2013-04-17 20:36:12 -07:00
Satoshi Kataoka
f024e7ac44 Merge "Fix possible NPE" into jb-mr2-dev 2013-04-18 03:33:39 +00:00
Jeff Brown
f110a3701b Sent hint to Wifi driver when enabling WFD.
Bug: 8521148
Change-Id: I53b4cf7a3714b28f9df457e559abe92711c02cef
2013-04-17 20:25:36 -07:00
Dianne Hackborn
a6e8ebb12f am fb4e1c21: am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev
* commit 'fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c':
  Fix issue #8540550: Screenshots should never have transparency
2013-04-17 19:07:03 -07:00
Dianne Hackborn
fb4e1c21ed am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev
* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency
2013-04-17 19:03:09 -07:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
2013-04-17 18:06:22 -07:00
Jim Miller
9b4b662c27 resolved conflicts for merge of 6825c478 to master
Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7
2013-04-17 16:27:30 -07:00
Jim Miller
6825c47830 am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
2013-04-17 15:49:23 -07:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings.
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
2013-04-17 15:26:10 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
2013-04-17 14:18:56 -07:00
Craig Mautner
29219d963d Steady improvement to multi stack.
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
2013-04-17 13:54:48 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
2013-04-17 11:34:28 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Christopher Tate
a952f9d590 am 0bd7a2f2: am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev
* commit '0bd7a2f27120e945376217e2300ac2cd8bb00059':
  Lengthen the AM timeout reading crash reports slightly
2013-04-17 11:13:29 -07:00
Christopher Tate
0bd7a2f271 am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev
* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
2013-04-17 11:11:30 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
2013-04-17 10:44:44 -07:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
2013-04-17 10:40:02 -07:00
Daniel Sandler
a38006d74f am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev
* commit '74c69f1e0c184faeaf0e02f2a0445d1c436b6287':
  Treat the default sound Uri the same as DEFAULT_SOUND.
2013-04-17 09:12:11 -07:00
Daniel Sandler
74c69f1e0c am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
2013-04-17 09:07:02 -07:00
Daniel Sandler
66769767b6 Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 2013-04-17 16:04:33 +00:00
Daniel Sandler
3147523c10 Treat the default sound Uri the same as DEFAULT_SOUND.
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)

Bug: 8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
2013-04-17 10:59:50 -04:00
Satoshi Kataoka
7987a3172b Fix possible NPE
Bug: 8517083
Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
2013-04-17 18:59:33 +09:00
Craig Mautner
bbcc289dad Merge "Incremental repairs to side by side stacks." 2013-04-17 01:58:51 +00:00
Craig Mautner
53078b25c9 Merge "Implement stack splitting and task movement." 2013-04-17 01:58:15 +00:00
Craig Mautner
4cd0c13f8f Incremental repairs to side by side stacks.
- Add taskId parameter to createStack() so stacks are pre-populated
with a task.
- Keep track of stack access order in DisplayContent so getTasks
returns in MRU order.
- Set touchableRegion in InputMonitor so modal touching does not
extend beyond stack boundary.
- Fix stack merging so that deleting a stack results in a new
stack the size of the two children.

Change-Id: I62a6ba0a34f34dd7ec866b440bf04595379e19e8
2013-04-16 18:55:07 -07:00