Commit Graph

31960 Commits

Author SHA1 Message Date
John Spurlock
9dfcf1f311 am 74d21364: am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev
* commit '74d2136477bdea626edbfa2e36b1a0ea7c777b40':
  Update transient navigation confirmation wording & behavior
2013-09-16 16:11:09 -07:00
John Spurlock
74d2136477 am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev
* commit 'c8d19b894ebe659d9508a9a4763388d8573c6d76':
  Update transient navigation confirmation wording & behavior
2013-09-16 16:08:09 -07:00
John Spurlock
c8d19b894e Merge "Update transient navigation confirmation wording & behavior" into klp-dev 2013-09-16 23:03:25 +00:00
Igor Murashkin
a250b071da am 3877a865: am 1e4e3825: Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev
* commit '3877a8650781c2b63d9cd195bc9a022dc7b365c9':
  camera2: Add key enumeration functionality to CameraMetadata
2013-09-16 15:54:12 -07:00
Igor Murashkin
3877a86507 am 1e4e3825: Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev
* commit '1e4e38252f8eb44fe382e371e29857834cf9fc15':
  camera2: Add key enumeration functionality to CameraMetadata
2013-09-16 15:51:16 -07:00
Igor Murashkin
1e4e38252f Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev 2013-09-16 22:47:07 +00:00
Igor Murashkin
77cd5ace33 am ad2b04a6: am 901be0ae: Merge "camera2: Update Face class." into klp-dev
* commit 'ad2b04a6f167f8574c7e0efbf8c30b15fa966b5b':
  camera2: Update Face class.
2013-09-16 15:43:53 -07:00
Igor Murashkin
ad2b04a6f1 am 901be0ae: Merge "camera2: Update Face class." into klp-dev
* commit '901be0ae33faf8ece17170b0d9d4c4429121b6ab':
  camera2: Update Face class.
2013-09-16 15:39:51 -07:00
Igor Murashkin
901be0ae33 Merge "camera2: Update Face class." into klp-dev 2013-09-16 22:32:11 +00:00
Dianne Hackborn
68ba583b79 am 366894b5: am 0a6a80f4: Fix build.
* commit '366894b544e723b11f591a3071599066d0ada2da':
  Fix build.
2013-09-16 15:29:46 -07:00
Dianne Hackborn
366894b544 am 0a6a80f4: Fix build.
* commit '0a6a80f43de1b64b452aff2cbb6bdbfc9915c2a9':
  Fix build.
2013-09-16 15:26:16 -07:00
Dianne Hackborn
0a6a80f43d Fix build.
Change-Id: I2b2168ff3b2826a60353fd137a2fa255b1ace4bb
2013-09-16 15:20:27 -07:00
Dianne Hackborn
df2dae01b0 am 40489be9: am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev
* commit '40489be90b7c145da75034f793932500f0e5d380':
  Implement issue #10691359: Kill long-running processes
2013-09-16 14:37:30 -07:00
Dianne Hackborn
40489be90b am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev
* commit '61158244b42df547ecf8ca145d539c814b154a4a':
  Implement issue #10691359: Kill long-running processes
2013-09-16 14:34:55 -07:00
Dianne Hackborn
61158244b4 Merge "Implement issue #10691359: Kill long-running processes" into klp-dev 2013-09-16 21:33:04 +00:00
John Spurlock
d67ec25a9c Update transient navigation confirmation wording & behavior
1. Decrease transient navigation confirmation annoyance.

  - Only use the power-key as a signal if we detect a screen-off
    screen-on within a short threshold value.

 - Auto-confirm if user performs the indicated gesture.

 - Remember confirmation across reboots.

2. Update wording to new final wording.  Remove now obsolete
short + long versions.  Decrease message font temporarily
until the new platform toast redesign is finalized.

3. Remove pre-ship ImmersiveModeTesting debug helper.

Bug:10602929
Change-Id: I0bff826391058c7b282eeb61817b93b79de84893
2013-09-16 17:12:17 -04:00
Chet Haase
ea3b4506f3 am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev
* commit '8b575ec3a733d5e08b0fc9ce995d2aa2148f47a6':
  Ensure that transitions animating alpha end on a reasonable value
