Alan Viverette
8f0ad178cc
am 0610aa39: am 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit '0610aa39c4a0344eb00193f2a501d599256e9107':
Correctly advertise accessibility scrolling actions
2014-09-26 15:28:22 +00:00
Adam Powell
209c334152
am e3215536: am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit 'e321553613a71178fd5fce1e27e0b9693650d10a':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 15:27:46 +00:00
Adrian Roos
12ed614541
am a25ef3ab: am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit 'a25ef3ab9e091be2dcbbc331f56a1274dae1aecc':
Ensure that setting an empty password clears it
2014-09-26 15:27:15 +00:00
Eino-Ville Talvala
e5e1f4c152
am c6b3281c: am 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit 'c6b3281c98f354fe241c30f6fb2b39ddb822e685':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-26 15:27:10 +00:00
Michael Wright
d42c1f4022
am 3f0da0bc: am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '3f0da0bcb07ed1c7a544cc3cd88b084a42044295':
Specify a device identifier for keyboard layout notification.
2014-09-26 15:27:05 +00:00
Eino-Ville Talvala
b34e4ce0eb
am 5945282c: am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '5945282cc522af359b4518d4ad14f1e85c198812':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-26 15:26:46 +00:00
Ruben Brunk
5a3657c484
am 3e917517: am 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit '3e917517882931896a6a979cbc5fbe39f99374a7':
camera2: Fix null check in PictureCallback.
2014-09-26 15:26:21 +00:00
Paul Lawrence
ca38911533
am 342d9c5f: am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '342d9c5f8f79b3189e803b19a148da9e6bd5c44a':
Fix pause when setting pin/pattern/password
2014-09-26 15:26:05 +00:00
Chris Wren
60772b487d
am 18fc9f40: am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '18fc9f40a61e90feb6154702db91cd25c4a4f752':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-26 15:25:37 +00:00
Alan Viverette
cc4c6e3db7
am 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit '28a845c017c2990b339a50afe57f11f22d8b730b':
Correctly advertise accessibility scrolling actions
2014-09-26 05:03:58 +00:00
Alan Viverette
91e18e538a
am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit '5a99c276b329a7c828e65083da5d5df73e60915e':
Correctly advertise accessibility scrolling actions
2014-09-26 04:41:34 +00:00
Adam Powell
da3b0d3f3f
am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit 'd2906536f40e584ff4b4c348a95ce71958aaffb6':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 04:31:00 +00:00
Adrian Roos
d99db031ea
am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit 'b8d22d1c5bd035346832301e126ba83380bf63c0':
Ensure that setting an empty password clears it
2014-09-26 04:29:42 +00:00
Eino-Ville Talvala
6c4fb05931
am 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit '8127c2e702f84ccdb280a83b3dc2753684112506':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-26 04:29:38 +00:00
Michael Wright
2e4c96f879
am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '7d7668330efa99bdab44e8cc4d240ae0e05a0abb':
Specify a device identifier for keyboard layout notification.
2014-09-26 04:29:22 +00:00
Alan Viverette
52128ecd61
am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
Correctly advertise accessibility scrolling actions
2014-09-26 01:30:43 +00:00
Alan Viverette
80c0bbe82c
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
2014-09-26 01:13:13 +00:00
Adam Powell
3f1ead4859
am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit '11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:30:50 +00:00
Eino-Ville Talvala
7e349a54f3
am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '040b417fd85a6b99ff53e4805be17ffde5f6a3c6':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-26 00:25:41 +00:00
Ruben Brunk
33451859d8
am 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit '5e312018e6188deb665a9a19950bad176345708a':
camera2: Fix null check in PictureCallback.
2014-09-26 00:25:16 +00:00
Paul Lawrence
1d1ebd7f98
am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
Fix pause when setting pin/pattern/password
2014-09-26 00:23:53 +00:00
Chris Wren
ae208ba9ce
am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '969cb2db770a44f1265dc57910edc3f58ae0fbbe':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-26 00:22:56 +00:00
Adam Powell
4967a73816
am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:16:26 +00:00
Adam Powell
a35c77aea6
Always show the name of the last used Home app in ResolverActivity
...
Bug 17629220
Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
2014-09-25 16:54:41 -07:00
Adrian Roos
f2be7170bf
am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
Ensure that setting an empty password clears it
2014-09-25 22:56:39 +00:00
Eino-Ville Talvala
c043b87d48
am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:56:36 +00:00
Adrian Roos
dc1fc7fc77
am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
Ensure that setting an empty password clears it
2014-09-25 22:47:25 +00:00
Eino-Ville Talvala
3517b1db4a
am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:47:21 +00:00
Adrian Roos
625e8f5959
Merge "Ensure that setting an empty password clears it" into lmp-dev
2014-09-25 22:42:43 +00:00
Michael Wright
b17ff6777d
am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
Specify a device identifier for keyboard layout notification.
2014-09-25 22:38:38 +00:00
Eino-Ville Talvala
c2c520950a
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
2014-09-25 22:36:59 +00:00
Michael Wright
e27380ac46
am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
2014-09-25 22:27:05 +00:00
Michael Wright
42dad80418
Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
2014-09-25 22:18:20 +00:00
Eino-Ville Talvala
efdd0cc832
am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-25 21:45:33 +00:00
Eino-Ville Talvala
845ea54c51
am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-25 21:34:40 +00:00
Eino-Ville Talvala
52571b9032
Camera2 Legacy: Clear JPEG ids when reconfiguring.
...
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.
Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13
Camera2 legacy: Improve robustness to camera service crashes
...
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.
Bug: 17587496
Change-Id: I6757961e7c0387defd368a13cb7c343950602400
2014-09-25 14:06:55 -07:00
Alan Viverette
947a969560
Correctly advertise accessibility scrolling actions
...
Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.
BUG: 17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
2014-09-25 12:43:47 -07:00
Ruben Brunk
b4e87c1128
am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
camera2: Fix null check in PictureCallback.
2014-09-25 19:40:58 +00:00
Ruben Brunk
4b6b2104ac
am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
2014-09-25 19:29:40 +00:00
Ruben Brunk
820a08a555
Merge "camera2: Fix null check in PictureCallback." into lmp-dev
2014-09-25 19:23:00 +00:00
Paul Lawrence
994ba63f89
am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
Fix pause when setting pin/pattern/password
2014-09-25 18:57:20 +00:00
Ruben Brunk
2c3d7c5f68
camera2: Fix null check in PictureCallback.
...
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
2014-09-25 11:48:27 -07:00
Paul Lawrence
809c1be06b
am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
2014-09-25 18:42:10 +00:00
Chris Wren
fa3f1232dd
am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-25 17:41:24 +00:00
Paul Lawrence
3a5a0be61e
Fix pause when setting pin/pattern/password
...
Move setting encryption pin/pattern/password into a separate thread
Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
2014-09-25 17:32:19 +00:00
Chris Wren
0a94bebf2e
am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-25 17:29:25 +00:00
Chris Wren
b698185929
Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
2014-09-25 17:21:32 +00:00
John Reck
1ffaabc4c9
am f04bc7e4: am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check
...
* commit 'f04bc7e4892bc6be7cc40f5525f5ddd037ec74b8':
Missing null check
2014-09-25 17:19:09 +00:00
Andre Eisenbach
196abec5e9
am 8ba97cf8: am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
...
* commit '8ba97cf8845e31103dbf14a7072760f5275b71ab':
Remove remanents of onConnectionCongested in framwork
2014-09-25 17:18:45 +00:00