OSDN Git Service
Jerome Gaillard [Fri, 18 Dec 2015 18:13:39 +0000 (18:13 +0000)]
Create new Navigation Bar for the Theme Editor Preview
The standard navigation bar was not working well in the Theme Editor preview
when in a wide configuration. The bar then did not fit entirely inside the display.
So we created a new Navigation Bar to use in the Theme Editor preview, that fixes
the size problem.
Bug: http://b.android.com/198179
Change-Id: Ifb1fa7b8f399f17392934de89078696337eca3e1
Jerome Gaillard [Fri, 11 Dec 2015 15:05:46 +0000 (15:05 +0000)]
Use RenderDrawable to render mipmaps
Bug: http://b.android.com/179714
Change-Id: If05e71b33ee3a95590eb892f4fffbff4cfca1867
George Mount [Thu, 3 Dec 2015 18:53:15 +0000 (10:53 -0800)]
Remove accidentally left-in commented out line.
Change-Id: Ic49b371a5138591051cd10e302e27535b165b2b3
George Mount [Thu, 3 Dec 2015 15:39:55 +0000 (07:39 -0800)]
Adds a way to exclude test directories from javadoc.
By adding a file named NO_DOCS to a directory, all
java files under that directory will be ignored for
javadoc builds. This is especially useful for marking
test projects as not participating in the javadoc
build.
Change-Id: I3b0259f4bb3c8460c3560fdcf97c6cac11d8001d
Diego Perez [Wed, 14 Oct 2015 13:20:26 +0000 (14:20 +0100)]
Add support for Choreographer animations
First step to add support for Choreographer based animations. The
Choreographer_Delegate avoid using a handler so the animation callbacks
can be called on-demand (by using doFrame). This allows things like
frame by frame animation or selecting a specific frame, and doesn't need
a separate thread to run.
The CL also changes the System and SystemClock implementations to allow
to set specific times. Because animations heavily rely on the system
time, this allows controlling it. It can also be useful to ensure that
the rendering produces a deterministic result when using controls like
the Calendar widget.
Change-Id: Iff221d2698a82075cafbb60f341be01741f7aa13
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours
am:
d0709c3a32 -s ours
* commit '
d0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am:
bddde9b83d -s ours
* commit '
bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:55 +0000 (20:49 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:35 +0000 (20:49 +0000)]
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
This reverts commit
65a834980cdbb9407a3f27e48cd0a8c472182cd6.
The original revert was only for cherry-pick to release
branch.
Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
Deepanshu Gupta [Thu, 19 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:47:26 +0000 (20:47 +0000)]
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit
631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.
The revert is only for cherry-pick back to mnc-sdk-release.
Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
Sreeram Ramachandran [Thu, 19 Nov 2015 17:10:45 +0000 (17:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500
am:
6d983179a0
* commit '
6d983179a047ff0e69fc06c06d3b9b06c32406ae':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:59:45 +0000 (16:59 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801
am:
974f805500
* commit '
974f8055005a3d75e45cab89badd9ef183a75107':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:50:11 +0000 (16:50 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205
am:
b776891801
* commit '
b7768918014d34c2e4d74abefeb03956aee421fc':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790
am:
33c1718205
* commit '
33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7
am:
d3b6e2d790
* commit '
d3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd
am:
42faa221d7
* commit '
42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012
am:
0b542630dd
* commit '
0b542630dd8b4d43f2e4f70563d3e44bb680455f':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
f1f45fe012
* commit '
f1f45fe012ddbd516e797099994c400a1cac8581':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
0f8f120839120da543ee186cf25ce6e215423e99)
Diego Perez [Tue, 17 Nov 2015 22:34:08 +0000 (22:34 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev
Joe LaPenna [Tue, 17 Nov 2015 22:32:57 +0000 (22:32 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off."
am:
f2b9b2d85a
* commit '
f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
Revert "Don't dispatch when non-interactive and the display is off."
Joe LaPenna [Tue, 17 Nov 2015 22:22:37 +0000 (22:22 +0000)]
Revert "Don't dispatch when non-interactive and the display is off."
This reverts commit
2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.
BUG:
22422588
BUG:
25067918
Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
Michael Wright [Tue, 17 Nov 2015 21:18:16 +0000 (21:18 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506 am:
08ed2bc083
am:
41ef58be3e
* commit '
41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 20:59:42 +0000 (20:59 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506
am:
08ed2bc083
* commit '
08ed2bc083fe142ea6f89f97172543327f423e61':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 20:41:39 +0000 (20:41 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours
am:
18a2ac0506
* commit '
18a2ac0506ec834c2522de94040dab9e77304e7b':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 19:42:42 +0000 (11:42 -0800)]
Revert "LayoutLib: Fix true transparency in status bar."
This reverts commit
4eb298a941c3f465944b63f1a06518e911681c89.
Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.
Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
Michael Wright [Tue, 17 Nov 2015 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405
am:
bd23716585 -s ours
* commit '
bd23716585bd21b4dc4bf87bd56ce588c8d457df':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 20:22:43 +0000 (20:22 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Michael Wright [Tue, 17 Nov 2015 20:06:27 +0000 (20:06 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de
am:
614ea46405
* commit '
614ea464051835e1c2267ef2bc343f98b62b177a':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 19:52:13 +0000 (19:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
am:
84669ca8de
* commit '
84669ca8de55d38073a0dcb01074233b0a417541':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 19:37:35 +0000 (11:37 -0800)]
LayoutLib: IntelliJ changed project files.
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
Deepanshu Gupta [Tue, 17 Nov 2015 19:34:32 +0000 (11:34 -0800)]
AppCompatActionBar: use findClass to test presence
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.
Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
Michael Wright [Tue, 17 Nov 2015 18:57:03 +0000 (18:57 +0000)]
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
Michael Wright [Tue, 17 Nov 2015 18:49:32 +0000 (18:49 +0000)]
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
Michael Wright [Tue, 17 Nov 2015 18:40:21 +0000 (18:40 +0000)]
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
Michael Wright [Tue, 17 Nov 2015 18:33:38 +0000 (18:33 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Bryce Lee [Tue, 17 Nov 2015 16:14:55 +0000 (16:14 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
am:
cb8749c903
* commit '
cb8749c903d29fd04944550b5f34cc6120b69232':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:08:44 +0000 (16:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:47:59 +0000 (02:47 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
am:
d083b37917 -s ours
* commit '
d083b379174b6cdfdd40204f4d4f4207fa2f332e':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:42:22 +0000 (02:42 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:42:10 +0000 (02:42 +0000)]
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
This reverts commit
88c7c3e08051f4a2be8ee5194214678a07ff7f01.
Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG:
23753686
Sanket Padawe [Tue, 17 Nov 2015 01:33:24 +0000 (01:33 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae
am:
63e6aa8571
* commit '
63e6aa8571386dcf33ff0cf3949bdaf6c8e350db':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:23:47 +0000 (01:23 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466
am:
ccfcb636ae
* commit '
ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:12:48 +0000 (01:12 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev
am:
abea6dc466
* commit '
abea6dc466cbd01be261192f8dbc083b58661bad':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:11:10 +0000 (01:11 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
Sanket Padawe [Tue, 17 Nov 2015 01:07:28 +0000 (01:07 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
Michael Kwan [Mon, 16 Nov 2015 23:48:39 +0000 (23:48 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
am:
8d6630b87c -s ours
* commit '
8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Deepanshu Gupta [Mon, 16 Nov 2015 23:46:12 +0000 (15:46 -0800)]
WindowDecorActionBar name change fix.
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.
Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
Michael Kwan [Mon, 16 Nov 2015 20:59:37 +0000 (12:59 -0800)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.
The hack stops this behaviour, and also sets MTP mode back to none.
Bug:
25547826
Bug:
25582050
Bug:
25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
Eino-Ville Talvala [Mon, 16 Nov 2015 20:27:03 +0000 (20:27 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759
am:
062c629e5c
* commit '
062c629e5c6270da232bbd2800966ab5dc6c615f':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:16:45 +0000 (20:16 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8
am:
0691d16759
* commit '
0691d16759bf58a93209d4ab156e96f96fed7092':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:07:02 +0000 (20:07 +0000)]
Camera: Minor documentation update
am:
0b6e1bfae8
* commit '
0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
Camera: Minor documentation update
Erik Wolsheimer [Mon, 16 Nov 2015 18:55:29 +0000 (18:55 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471
am:
211abad3b9
* commit '
211abad3b92b70dd094949c79f67e686c940fa0c':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Fri, 13 Nov 2015 19:54:47 +0000 (11:54 -0800)]
Log errno when dup fd cannot be allocated
BUG:
25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
Bryce Lee [Mon, 16 Nov 2015 16:55:52 +0000 (08:55 -0800)]
Add Bluetooth headset API to allow disabling audio route.
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.
Bug:
25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
Geoff Mendal [Mon, 16 Nov 2015 13:38:58 +0000 (13:38 +0000)]
Import translations. DO NOT MERGE
am:
83d65fea01 -s ours
* commit '
83d65fea01c4233c80161acdd69b64fa559c3749':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:18:40 +0000 (14:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Minor documentation update
- Further clarify hardware.camera feature being only for the back camera
Bug:
24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
Michael Wright [Fri, 13 Nov 2015 21:53:14 +0000 (21:53 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
Michael Wright [Fri, 13 Nov 2015 21:52:18 +0000 (21:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
Winson Chung [Fri, 13 Nov 2015 18:44:29 +0000 (18:44 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec am:
ef15ca85d7
am:
28fc76ecef
* commit '
28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:37:15 +0000 (18:37 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec
am:
ef15ca85d7
* commit '
ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:29:33 +0000 (18:29 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours
am:
d45a18c8ec
* commit '
d45a18c8eca074f8c83a64ed465021a61becb49a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:55 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0
am:
32265b9ea0 -s ours
* commit '
32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:53 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894
am:
1b29fd87a2
* commit '
1b29fd87a26d6230c55c701d1411b34342614af0':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:29 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d
am:
3e9f2b7894
* commit '
3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:35 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
am:
dce0f8040d
* commit '
dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:47 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Filip Gruszczynski [Fri, 13 Nov 2015 17:20:05 +0000 (17:20 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
am:
fe482e0bca
* commit '
fe482e0bcabb98d983ecb4080b35490b9814c809':
Initialize DisplayContent base info when object is constructed
Filip Gruszczynski [Fri, 13 Nov 2015 17:15:14 +0000 (17:15 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
Diego Perez [Fri, 13 Nov 2015 13:58:14 +0000 (13:58 +0000)]
Fix delegation of methods within inner static classes
Currently, delegation of inner static classes methods is broken since
the rewritten method tries to pass an instance to the outer class. This
updates the method generation to only pass the reference if the inner
class is not static.
Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
Wale Ogunwale [Wed, 30 Sep 2015 17:09:39 +0000 (10:09 -0700)]
Initialize DisplayContent base info when object is constructed
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.
Bug:
22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
Shreyas Basarge [Fri, 13 Nov 2015 02:48:52 +0000 (02:48 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b am:
c9eb8b4367 am:
c4a9c319e5
am:
d80d24f5b1
* commit '
d80d24f5b13c16ce19369b1debb9137516f59e3f':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:41:55 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b am:
c9eb8b4367
am:
c4a9c319e5
* commit '
c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:35:51 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b
am:
c9eb8b4367
* commit '
c9eb8b436715ba9b59382759cf0dcf991ed33594':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:29:50 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc am:
af5c9f809c am:
69ee300c90
am:
ffffcf14c5
* commit '
ffffcf14c58f9795bda802d75308332d0bb49dfe':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:29:47 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d
am:
64bdb9f06b
* commit '
64bdb9f06b7fc3e497088243a966dec95d1936e1':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e
am:
359ee7f47d
* commit '
359ee7f47de2eee82951abed294e4db44405973c':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:23:37 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc am:
af5c9f809c
am:
69ee300c90
* commit '
69ee300c90288fba6c3f81a37fd347892009e42e':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4
am:
bf29f10c1e
* commit '
bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:16:19 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc
am:
af5c9f809c
* commit '
af5c9f809cf7bbb890036a6411504a92e0d507ca':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af
am:
44368e6dd4
* commit '
44368e6dd4ec56e9eca47b1e81d307f672bb3006':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74
am:
c455148edc
* commit '
c455148edce05b4862df8853a78276fb5f28151a':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812
am:
f5f03a19af
* commit '
f5f03a19affc6775ac3e44a3540351e132fffc0e':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f
am:
6d13650c74
* commit '
6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8
am:
cc7c1d3812
* commit '
cc7c1d381249edfd906cb57afbd8589e6c345141':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2
am:
a0d20db02f
* commit '
a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece
am:
34b700a7c2
* commit '
34b700a7c2355f1dbea4b8d796619033bdd87a0c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705
am:
294611faa8
* commit '
294611faa8bd1bdbf75adc3cee835b69d348df86':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
c0f39c1ece
* commit '
c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
2f137b7705
* commit '
2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
Sanket Padawe [Fri, 13 Nov 2015 00:07:47 +0000 (00:07 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am:
5b6ad87630
am:
4f822bbf2a
* commit '
4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Thu, 12 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
am:
5b6ad87630
* commit '
5b6ad87630756751471f7224672328d955c8f2fb':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Wed, 11 Nov 2015 23:01:35 +0000 (15:01 -0800)]
Don't allow contact sharing by default for device not recognized as carkit.
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.
Bug:
23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit
07533dbffff5551ad4c58852b5856f57d7da6801)
Sanket Padawe [Thu, 12 Nov 2015 23:53:25 +0000 (23:53 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev