Commit Graph

27949 Commits

Author SHA1 Message Date
Dianne Hackborn
574fbc738d am c73f3d5c: am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev
* commit 'c73f3d5cea18b1688a119658680b489ef7621dd2':
  Fix issue #7238170: Edit picture option is not available for the secondary user.
2012-09-26 16:07:44 -07:00
Dianne Hackborn
7b879999fe Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev 2012-09-26 16:03:06 -07:00
Adam Powell
3cc8211ecd am cbc289ae: am bf184875: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
* commit 'cbc289ae0c15a70eb6b4b611b23761159059f153':
  Fix adjustViewBounds handling for ImageView
2012-09-26 15:32:55 -07:00
Adam Powell
bf184875ef Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 2012-09-26 15:28:52 -07:00
Adam Powell
b1271ac183 Fix adjustViewBounds handling for ImageView
When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate. This can result in the view never
getting properly enlarged.

Bug 7240251

Change-Id: I44fc017f8b661121f0042fcd59a4efde70be6bbe
2012-09-26 15:21:39 -07:00
Dianne Hackborn
4d5c2b0317 Fix issue #7238170: Edit picture option is not available for the secondary user.
Change-Id: Icb3229f543f286afb4a31e267099eceaa0cca11d
2012-09-26 15:10:30 -07:00
Dianne Hackborn
c14a9113c5 am e440f47d: am e5215730: Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." into jb-mr1-dev
* commit 'e440f47d95cefe02bc76d6b57d6e2b248b052f93':
  Maybe fix issue #7211766: bindService() to User u0 While u10 is...
2012-09-26 15:00:23 -07:00
Dianne Hackborn
e521573097 Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." into jb-mr1-dev 2012-09-26 14:55:19 -07:00
Dianne Hackborn
b12e1354f2 Maybe fix issue #7211766: bindService() to User u0 While u10 is...
...Forground Sometimes Doesn't Take

The main change here is a one-liner in ActiveServices to check the
uid when deciding whether to remove an item from mPendingServices.
This could cause the problem being seen -- if the same service for
two users is starting at the same time, the second one would blow
away the pending start of the first one.  Unfortunately I have had
trouble reproducing the bug, so I don't know if this is actually
fixing it.  It's a bug, anyway.

The reason so much has changed here is because I spread around
logging and printing of the user ID associated with operations and
objects to make it easier to debug these kind of multi-user things.

Also includes some tweaks to the oom manager to allow more background
processes (I have seen many times in logs where we thrash through
processes because the LRU list is too short), plus to compensate an
additional time-based metric for when to get rid of background processes,
plus some new logic to try to help things like Chrome keep around
their service processes.

Change-Id: Icda77fb2a1dd349969e3ff2c8fff0f19b40b31d3
2012-09-26 14:50:12 -07:00
Jesse Hall
5d7b4368d9 am bbe1860a: am 62fbb831: Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev
* commit 'bbe1860ae38b96d4d347990d1fb857e978828224':
  Document interaction of SurfaceView and post-layout transforms
2012-09-26 14:39:45 -07:00
Jesse Hall
62fbb8311a Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev 2012-09-26 14:34:44 -07:00
Fabrice Di Meglio
d28c3643a6 am 21289957: am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit '21289957a91213c922236deb6010dbde1d652c5e':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-26 13:58:11 -07:00
Fabrice Di Meglio
fea9df6386 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-26 13:54:16 -07:00
Romain Guy
1c8cd46a09 am 83b6c24e: am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev
* commit '83b6c24e612a0bf625c24502a3c0b7617a85af50':
  Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
2012-09-26 13:47:48 -07:00
Romain Guy
54ea6bf2aa Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev 2012-09-26 13:44:03 -07:00
Jeff Sharkey
2ecc9592e5 am a98137c1: am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev
* commit 'a98137c16d433ebc14e64c363e8c2fe86c74c2a7':
  Multi-user ringtone playback.
2012-09-26 13:42:39 -07:00
Jeff Sharkey
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Romain Guy
bd43152bda Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR
Bug #7221173

Change-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117
2012-09-26 13:36:47 -07:00
Jesse Hall
c9f345ff7b Document interaction of SurfaceView and post-layout transforms
Bug: 7179570
Change-Id: I9c4d71242bcb832c0cb3b62ec26aba54f146d70a
2012-09-26 12:07:12 -07:00
Scott Main
47a39892a4 am 56d86e53: am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '56d86e53b539fd892cb30e5d59078b7dc45a51a8':
  add analog clock attributes to docs
2012-09-26 11:54:29 -07:00
Scott Main
4368ba45ad am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '3cda846725c31b49f6c60ba986ccc7b2eb1adab3':
  add analog clock attributes to docs
2012-09-26 11:49:48 -07:00
Scott Main
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
2012-09-26 11:47:38 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
2012-09-26 11:45:21 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
2012-09-26 11:42:09 -07:00
John Spurlock
46193469c7 am ccb06b41: am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev
* commit 'ccb06b415747655cead26a801560b68ee061b870':
  Dream metadata now specified using an xml-resource.