2013-09-16 14:08:26 -07:00
Dianne Hackborn
35f72be50b Implement issue #10691359: Kill long-running processes
We now have the activity manager kill long-running processes
during idle maintanence.

This involved adding some more information to the activity manager
about the current memory state, so that it could know if it really
should bother killing anything.  While doing this, I also improved
how we determine when memory is getting low by better ignoring cases
where processes are going away for other reasons (such as now idle
maintenance).  We now won't raise our memory state if either a process
is going away because we wanted it gone for another reason or the
total number of processes is not decreasing.

The idle maintanence killing also uses new per-process information
about whether the process has ever gone into the cached state since
the last idle maintenance, and the initial pss and current pss size
over its run time.

Change-Id: Iceaa7ffb2ad2015c33a64133a72a272b56dbad53
2013-09-16 14:05:34 -07:00
Chet Haase
8b575ec3a7 am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev
* commit 'c05c36285dbc715e851671cb4495d376743c4399':
  Ensure that transitions animating alpha end on a reasonable value
2013-09-16 14:05:18 -07:00
Chet Haase
c05c36285d Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev 2013-09-16 21:03:28 +00:00
Chet Haase
23c61f6bc5 Ensure that transitions animating alpha end on a reasonable value
The Fade transition sets an initial alpha value of 0 when items are
appearing. This makes items invisible to start with, and then they
eventually fade in as part of the transition when the transition's
animation runs.

But if that animation/transition gets interrupted, or not started, then
the alpha value would not be restored, and the value would stay 0,
making the items invisible indefinitely. This is what was happening in
the action bar of the People app when performing a search.

The fix is to handle Transition and animation events to restore the alpha
to its true value when the transition completes, whether that
transition is canceled or not.

Issue #10726905 ActionBar weirdness in People app

Change-Id: Idb65fd8d471d2ac0a1ddc243fee00ae99f7e72d8
2013-09-16 13:58:23 -07:00
Zhijun He
cc6b5bf214 am e4688207: am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev
* commit 'e468820757743b95fb5622ae3010fbccb9338a0c':
  Camera2: Add MAX_CAMERAS_IN_USE error case handling
2013-09-16 11:30:34 -07:00
Matthew Williams
86f4b37d19 Merge "Refactor SyncManager rename authority->target" 2013-09-16 18:29:36 +00:00
Zhijun He
e468820757 am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev
* commit '78a1de651968fc67f43fc881bc8ff5ac3ff380c9':
  Camera2: Add MAX_CAMERAS_IN_USE error case handling
2013-09-16 11:24:30 -07:00
Zhijun He
78a1de6519 Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev 2013-09-16 18:21:17 +00:00
Chet Haase
f6e1e8e037 am fe11c5d8: am 978a455d: Merge "Plug leaks in transitions" into klp-dev
* commit 'fe11c5d8cd02897b5156460c9a7ae6578cad1fc6':
  Plug leaks in transitions
2013-09-16 11:13:01 -07:00
Chet Haase
fe11c5d8cd am 978a455d: Merge "Plug leaks in transitions" into klp-dev
* commit '978a455d665c6bccdc900eeadc72bb652a2ea294':
  Plug leaks in transitions
2013-09-16 11:10:34 -07:00
Chet Haase
978a455d66 Merge "Plug leaks in transitions" into klp-dev 2013-09-16 18:05:43 +00:00
Martijn Coenen
0754cb7586 am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:37:45 -07:00
Martijn Coenen
1f8d7f61c0 am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
* commit '370b593c37569ddad8286a47e3772bfe3cdb9c9b':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:34:35 -07:00
Martijn Coenen
370b593c37 Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 2013-09-16 17:31:40 +00:00
Jonathan Dixon
a25f350add am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
* commit '7c0e2122c0e9bcb83c082156d5f5300b7f62169b':
  Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
