Andrew Lee
921ec8056a
Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
2014-07-22 16:29:55 +00:00
Andrew Lee
1995a6b58b
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
...
This reverts commit 080b1f58eb877e1ac375768c6f951cc61a3cdbae.
Change-Id: I0dc963b3f4efe1479a7a94b8d851b89d15480d17
2014-07-22 22:42:10 +00:00
Andrew Lee
a93e06bd64
Don't throw RemoteException in public RemoteCallVideoClient APIs.
...
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Id666818b868c61f17b0701e4590d4e36f12c7b01
2014-07-22 12:09:38 -07:00
Christopher Tate
dcb7a9511c
Merge "Always check restore against the latest backend metadata" into lmp-dev
2014-07-22 16:29:55 +00:00
Winson Chung
dcfa7976fa
Intermediate refactoring to move towards in-app view transitions.
...
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code
Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
2014-07-22 22:25:33 +00:00
Christopher Tate
f7cbb1fc25
Always check restore against the latest backend metadata
...
Bug 16484934
Change-Id: I472a7db89a94b9804f6ea94c25da206dd111a497
2014-07-22 15:12:02 -07:00
Alex Klyubin
fcd8b20e09
Align PSKKeyManager with framework API style.
...
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.
Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
2014-07-22 19:51:34 +00:00
Christopher Tate
403f095c92
Merge "Handle single-package restores properly" into lmp-dev
2014-07-22 16:21:19 +00:00
Christopher Tate
a4e4d68f08
Handle single-package restores properly
...
Bug 16346405
Change-Id: I69e3288f5a9d68d818fad6a2cd4b27ad45c1007e
2014-07-22 23:42:48 +00:00
John Spurlock
0323bf7553
Merge "BatterySaver: Make the bars orange." into lmp-dev
2014-07-22 22:02:55 +00:00
John Spurlock
0ff62e0911
BatterySaver: Make the bars orange.
...
Bug:16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
2014-07-22 18:53:08 -04:00
Andrew Lee
8a01b05062
Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
2014-07-22 16:21:19 +00:00
Winson Chung
7ea62ba97b
Always enable HW layers on task views. (Bug 15986310)
...
- Use color filter to apply dim to the task view layer
- Fixing bug where you would see a flash of the task view when animating out of Recents.
2014-07-22 23:33:06 +00:00
RoboErik
b7c014c291
Move return out of debug conditional
...
Accidentally put the return for not sending volume changes into
the debug conditional.
bug:16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
2014-07-22 23:00:14 +00:00
Andrew Lee
8a57efb7eb
Don't throw RemoteException in public RemoteCallVideoClient APIs.
...
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Iaa049cab9e24120d3ea732e1ede78cc6fcd0ad71
2014-07-22 15:47:56 -07:00
Dianne Hackborn
db0f364c05
Merge "Use foreground broadcast to get device admin msg." into lmp-dev
2014-07-22 16:13:36 +00:00
Dianne Hackborn
8ddeee98b8
Use foreground broadcast to get device admin msg.
...
Using a background broadcast is bad, it can take a long
time to get the message back, either accidentally (backed up
behind other broadcasts) or from a deliberately malicious
admin.
Change-Id: Ib7491f8e27dacdc002562aef027ee4664e78e97b
2014-07-22 18:27:52 -07:00
Adam Lesinski
59abf5305b
Merge "Add test UsageStats App" into lmp-dev
2014-07-22 16:21:19 +00:00
Adam Lesinski
e159e2e0b8
Add test UsageStats App
...
Also fixed UsageStatsService to do the right thing
when AppOps returns MODE_DEFAULT.
Change-Id: I0bdb28350fb2528daf2859cdcbbf9ca48d96dde9
2014-07-22 18:21:58 -07:00
John Spurlock
79cac9d0f0
Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev
2014-07-22 22:02:49 +00:00
John Spurlock
333f8dd78f
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
...
And remove the alarm package whitelist now that deskclock
uses a category.
Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
2014-07-22 21:06:34 -04:00
Andrew Lee
8d7f8a253d
Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
2014-07-22 16:13:36 +00:00
Jason Long
1f630e6719
Merge "Switched Holo to Material for account chooser activities." into lmp-dev
2014-07-22 16:13:36 +00:00
Adrian Roos
1e1d6ac541
Kill flashlight when launching the camera from lockscreen
...
Bug: 16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
2014-07-22 22:01:29 +00:00
Adrian Roos
930aaa717e
QS: Hide flashlight tile if camera is busy
...
Currently behind a flag because the camera API for this not working
correctly yet.
Bug: 16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
2014-07-22 22:00:14 +00:00
Jason Long
193f049221
Switched Holo to Material for account chooser activities.
...
Change-Id: I6a44fb174eb4e981c37fca0836b103d7ee3f5ffe
2014-07-22 14:51:44 -07:00
Robin Lee
9c2be6c7ba
Stop double-loading device admins
...
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.
Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.
Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.
@bug 16416936
Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
2014-07-22 21:35:09 +00:00
Paul Soulos
2dcab18c6c
Adds ScrollBounds to the Transition framework
...
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
2014-07-22 14:17:48 -07:00
Alan Viverette
b97326f067
Make toolbarStyle public
...
BUG: 16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
2014-07-22 14:05:46 -07:00
Robert Ly
4df9575807
am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit 'c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
Doc change: add reminder for developers on using ad id.
2014-07-22 21:00:07 +00:00
David Friedman
2fe7d87074
am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 20:55:55 +00:00
Robert Ly
c12d7e3a3d
am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
Doc change: add reminder for developers on using ad id.
2014-07-22 20:53:20 +00:00
David Friedman
42dbe80914
am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 20:49:09 +00:00
Robert Ly
ff428e08a5
am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
...
* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
Doc change: add reminder for developers on using ad id.
2014-07-22 20:49:05 +00:00
David Friedman
af001f9410
am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
...
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
2014-07-22 20:45:11 +00:00
Scott Rowe
6b2f3ee3b9
am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
...
* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
2014-07-22 20:08:02 +00:00
Scott Rowe
2a922cb45a
am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
...
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
2014-07-22 20:03:19 +00:00
Andrew Solovay
0ff1ecd1ec
am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE
2014-07-22 19:08:45 +00:00
Andrew Solovay
3968ae0f70
am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE
2014-07-22 19:02:58 +00:00
Andrew Solovay
3a14c2890e
am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
docs: Removed reference to a sample notepad app.
2014-07-22 18:47:26 +00:00
Andrew Solovay
a2beba70b9
am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
docs: Removed reference to a sample notepad app.
2014-07-22 18:41:21 +00:00
Robert Ly
47495df6a6
am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
...
* commit 'fb8e254a1a66fc707a1c52d4cced699339f15685':
docs: update links and add new wear design materials
2014-07-22 17:18:52 +00:00
Robert Ly
817a31afa3
am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc
...
* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
docs: remove android translation plugin doc
2014-07-22 17:18:47 +00:00
Robert Ly
fb8e254a1a
am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
...
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
docs: update links and add new wear design materials
2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179
am 0b5f9c2f: docs: remove android translation plugin doc
...
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
docs: remove android translation plugin doc
2014-07-22 17:12:10 +00:00
Robert Ly
0b5f9c2f68
docs: remove android translation plugin doc
...
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
2014-07-22 17:07:12 +00:00
Baligh Uddin
d74d7397ef
am 43f783fd: (-s ours) Import translations. DO NOT MERGE
...
* commit '43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
Import translations. DO NOT MERGE
2014-07-22 16:48:12 +00:00
Baligh Uddin
43f783fd7e
Import translations. DO NOT MERGE
...
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
2014-07-22 16:39:39 +00:00
Justin Koh
e959e4a017
am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
...
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
Revert "Wait for all windows to draw before turning screen on"
2014-07-22 16:31:06 +00:00
Chris Craik
f23f5de173
Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
2014-07-22 16:21:19 +00:00