2012-09-26 11:20:17 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback.
Change RingtonePlayer to open content:// Uris based on requesting
UserHandle.  Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI.  Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
2012-09-26 10:49:35 -07:00
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource.
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
2012-09-26 12:44:39 -04:00
Kenny Root
fb690e6e3a am ab34aba1: am f05d511b: Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev
* commit 'ab34aba1301388022ec352aa8ff4cd85ebf03451':
  LockScreen: only set keystore password for owner
2012-09-25 23:51:19 -07:00
Kenny Root
f05d511bc9 Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 2012-09-25 23:35:56 -07:00
Kenny Root
df8bfe0cf6 LockScreen: only set keystore password for owner
Since KeyStore doesn't support multi-user, only unlock or set the
password on the keystore when the "owner" enters a password.

Bug: 7169463
Change-Id: I97b4ba714dc6e400a6e45825c71f81c4629392d8
2012-09-25 22:57:41 -07:00
Adam Powell
4a22625b7d am 82c6fa58: am e8e2b672: Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev
* commit '82c6fa5898be4730bdb26f2d4e79df1314840ca2':
  Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
2012-09-25 19:40:22 -07:00
Adam Powell
e8e2b67256 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 2012-09-25 19:35:54 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
2012-09-25 19:30:44 -07:00
Jeff Sharkey
7339e3b567 am 0b0a8c93: am 6e065a72: Merge "Handle multi-user mountObb() requests." into jb-mr1-dev
* commit '0b0a8c933cb5280b4200d92964d4b68c91362cf9':
  Handle multi-user mountObb() requests.
2012-09-25 17:56:00 -07:00
Jeff Sharkey
6e065a729d Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 2012-09-25 17:52:14 -07:00
Jeff Sharkey
4fbbda4cec Handle multi-user mountObb() requests.
Since emulated external storage paths differ based on execution
context, carefully fix up paths for various use-cases:

1. When sending paths to DefaultContainerService, always scope
   OBB paths as belonging to USER_OWNER.
2. When sending paths to vold, always build emulated storage paths
   visible to root.
3. Always use the original untouched path when talking with apps.

Mount OBB containers using shared app GID, so that an app can read
the mount point across users.

Handle legacy paths like "/sdcard" by resolving the canonical path
before sending to MountService.  Move tests to servicestests, and
add tests for new path generation logic.

Bug: 7212801
Change-Id: I078c52879cd08d9c8a52cc8c83ac7ced1e8035e7
2012-09-25 17:34:48 -07:00
Adam Powell
823de2070f am b7066338: am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
* commit 'b706633863ba616133c0976078885b7c81d4591e':
  Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
2012-09-25 17:21:19 -07:00
Adam Powell
b4693e25b1 Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 2012-09-25 17:17:22 -07:00
Jeff Brown
9da4d74477 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:03:11 -07:00
Dianne Hackborn
a2636fc003 am 923e3cc1: am 61ad1bac: Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
* commit '923e3cc1aa59e0713fc7ecfac8f8ab2953c02cfc':
  Fix AbsListView to correctly retain its state if not layed out.
2012-09-25 16:54:31 -07:00
Svetoslav Ganov
2a0168615b am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
  Adding a global accessibility action to open quick settings.
2012-09-25 16:52:34 -07:00
Brian Carlstrom
1802935852 am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
* commit 'bee07548d5beda94538a211383847889dc9224b5':
  Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:50:47 -07:00
Dianne Hackborn
61ad1bacf8 Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev 2012-09-25 16:49:05 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00
Brian Carlstrom
fe54290df0 Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 2012-09-25 16:46:09 -07:00
Fabrice Di Meglio
2874ace197 am ef866005: am e8e98704: Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev
* commit 'ef8660057e7cfbc7f03618fb12ca7e0eb9278ce8':
  Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode
2012-09-25 16:31:39 -07:00
Adam Powell
a4ce6ae0d3 Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
Bug 7199099

Change-Id: I7268268237cc690c2ff952d4b2cd2ddc6dce2ca5
2012-09-25 16:21:53 -07:00
Svetoslav Ganov
e20a177d3f Adding a global accessibility action to open quick settings.
1. Added APIs for opening the quick settings to the StatusBarManagerService
   and the local StatausBarManager. The new APIs are protected by the old
   EXPAND_STATUS_BAR permission.
   Renamed the expand* and collapse* non-public APIs that are expanding
   the notifications to expandNotifications* collapseNotifications* to
   better convey what they do given that this change adds
   expandQuickSettings* and collapseQuickSettings*.
   Added a global action to the accessibility layer to expand the quick
   settings which is calling into the new status bar manager APIs.

bug:7030487

Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
2012-09-25 16:07:59 -07:00
Fabrice Di Meglio
e8e98704f3 Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev 2012-09-25 15:58:56 -07:00