Eino-Ville Talvala
346bc968f9
Merge "Don\'t use timestamps with all zero" am: 9574e58027 am: be1a3f8b66
...
am: 7ca29b3ea2
* commit '7ca29b3ea287883c1c55c62a0e654a87cc81b75d':
Don't use timestamps with all zero
2015-11-17 23:21:29 +00:00
Sanket Padawe
d93fe21662
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78
...
am: 3bc8979d74
* commit '3bc8979d74e8a6c9e0a1c52031bfd0a810bccd1a':
2015-11-17 23:20:08 +00:00
Deepanshu Gupta
433f072cac
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
...
am: ce400cd75e
* commit 'ce400cd75e1e1a90c0b4da4de90d7314fd21dca8':
2015-11-17 23:18:50 +00:00
Michael Kwan
b7fa400367
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours
...
am: 6881185307 -s ours
* commit '6881185307c4f582996fb3a7792453b06857bebb':
2015-11-17 23:17:24 +00:00
Eino-Ville Talvala
d9f32c9f4c
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9
...
am: f5b98ee1dc
* commit 'f5b98ee1dc05c2f9be839c56bf6e90bff99807bc':
2015-11-17 23:16:02 +00:00
Alex Klyubin
8f49178b8f
Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f
...
am: 00245ffce4
* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
Insert Android Keystore JCA Provider at the correct position.
2015-11-17 23:14:38 +00:00
Erik Wolsheimer
39d554b7aa
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2015-11-17 23:13:36 +00:00
Erik Wolsheimer
c088a4b995
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
...
am: 2fba776ee0
* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
2015-11-17 23:13:07 +00:00
Erik Wolsheimer
ee25341a9f
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
...
am: 2fba776ee0
* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
2015-11-17 23:11:59 +00:00
Mark Salyzyn
a8d18e8580
Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 am: c53dad8d16
...
am: 45f88d02de
* commit '45f88d02deb8b78f72b7315b5d42567639ad7ece':
Revert "jni: is loggable speedup, not within signal"
2015-11-17 23:10:30 +00:00
Geoff Mendal
46595c4c4f
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
...
am: c94a189e5f -s ours
* commit 'c94a189e5f9ca87fdd314cae3c24c50aacf231dc':
2015-11-17 23:09:06 +00:00
Calin Juravle
8d40c367b0
Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am: e20120031f
...
am: c3a70ce001
* commit 'c3a70ce0015e9117268040378c6adb6239ead897':
Remove obsolete profile handling from AndroidRuntime.
2015-11-17 23:07:36 +00:00
Chris Craik
9ecf4da6bc
Merge "Add temporary layer alpha fallback to OpReorderer"
2015-11-17 22:53:40 +00:00
Chris Craik
8ecf41c61a
Add temporary layer alpha fallback to OpReorderer
...
Also adds logic to clip temporary layers to viewport both for
efficiency and to allow large ones (such as the fallback case) to fit
in max texture size.
Change-Id: Iee51495220f5ca1dc7e6f5fd3615db2e896efd74
2015-11-17 14:50:49 -08:00
Julia Reynolds
054c5dcf4a
Notifications can only have 1 topic.
...
Change-Id: Id0ab6bca352b969431d4ba68167074e514a98980
2015-11-17 17:13:13 -05:00
Makoto Onuki
a87401054f
Merge "Allow PO to clear password even if the same apk has DA"
2015-11-17 22:11:20 +00:00
Makoto Onuki
c2f521a7d8
Allow PO to clear password even if the same apk has DA
...
Bug 25645900
Change-Id: I7d2d9fbf6a4dc65ac63fb14e6ee6b9abc1f1c0e7
2015-11-17 14:10:12 -08:00
Alan Viverette
baf7b9adf4
Merge "Use correct rounding in View for potentially negative values"
2015-11-17 21:44:14 +00:00
Wale Ogunwale
261eda26d9
Merge changes Id86e9773,I682afe1b
...
* changes:
Moved BackdropFrameRenderer from NonClientDecorView to its own class file
Moved management of NonClientDecorView from PhoneWindow to DecorView
2015-11-17 21:26:59 +00:00
Julia Reynolds
e122d30557
Merge "Allow DND mode to suppress visual interruptions."
2015-11-17 21:16:05 +00:00
Julia Reynolds
f612869ae1
Allow DND mode to suppress visual interruptions.
...
Bug: 25423508
Change-Id: Idd8242e4bc00a749dbe0b5503c458375fc017072
2015-11-17 21:10:36 +00:00
Deepanshu Gupta
e4826981f2
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126
...
am: 606e5a0c56
* commit '606e5a0c562a461919e90ddf1e41036d926c9716':
LayoutLib: IntelliJ changed project files.
2015-11-17 20:43:02 +00:00
Michael Wright
fe882edc12
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 am: cd00ba1a71
...
am: 526c98cb7f -s ours
* commit '526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 20:41:30 +00:00
Deepanshu Gupta
606e5a0c56
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
...
am: e45abdb126
* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
LayoutLib: IntelliJ changed project files.
2015-11-17 20:24:20 +00:00
Wale Ogunwale
0b3562db3e
Moved BackdropFrameRenderer from NonClientDecorView to its own class file
...
Bug: 24810450
Change-Id: Id86e97733161499bbc59617433792f5ddc4e7f9e
2015-11-17 12:19:45 -08:00
Deepanshu Gupta
e45abdb126
LayoutLib: IntelliJ changed project files. am: 22931224d9
...
am: 66840955d8
* commit '66840955d817b2ca42a4a573dd9186b5ad5b25aa':
LayoutLib: IntelliJ changed project files.
2015-11-17 20:06:20 +00:00
Deepanshu Gupta
66840955d8
LayoutLib: IntelliJ changed project files.
...
am: 22931224d9
* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
LayoutLib: IntelliJ changed project files.
2015-11-17 19:51:52 +00:00
Michael Wright
526c98cb7f
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719
...
am: cd00ba1a71
* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 19:51:50 +00:00
Winson Chung
e73f6141c5
Merge "Fixing some Recents landscape issues."
2015-11-17 19:51:02 +00:00
Alan Viverette
3f7191962d
Merge "Update the TimePicker hour format when toggling 24-hour mode"
2015-11-17 19:47:31 +00:00
Deepanshu Gupta
22931224d9
LayoutLib: IntelliJ changed project files.
...
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
2015-11-17 11:37:35 -08:00
Winson
a2236f11c6
Fixing some Recents landscape issues.
...
- Tasks were drawing under the navigation in landscape since we did
not account for the nav bar space
- Fixing issue with tiny tasks in landscape
- Fixing issue where pooled views were not being measured or laid out
after resizing.
- Fixing issue where the stack scroll would have out of bounds when
tasks were resized (we animate them into bounds)
Change-Id: Id301dc6891e7ff2692cb040a7df1a5a854ac84a3
2015-11-17 19:30:23 +00:00
Winson
c742f973b1
Adding tuner param to enable fast-toggling.
...
- Moving constants to a more explicit flags class, which also handles
tuner changes.
- Removing some unused flags
Change-Id: If370581d431784f606c4b8d0c0face5b9a4b9fad
2015-11-17 19:26:46 +00:00
Michael Wright
cd00ba1a71
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7
...
am: e2af036719
* commit 'e2af0367193332e340a759eae7dc37c5342fbc01':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 19:14:01 +00:00
Dianne Hackborn
8958c1effb
Merge "Initial stab at background check."
2015-11-17 19:13:32 +00:00
Svetoslav Ganov
fc1a1bad33
Merge "Don't grant runtime permissions on install to legacy apps"
2015-11-17 19:08:34 +00:00
Michael Wright
e2af036719
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab
...
am: 053f241cc7
* commit '053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 19:05:20 +00:00
Michael Wright
053f241cc7
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0
...
am: c73255d8ab
* commit 'c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 18:57:03 +00:00
Michael Wright
c73255d8ab
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71
...
am: 313c7b2ee0
* commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 18:49:32 +00:00
Wale Ogunwale
0d7e912b00
Moved management of NonClientDecorView from PhoneWindow to DecorView
...
Bug: 24810450
Change-Id: I682afe1b15cb8ec1f98b38b88a499243d4c6c8a3
2015-11-17 10:45:06 -08:00
Michael Wright
313c7b2ee0
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
...
am: 4aa1e48a71
* commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 18:40:21 +00:00
Michael Wright
4aa1e48a71
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
2015-11-17 18:33:38 +00:00
Alan Treadway
0e563f00b5
Merge "Fix edge-cases for split-user provisioning cases."
2015-11-17 18:32:42 +00:00
Filip Gruszczynski
198b6dcca4
Merge "Synchronize recents to freeform transition."
2015-11-17 18:19:15 +00:00
Svet Ganov
505184bf45
Don't grant runtime permissions on install to legacy apps
...
bug:25329324
Change-Id: Ia020b96eaef8895f0c2a13bddacfa7a053c56d32
2015-11-17 18:17:14 +00:00
Mitchell Wills
48241ddc58
Merge "Expose gscan exponential backoff API"
2015-11-17 18:05:58 +00:00
Filip Gruszczynski
1a4dfe593a
Synchronize recents to freeform transition.
...
Recents to freeform animation must hang on the first frame and inform
Recents to hide its views. This mirrors the transition from freeform
to Recents, where the animation needs to hang on the last frame.
We need a special window flag for recents to force a redraw after the
animation launches. At this point Recents will become not visible
from the perspective of the activity manager, which would prevent
further drawing. We make recents ignore that and instead depend on
window visibility which will change after recents exit animation
finishes.
Bug: 24913782
Change-Id: Ief743b7e6fcebb3d8789d4745fb122ac607c1cf0
2015-11-17 10:03:19 -08:00
Alan Treadway
0c9ce28c12
Fix edge-cases for split-user provisioning cases.
...
Split-user systems will allow for combinations of management modes,
specifically managed-{user,profile} on systems with a device-owner.
Bug: 25671630
Bug: 25680065
Change-Id: I5716f55eb6c8318129b4614adc22897d53901bee
2015-11-17 17:41:41 +00:00
Wale Ogunwale
ff814adfdd
Merge "Move DecorView out of PhoneWindow into its own class file."
2015-11-17 17:35:34 +00:00
Wale Ogunwale
8804af2b63
Move DecorView out of PhoneWindow into its own class file.
...
Bug: 24810450
Change-Id: Ifa4e01517c80cec6d9a5b1051e5ccb7bab94a470
2015-11-17 09:18:15 -08:00