148183 Commits

Author SHA1 Message Date
Jinsuk Kim
977522923e am 8d3573f9: am f2576672: am 8ac689e5: CEC: Make deviceSelect to active device a no-op
* commit '8d3573f9758c43204593f521ebefbb1a781411e0':
  CEC: Make deviceSelect to active device a no-op
2014-08-06 12:09:17 +00:00
Svetoslav
3cb3eaa849 am fd0ed690: (-s ours) am 37c40828: am 8cd27c3c: Allow adding widgets from user profiles.
* commit 'fd0ed6904c13a1c48577c1ca5c2b5f9743efbe2d':
  Allow adding widgets from user profiles.
2014-08-06 12:09:13 +00:00
Svetoslav
39999cf026 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

(cherrypicked 8cd27c3c to work around Gerrit issue)

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-06 11:01:36 +01:00
Alex Light
8a0ee34c70 resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)

Change-Id: I6cf110d3b7668aa5498529c7e58ef57ddc08c332
2014-08-05 22:13:29 -07:00
John Reck
a254db60ac am 7ca25426: am d94b2920: am cac76d0b: roundOut layer damage
* commit '7ca254267b556142dd838d3480f8005f2e4a46a5':
  roundOut layer damage
2014-08-06 01:48:10 +00:00
Jon Eklund
e6e29857c3 am a0ba8e83: am 2a3c797f: am db9e7f0a: Add support for line out audio device
* commit 'a0ba8e8389f956fd99ff35755b48bb8cdd0b4247':
  Add support for line out audio device
2014-08-06 01:47:49 +00:00
Michael Wright
4c6d271559 am d5a3986c: am a95bae94: am c241724e: Ensure backup schedule file is closed.
* commit 'd5a3986c8fc480dd89bb20c155d1e9f8d23cebfe':
  Ensure backup schedule file is closed.
2014-08-06 01:47:40 +00:00
Eric Laurent
60b4966aba am d18d2782: am 238de6e0: am 7b8c0c55: Merge "SoundTrigger API update." into lmp-dev
* commit 'd18d2782e97dad42ec54962ff006d1710a5b28ab':
  SoundTrigger API update.
2014-08-06 01:47:36 +00:00
ztenghui
21e06fd368 am e9bc62f3: am 5685b94e: am c4924092: Update the system linear progress bar
* commit 'e9bc62f38dec40600adc8f678c61ad1a15233cfc':
  Update the system linear progress bar
2014-08-06 01:47:26 +00:00
Jorim Jaggi
4744cb47fb am e9f4dfca: am 6c0401b7: am eb620ff6: Fix not being able to dismiss panel with single tap
* commit 'e9f4dfca17c3b1dc98d942949781b4eb212cddad':
  Fix not being able to dismiss panel with single tap
2014-08-06 01:47:16 +00:00
Jorim Jaggi
cb0bd80d91 am 1b02a89a: am 129cdc8f: am 55328ffd: Navbar scrim when in QS
* commit '1b02a89a40fc0a30567c55432ae89b7c551e9342':
  Navbar scrim when in QS
2014-08-06 01:47:12 +00:00
Craig Mautner
e8ae71d483 am 498883d4: am 0347f4ed: am 7e7f2b4d: Use actual number of packages rather than getCount()
* commit '498883d4f21b8525973aefa30cadcde7e3d1684b':
  Use actual number of packages rather than getCount()
2014-08-06 01:47:07 +00:00
Santos Cordon
ac421d6fe9 am 66b6a8d1: am 447ac541: am bf29f3a6: Merge "Revert "Make Connection threadsafe"" into lmp-dev
* commit '66b6a8d12e10aa6a542f680abc8ae591068394da':
  Revert "Make Connection threadsafe"
2014-08-06 01:47:02 +00:00
Jorim Jaggi
b318991a89 am 87495307: am 316e55fa: am bbfc9080: Show bouncer if secure camera would show chooser.
* commit '8749530795d48aaf2226c249192c89ff69c12d43':
  Show bouncer if secure camera would show chooser.
2014-08-06 01:46:42 +00:00
Jeff Sharkey
e0973f6fad am 05811075: am 79630aa6: am 4d45d164: Scan after writing external storage files.
* commit '05811075dd58bf63470ae1149dcabc2869e61003':
  Scan after writing external storage files.
2014-08-06 01:46:27 +00:00
Chris Craik
419a01227f am cc8a7796: am c49c19cd: am c48b90be: Move clip bound execution into drawChild()
* commit 'cc8a779654963674fe07cb2b6fee219a10fcc145':
  Move clip bound execution into drawChild()