2013-09-15 20:34:31 -07:00
Jonathan Dixon
1dd56b656b am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
* commit 'c39a9ca95d98e70fc1de8a1b3aeaf7e7075ff868':
  Hide Experimental WebView from dev settings DO NOT MERGE
2013-09-15 20:29:55 -07:00
Jonathan Dixon
dc1573595c Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
Bug 10769282

Reverting temporary patch required for factory rom.

This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.
2013-09-16 03:09:43 +00:00
Jonathan Dixon
3d458ab916 Hide Experimental WebView from dev settings DO NOT MERGE
Bug 10427705

The persist.webview system property is no longer needed, so removed too.

Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
2013-09-16 03:08:41 +00:00
Zhijun He
68ebc1a7b4 Camera2: Add MAX_CAMERAS_IN_USE error case handling
Throw CAE with reason MAX_CAMERAS_IN when the error code is EDQUOT.

Bug: 10749544
Change-Id: I6820de8b95662a55bb37f099746ea2cbe5056f24
2013-09-15 11:55:44 -07:00
Svetoslav Ganov
a6df7120f4 am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
* commit 'b30e185b440e04eac5119653a2868395554febfe':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44 am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12 Merge changes Id0a67846,I20b57d66 into klp-dev
* changes:
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 18:46:02 +00:00
Ying Wang
8d2373810a am 3c9d0490: am c38acbbe: Merge "Fix docs build." into klp-dev
* commit '3c9d049084c6a5d5033cbf6cccee30177508267f':
  Fix docs build.
2013-09-14 12:06:30 -07:00
Chet Haase
7660d121b2 Plug leaks in transitions
Transitions were leaking views due to TransitionsValues holding references
to views/parents. The references were fine, but the retention of the transition
objects themselves were not. There were a few different places that needed to
be plugged:
- clones were not making new copies of some fields, leading to caching references
in the original object (which was then cloned later to other clones)
- Visibility was using a persistent field to cache temporary values. This transition,
when cloned, would retain these instances, keeping references to views
- ViewTreeObserver had a bug that would leak listeners

Issue #10749071 Activity instance leak between TransitionManager and InputMethodManager

Change-Id: I1d5d457dc5e020c7b9e8392a95e3b2c488461119
2013-09-14 12:06:18 -07:00
Ying Wang
3c9d049084 am c38acbbe: Merge "Fix docs build." into klp-dev
* commit 'c38acbbe3060086977a1f9877b9d4befed5894be':
  Fix docs build.
2013-09-14 12:03:58 -07:00
Ying Wang
930d4e52ad Fix docs build.
Change-Id: I4a1608bfad809d67240db2070fda85df486179e6
2013-09-14 11:57:17 -07:00
Maggie Benthall
96b82aae35 am b964e5ed: am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
* commit 'b964e5edff92849c4ade7d43b86bfaca26d2a4a4':
  CA cert monitoring: add notifications and actions for dialog
2013-09-14 11:04:08 -07:00
Maggie Benthall
b964e5edff am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
  CA cert monitoring: add notifications and actions for dialog
2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
Michael Jurka
6f11e3254e am 9d4d14fa: am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
* commit '9d4d14fa292e4ef7beb66c20b0b2c139b81d3c8f':
  Add new intent/method for cropping and setting wallpapers
2013-09-14 05:32:00 -07:00
Michael Jurka
9d4d14fa29 am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
* commit '276e6c7a89ed91dbf3e4fe9f46d19e82656d8fd9':
  Add new intent/method for cropping and setting wallpapers
2013-09-14 05:29:39 -07:00
Michael Jurka
276e6c7a89 Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 2013-09-14 12:25:51 +00:00
Svetoslav Ganov
860f8a6b66 Spooler should not crash if print service config activities are not exported.
1. If a print service does not export its activities for settings and
   adding printers the print spooler ignores them instead of crashing.
   Also if the service is not enabled its activities are now ignored.

2. Added a dedicated permission for a print service to optionally
   protect its settings and add printer activities such that only the
   system can bind to them.

3. Fixed a crash in the print dialog if its content is detached
   from the window and animators are running.

bug:10680224

Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
2013-09-14 01:00:55 -07:00