Christopher Tate
4b8dd603cf
am cf611b77: am 60fcce6c: Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev
...
* commit 'cf611b776ed5163008fdad87452f3047c966ec08':
Introduce maxSdkVersion for <uses-permission>
2013-09-16 18:09:04 -07:00
Christopher Tate
cf611b776e
am 60fcce6c: Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev
...
* commit '60fcce6cb1bbe720634ae5e3d94aeae5e4c1e53e':
Introduce maxSdkVersion for <uses-permission>
2013-09-16 18:06:27 -07:00
Christopher Tate
60fcce6cb1
Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev
2013-09-17 01:01:47 +00:00
Christopher Tate
fb0676a902
Introduce maxSdkVersion for <uses-permission>
...
This way an application can automatically sunset its permission requests
when running on later versions of the OS where those permissions are no
longer relevant, but may be alarming to the user. A canonical example
is WRITE_EXTERNAL_STORAGE, which as of KLP becomes unnecessary for an app
to use the external storage volume solely for its own large-data needs,
without the need for actual file-system sharing among multiple apps.
Bug 9761041
Change-Id: I60130af3a108fe4a750c356038a1c8cb897e9c8b
2013-09-16 17:03:02 -07:00
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
Daniel Sandler
e0339ab5a3
am c1c5e117: am 311daf20: Merge "New platlogo for K." into klp-dev
...
* commit 'c1c5e1177d0ad675c151a7081bd42eef9b0872d2':
New platlogo for K.
2013-09-16 13:14:00 -07:00
Daniel Sandler
c1c5e1177d
am 311daf20: Merge "New platlogo for K." into klp-dev
...
* commit '311daf205348849c97822d33d6a4f7b75bfec6d8':
New platlogo for K.
2013-09-16 13:11:11 -07:00
Daniel Sandler
311daf2053
Merge "New platlogo for K." into klp-dev
2013-09-16 20:09:05 +00:00
Daniel Sandler
80c3c4e960
New platlogo for K.
...
Bug: 10605145
Change-Id: I23f285ec24118982b10f5d801b75925b9dc81c64
2013-09-16 14:40:03 -04: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
Daniel Sandler
fe904ecc97
am 48591ef6: am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '48591ef67e92bbb80a2a263b6813a8afcd9c2788':
Fix RenderScript crash.
2013-09-16 08:29:46 -07:00
Daniel Sandler
48591ef67e
am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '28ed00d3b7931c75ac97d1aced01b1dda465f07f':
Fix RenderScript crash.
2013-09-16 08:28:16 -07:00
Daniel Sandler
a30b7035ce
Fix RenderScript crash.
...
Also lay the groundwork for a future checkin.
Bug: 10240151
Bug: 10505742
Change-Id: I62d61c9048188c93863c8c43839e713b75a65102
2013-09-16 11:19:15 -04: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