2014-08-06 01:46:21 +00:00
Jinsuk Kim
bbc73a442d am f2576672: am 8ac689e5: CEC: Make deviceSelect to active device a no-op
* commit 'f257667206c529d595932bea62c42d467e63248f':
  CEC: Make deviceSelect to active device a no-op
2014-08-05 21:16:18 +00:00
Jinsuk Kim
4f1eb6b604 am 8ac689e5: CEC: Make deviceSelect to active device a no-op
* commit '8ac689e556d171467a8b4e1c3875b8624b67a63a':
  CEC: Make deviceSelect to active device a no-op
2014-08-05 21:09:55 +00:00
Svetoslav
1613081477 am 37c40828: am 8cd27c3c: Allow adding widgets from user profiles.
* commit '37c408288951755c46c3cdf9920dec2018a502a6':
  Allow adding widgets from user profiles.
2014-08-05 21:08:21 +00:00
Svetoslav
b13075e332 am 8cd27c3c: Allow adding widgets from user profiles.
* commit '8cd27c3c20e59088a2a26f9a05307d17c949ce58':
  Allow adding widgets from user profiles.
2014-08-05 21:05:25 +00:00
Jinsuk Kim
58500f43ec CEC: Make deviceSelect to active device a no-op
Changing input to already the active source should return
immediately without initiating routing control. This is also required
for processing the incoming <Active Source>

Also set the flag in intent for input change to start a new
activity from a service. The service fails to launch an activity
without it.

Bug: 15570939
Change-Id: I9b20b31137dfa4dc847bc43cc7fd35e669d0dec7
2014-08-05 21:04:44 +00:00
John Reck
ad6326449e am d94b2920: am cac76d0b: roundOut layer damage
* commit 'd94b29208e4cf34773c925b257baa21e068eb02d':
  roundOut layer damage
2014-08-05 21:04:13 +00:00
John Reck
a89d3538ec am cac76d0b: roundOut layer damage
* commit 'cac76d0becf19b9aeaf931a65625f36625bce839':
  roundOut layer damage
2014-08-05 21:01:11 +00:00
Svetoslav
976e8bd201 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-05 20:57:20 +00:00
John Reck
c79eabcd3c roundOut layer damage
Bug: 16734708

Change-Id: I8815b7cf5f74be6deda98aaaf7cde85509def373
2014-08-05 20:54:28 +00:00
Jon Eklund
7cf8054ef9 am 2a3c797f: am db9e7f0a: Add support for line out audio device
* commit '2a3c797fff5d635cf7a96be5793121a6683f45ab':
  Add support for line out audio device
2014-08-05 20:35:43 +00:00
Jon Eklund
8faa99af0b am db9e7f0a: Add support for line out audio device
* commit 'db9e7f0af28b13e96151fc055ea3149867dd97a0':
  Add support for line out audio device
2014-08-05 20:31:47 +00:00
Jon Eklund
43cc8bbbbd Add support for line out audio device
Change-Id: I48750511b56a2bc5f06b7bdd11cfb4e0cd2728af
2014-08-05 20:27:40 +00:00
Michael Wright
f6982378f1 am a95bae94: am c241724e: Ensure backup schedule file is closed.
* commit 'a95bae941cbab351dad6c2b4f0d282e86d0979d6':
  Ensure backup schedule file is closed.
2014-08-05 20:08:06 +00:00
Michael Wright
f06f24047f am c241724e: Ensure backup schedule file is closed.
* commit 'c241724e37b5f4bcc6f26cf25654cfdb3fd4ab1f':
  Ensure backup schedule file is closed.
2014-08-05 20:04:24 +00:00
Eric Laurent
9216b2f4f1 am 238de6e0: am 7b8c0c55: Merge "SoundTrigger API update." into lmp-dev
* commit '238de6e0b4b30be848cde7ed8f8fe903461c1689':
  SoundTrigger API update.
2014-08-05 20:03:53 +00:00
Eric Laurent
49cdf572eb am 7b8c0c55: Merge "SoundTrigger API update." into lmp-dev
* commit '7b8c0c55178e668276dd8f6a02c920a3e9da9163':
  SoundTrigger API update.
2014-08-05 20:00:06 +00:00
Michael Wright
46db93404b Ensure backup schedule file is closed.
Change-Id: Ie4a62cda74815c67c62fb08e8df25a71d6102d4c
2014-08-05 19:58:27 +00:00
ztenghui
a77f0ed251 am 5685b94e: am c4924092: Update the system linear progress bar
* commit '5685b94ef4c018182422665d1c90c4c7026032a2':
  Update the system linear progress bar
