Amith Yamasani
01fa2ec823
am 604af1a6: am a41b17ac: am 41179448: Merge "Allow phone UID to export singleton providers" into lmp-dev
...
* commit '604af1a6212ccfe1deb7cb4c2cb1cb13154cf255':
Allow phone UID to export singleton providers
2014-08-06 17:35:29 +00:00
Jorim Jaggi
a6f0cd9fa9
am 5081fd82: am 099a6456: am 9e4cd23c: Allow closing the whole panel when QS is open
...
* commit '5081fd82d8964bb8a9d0a7be830c907ea62431da':
Allow closing the whole panel when QS is open
2014-08-06 17:35:24 +00:00
Jorim Jaggi
211bbf2d93
am 23c6fa93: am bd87e7aa: am e30c6958: Edge swipes should also dismiss notifications
...
* commit '23c6fa932ae900d347bcd17e5038e8f7acd9be8b':
Edge swipes should also dismiss notifications
2014-08-06 17:35:20 +00:00
Michael Wright
814228c186
am 0a00c223: am 23ffdccf: am 0bfcf09a: Mark all Meta combos as system combos
...
* commit '0a00c22343aa305a91199c733c34c79d16369bed':
Mark all Meta combos as system combos
2014-08-06 17:35:15 +00:00
John Spurlock
cb9d8b76ff
am 3ec91293: am 6cbe01e8: am 5af0c665: Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev
...
* commit '3ec91293966ddfe77146bca8e38d37ea509d333b':
AudioService: getMasterStreamType -> RING on tablets.
2014-08-06 17:35:11 +00:00
Chris Craik
c5041b0015
am 1f94ead4: am 2ca8f04a: am e97563cd: Fix large radius RR clipping issue on certain devices
...
* commit '1f94ead4269e1591b5c70e434a754d9c7f5d896a':
Fix large radius RR clipping issue on certain devices
2014-08-06 17:34:48 +00:00
Sandeep Siddhartha
1ea615c8df
am dfa94cdc: am e1516d4d: am d5099116: Merge "Use @IntDef for manage actions" into lmp-dev
...
* commit 'dfa94cdcec692ccc911a1c416e4c4a98db84c3c4':
Use @IntDef for manage actions
2014-08-06 17:34:29 +00:00
Svetoslav
17cfc1eadd
am faa64c9c: am 49ffe9f3: am dd80c02a: Merge "Fix build" into lmp-dev
...
* commit 'faa64c9c85ad7c79d92b9c6efe62a9c295c0fa62':
Fix build
2014-08-06 17:34:20 +00:00
Jae Seo
f21ae3cf05
am 20d13a65: am 808f4741: am 98846b0f: Merge "TIF: Make selected tracks identifiable" into lmp-dev
...
* commit '20d13a653802e132f311a2f9de6a147a34b9f518':
TIF: Make selected tracks identifiable
2014-08-06 17:34:10 +00:00
Brian Carlstrom
25137cd0f8
am d1fd5185: am e7233148: am e7f925aa: Switch from core to core-libart
...
* commit 'd1fd51853bb3466a8f65df8f18b26f757e3dc477':
Switch from core to core-libart
2014-08-06 17:33:49 +00:00
Hui Shu
09fb5b9447
am 6c32afd6: (-s ours) am ec631675: am 70026f30: DO NOT MERGE: Revert "Update makefile for clang host build."
...
* commit '6c32afd60cdcf8093262b77c7703b94aea909295':
DO NOT MERGE: Revert "Update makefile for clang host build."
2014-08-06 17:25:51 +00:00
Geoff Mendal
9ef53acca3
Merge "Import translations. DO NOT MERGE"
2014-08-06 17:14:55 +00:00
Geoff Mendal
2694e034c9
Import translations. DO NOT MERGE
...
Change-Id: I502ce2560c7c81c0deeefc9d66710464ab29c2c3
Auto-generated-cl: translation import
2014-08-06 10:13:55 -07:00
Deepanshu Gupta
a103b8554f
am 050017ae: am 3276147b: am 094fdd26: Merge "Get filename from File faster" into lmp-dev
...
* commit '050017ae8a51d17de06cc62b5048dc04b0a05e40':
Get filename from File faster
2014-08-06 12:11:04 +00:00
RoboErik
b37bbc6c40
am 143fcc42: am a5281929: am 23d078e3: Add display metadata and change strings to CharSequences
...
* commit '143fcc42a51f70ce5d9d28b1779ace4c61ddc6e0':
Add display metadata and change strings to CharSequences
2014-08-06 12:10:38 +00:00
Brian Carlstrom
82dcd6eacd
am 25cb8cbd: Merge "resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
...
* commit '25cb8cbdd882e1e37cf303ec3a113bd247867854':
Make system use patchoat to relocate during runtime.
2014-08-06 12:10:33 +00:00
Deepanshu Gupta
b77c6fc5c8
am 4c0c0231: am 1325946f: am 777fcc25: Skip loading otf fonts on Java 6
...
* commit '4c0c02314495e70f0deab166280c40b83c7efefa':
Skip loading otf fonts on Java 6
2014-08-06 12:10:15 +00:00
Deepanshu Gupta
58d7145b7a
am ff296519: am 186090a0: am 167bc25b: Add SystemProperties native method implementations.
...
* commit 'ff296519b1987f80b21fc1f8e59e830888911f06':
Add SystemProperties native method implementations.
2014-08-06 12:10:11 +00:00
Deepanshu Gupta
082c4080a1
am e4d8bc7a: am 40bae7f0: am 760f6394: LayoutLib: Use ICU\'s line break algo.
...
* commit 'e4d8bc7a118180544eecc7d158ea1efed1ad0e4e':
LayoutLib: Use ICU's line break algo.
2014-08-06 12:10:07 +00:00
Michael Wright
62c06ecb66
am 0aade803: am e94f3851: am c9938987: Add resize method for virtual displays
...
* commit '0aade8038390179070bf94683fb20ff797db1adf':
Add resize method for virtual displays
2014-08-06 12:10:01 +00:00
Jinsuk Kim
d12ba698fd
am ff49355d: am 8b0727e7: am 5f5c1abc: Merge "CEC: Make port info unmodifiable" into lmp-dev
...
* commit 'ff49355d8d7dfa69d587dd0e108ca53f30fd5614':
CEC: Make port info unmodifiable
2014-08-06 12:09:27 +00:00
John Reck
16f1fe2ceb
am a55a0667: am 4e51bc74: am 70a60cc4: Merge "Add Bitmap.compress to TRACE_TAG_RESOURCES" into lmp-dev
...
* commit 'a55a066759ba71d89f0ab80d443a34aa3e4226f9':
Add Bitmap.compress to TRACE_TAG_RESOURCES
2014-08-06 12:09:22 +00:00
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
Amith Yamasani
d4648d2756
am a41b17ac: am 41179448: Merge "Allow phone UID to export singleton providers" into lmp-dev
...
* commit 'a41b17ac15b24408a0ceb494b6ff81285977618a':
Allow phone UID to export singleton providers
2014-08-06 00:33:06 +00:00
Jorim Jaggi
5de44dcb5b
am 099a6456: am 9e4cd23c: Allow closing the whole panel when QS is open
...
* commit '099a64560876d7a79221c710d5f737c3b8ad3887':
Allow closing the whole panel when QS is open
2014-08-06 00:33:00 +00:00
Jorim Jaggi
7f04b9d629
am bd87e7aa: am e30c6958: Edge swipes should also dismiss notifications
...
* commit 'bd87e7aa0b261df52efe9a0624989eea4debd73c':
Edge swipes should also dismiss notifications
2014-08-06 00:32:56 +00:00
Michael Wright
c662189e9a
am 23ffdccf: am 0bfcf09a: Mark all Meta combos as system combos
...
* commit '23ffdccf1d21dca82525749fd8fde31e7b78d315':
Mark all Meta combos as system combos
2014-08-06 00:32:51 +00:00
John Spurlock
afbab8538f
am 6cbe01e8: am 5af0c665: Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev
...
* commit '6cbe01e84053fd8dcf1713c36e00a96c14233919':
AudioService: getMasterStreamType -> RING on tablets.
2014-08-06 00:32:29 +00:00
Amith Yamasani
50982b60b2
am 41179448: Merge "Allow phone UID to export singleton providers" into lmp-dev
...
* commit '4117944897d3e4e8abbdbac253c4e123f914f4b7':
Allow phone UID to export singleton providers
2014-08-05 23:09:48 +00:00
Jorim Jaggi
7e0ba7a4b2
am 9e4cd23c: Allow closing the whole panel when QS is open
...
* commit '9e4cd23c720bbec25b11c82441807eafc809958e':
Allow closing the whole panel when QS is open
2014-08-05 23:05:32 +00:00
Jorim Jaggi
84ea430c77
am e30c6958: Edge swipes should also dismiss notifications
...
* commit 'e30c69580a0573578a84a21967ae6fd6bd0f2032':
Edge swipes should also dismiss notifications
2014-08-05 23:05:28 +00:00
Michael Wright
a31a41b1bd
am 0bfcf09a: Mark all Meta combos as system combos
...
* commit '0bfcf09a260681d374ca89f63c0deae45815a928':
Mark all Meta combos as system combos
2014-08-05 23:05:23 +00:00
Jorim Jaggi
e0640dd524
Allow closing the whole panel when QS is open
...
If the user drags below the notifications, we close everything. Only
implemented for the SHADE, and not on Keyguard because of
time constraints.
Bug: 15414856
Change-Id: I4cf656484bc1217d552211c2bfdd7598eb52dad7
2014-08-05 23:01:56 +00:00
Jorim Jaggi
28f0e59329
Edge swipes should also dismiss notifications
...
To prevent falsing with phone/camera affordance.
Bug: 16571057
Change-Id: I5da5efc5529af8211357b556f1db4858e8775e05
2014-08-05 23:01:34 +00:00
Michael Wright
ce0c13a169
Mark all Meta combos as system combos
...
Also make a meta-tab a recents accelerator.
Bug: 14066931
Change-Id: Iac6aab276e4e16d5f70c92a5a03172bd81559afa
2014-08-05 23:01:15 +00:00