157285 Commits

Author SHA1 Message Date
Adam Lesinski
86641af81d am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a':
  AAPT: Fix issue with synthesized resource not actually showing up
2014-09-26 01:04:51 +00:00
Adam Lesinski
663a52d68a Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 2014-09-26 00:51:36 +00:00
Adam Powell
9cd82d061a 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:41 +00:00
Adam Powell
66f5a13f92 Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 2014-09-26 00:07:31 +00:00
Dianne Hackborn
b8b5bfcb1e am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev
* commit 'fcc42e8f3375a35dfc92af41fe9303359af84626':
  Fix issue #17661444: Persistent service not automatically restarted
2014-09-26 00:00:33 +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
Dianne Hackborn
f3ac946317 Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev 2014-09-25 23:53:14 +00:00
Dianne Hackborn
2ca21efdde Fix issue #17661444: Persistent service not automatically restarted
The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.

Now it is fixed.

Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
2014-09-25 16:46:50 -07:00
Svetoslav
e490dd0c02 am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '48ccf04368f65f7988bb589f9c29f94c77bbd549':
  Accessibility in bad state after using SDK tool uiautomatorviewer.
2014-09-25 23:44:58 +00:00
Tsuwei Chen
023838f9e2 am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'e6e4b2bfa3782f63ed0b4b802e5a9d59a6a48f49':
  Fix an incorrect behavior that failed AT&T privacy test.
2014-09-25 23:44:22 +00:00
Adrian Roos
40c632b931 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 23:44:18 +00:00
Eino-Ville Talvala
ed5e8d8ce3 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 23:44:14 +00:00
Michael Wright
99ef41c47c 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 23:44:08 +00:00
Svetoslav
471157821f Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev 2014-09-25 23:27:01 +00:00
Svetoslav
dd81183bbe Accessibility in bad state after using SDK tool uiautomatorviewer.
The UiAutormator tool is a part of the SDK. If it is run while
accessibility is enabled it stops all accessibility services
as it is an accessibility service itself to avoid interference
and when done restores back the accessibility state. The issue
was that the accessibility state is not restored leaving the
device in a bad state.

bug:17662770

Change-Id: I3c4f46fa05c76b874eeffdeb867ef433c3fedf2e
2014-09-25 15:56:31 -07:00
Tsuwei Chen
43d5d89678 Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev 2014-09-25 22:43:04 +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
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
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
Tsuwei Chen
566ebfde2b Fix an incorrect behavior that failed AT&T privacy test.
Bug: 17278951

Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264
2014-09-25 14:53:54 -07:00
Eino-Ville Talvala
77fe9eddeb am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
  Camera2 legacy: Improve robustness to camera service crashes
2014-09-25 21:35:15 +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
4f79d73d26 am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '21662c96fa9d107a60f4ce98f7179264c972b142':
  Cut ripple background alpha in half
2014-09-25 20:23:50 +00:00
Alan Viverette
9f0b7db924 am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev
* commit '00660f66ef0344698551c88c0f26663f70e31b5e':
  Fix "Always apply window insets to action modes"
2014-09-25 20:15:40 +00:00
Svetoslav
4f5a95a0f8 am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '85daf4f04ade8a5d85eab70e63cd184dcb760501':
  Accessibility events may be fired even if no services observe them.
2014-09-25 20:15:36 +00:00
Alan Viverette
33ae07ab81 Merge "Cut ripple background alpha in half" into lmp-dev 2014-09-25 20:14:34 +00:00
Alan Viverette
314dc4c553 Merge "Fix "Always apply window insets to action modes"" into lmp-dev 2014-09-25 20:11:28 +00:00
Svetoslav
57ce30ddfe Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 2014-09-25 20:06:20 +00:00
Alan Viverette
8bdb442703 Cut ripple background alpha in half
Ripple alpha is supposed to be split evenly between the foreground
ripple layer and the background layer, but the background alpha wasn't
getting adjusted properly.

BUG: 17658817
Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
2014-09-25 13:06:03 -07:00
Chris Wren
a20edb6d61 am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '2eb3b974ab5c1f7f1ca79410ea54026f58e35c07':
  Allow longer translations in the notification actions.
2014-09-25 19:59:01 +00:00
Chris Wren
91807556a8 Merge "Allow longer translations in the notification actions." into lmp-dev 2014-09-25 19:50:33 +00:00
Ruben Brunk
26a809b595 am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
  camera2: Fix null check in PictureCallback.
2014-09-25 19:33:18 +00:00
Amith Yamasani
25c65cb932 am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '95548b395d681b0ecfef341058f282f624ae3862':
  Fix GPS icon not showing for secondary users
2014-09-25 19:33:13 +00:00
Dan Albert
3a86b84f23 am c20a4bd1: (-s ours) am d7baaed8: Merge "Allow AOSP to boot."
* commit 'c20a4bd1a422663bb5ec8cd84c5a8bdd0476bb95':
  Allow AOSP to boot.
2014-09-25 19:24:20 +00:00
Ruben Brunk
820a08a555 Merge "camera2: Fix null check in PictureCallback." into lmp-dev 2014-09-25 19:23:00 +00:00
John Spurlock
d1694001c9 am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '0dccf597f10fd0dc755f42514c470d447c820b20':
  Supertoast when user changes zen mode.
2014-09-25 19:20:13 +00:00
Amith Yamasani
91dcf1f93c Merge "Fix GPS icon not showing for secondary users" into lmp-dev 2014-09-25 19:18:24 +00:00
John Spurlock
cf4ef82007 Merge "Supertoast when user changes zen mode." into lmp-dev 2014-09-25 19:08:40 +00:00
John Spurlock
27c7b9295d Supertoast when user changes zen mode.
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.

Also fix a recent regression in the zen subhead alignment.

Bug:16215680
Bug:17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
2014-09-25 15:04:32 -04:00
Dan Albert
c20a4bd1a4 am d7baaed8: Merge "Allow AOSP to boot."
* commit 'd7baaed89e498ad3cf7d9c487d6cae967e562ea4':
  Allow AOSP to boot.
2014-09-25 19:00:34 +00:00
Dan Albert
d7baaed89e Merge "Allow AOSP to boot." 2014-09-25 18:50:18 +00:00
Ruben Brunk
2c3d7c5f68 camera2: Fix null check in PictureCallback.
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
2014-09-25 11:48:27 -07:00
Dan Albert
e08bd64184 Allow AOSP to boot.
HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.

Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
2014-09-25 11:48:11 -07:00
Paul Lawrence
f0eed92b04 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:46:17 +00:00
RoboErik
16404773d7 am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '504752fb3833a90f4a226a2027939cb972cb8a9b':
  Ensure MediaBrowser state is set to connecting after a reconnect
2014-09-25 18:46:13 +00:00
RoboErik
96900279f5 am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
  Allow null queues to be set in MediaSession
2014-09-25 18:46:09 +00:00
Paul Lawrence
99cee61cbc Merge "Fix pause when setting pin/pattern/password" into lmp-dev 2014-09-25 18:33:54 +00:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00