2014-08-05 19:54:46 +00:00
ztenghui
d19461709a am c4924092: Update the system linear progress bar
* commit 'c492409264038d593514a88cf8ffb8b9fed59fc5':
  Update the system linear progress bar
2014-08-05 19:50:18 +00:00
ztenghui
af8a8f3a7d Update the system linear progress bar
bug:14622065

Change-Id: Ic08022d934763ba0cc6067af3e50c4afeb8a0e9e
2014-08-05 19:46:36 +00:00
Jorim Jaggi
f02dbc6aa2 am 6c0401b7: am eb620ff6: Fix not being able to dismiss panel with single tap
* commit '6c0401b7ebb5741572aee47192ba65903fefd60d':
  Fix not being able to dismiss panel with single tap
2014-08-05 19:35:29 +00:00
Jorim Jaggi
29f4b56640 am 129cdc8f: am 55328ffd: Navbar scrim when in QS
* commit '129cdc8fc748d3df45b3a66313dc2bc8d6801c7e':
  Navbar scrim when in QS
2014-08-05 19:31:30 +00:00
Jorim Jaggi
cb21fe9da7 am eb620ff6: Fix not being able to dismiss panel with single tap
* commit 'eb620ff614ed94d06a3f8395b4b873f30aeb5a08':
  Fix not being able to dismiss panel with single tap
2014-08-05 19:30:59 +00:00
Jorim Jaggi
4e421c01cd am 55328ffd: Navbar scrim when in QS
* commit '55328ffd74ad65e9ae0053f09751911f09ae5b85':
  Navbar scrim when in QS
2014-08-05 19:26:57 +00:00
Jorim Jaggi
488b792eee Fix not being able to dismiss panel with single tap
Bug: 16562847
Change-Id: Ic409b9dd23df7e79a20b83a8a63eaaf1f76b3dd0
2014-08-05 19:26:13 +00:00
Jorim Jaggi
dd5b88684d Navbar scrim when in QS
Bug: 16644711
Change-Id: I91d823671919068500a29878f3dfe9b481000a58
2014-08-05 19:22:53 +00:00
Craig Mautner
2b457e5149 am 0347f4ed: am 7e7f2b4d: Use actual number of packages rather than getCount()
* commit '0347f4edda3dc237b9e07e704c0edafa590851db':
  Use actual number of packages rather than getCount()
2014-08-05 19:21:02 +00:00
Santos Cordon
fd03c50619 am 447ac541: am bf29f3a6: Merge "Revert "Make Connection threadsafe"" into lmp-dev
* commit '447ac541bb27c848c804bb27f7735122d086cfb0':
  Revert "Make Connection threadsafe"
2014-08-05 19:20:58 +00:00
Craig Mautner
405c001ee9 am 7e7f2b4d: Use actual number of packages rather than getCount()
* commit '7e7f2b4de003bd5aeef04500025cb2bc34e6df28':
  Use actual number of packages rather than getCount()
2014-08-05 19:16:18 +00:00
Santos Cordon
62e4024922 am bf29f3a6: Merge "Revert "Make Connection threadsafe"" into lmp-dev
* commit 'bf29f3a6c161b5e3de072a577deb5db33082039b':
  Revert "Make Connection threadsafe"
2014-08-05 19:16:07 +00:00
Craig Mautner
1c8eb5e3d0 Use actual number of packages rather than getCount()
The ResolverActivity method getCount() returns the number of
entries below the default entry, not the total number of entries.
But the onCreate() method expected the getCount() method to
return the total number of entries. This change provides the total
to onCreate().

Fixes bug 16800358.

Change-Id: I3915c3d5ad642e31d7248226fc91bd4047f16b2d
2014-08-05 19:11:59 +00:00
Jorim Jaggi
e241a9f4bf am 316e55fa: am bbfc9080: Show bouncer if secure camera would show chooser.
* commit '316e55fa53bf585ae419cd81efc6ccd9d432af9e':
  Show bouncer if secure camera would show chooser.
2014-08-05 18:58:08 +00:00
Jorim Jaggi
276043921b am bbfc9080: Show bouncer if secure camera would show chooser.
* commit 'bbfc9080a81824089f569cadae1e3927c60bc18d':
  Show bouncer if secure camera would show chooser.
2014-08-05 18:54:18 +00:00
Jorim Jaggi
781c29c9a8 Show bouncer if secure camera would show chooser.
Bug: 16570873
Change-Id: I2a86fb3a823d5255c0c35a78c1832c273e3a1578
2014-08-05 18:47:54 +00:00