OSDN Git Service
George Mount [Mon, 30 Nov 2015 18:55:20 +0000 (10:55 -0800)]
Give transitioning fragment a context prior to retrieving transition
Bug
23688972
An incoming fragment that is going to execute a transition may
need to have a context in order to load the transition. This
CL moves the state of incoming fragments to CREATED prior to
getting their Transitions.
Change-Id: I08b8cda479f7542fb326aa4f0f62a07ccc5662b0
Paul Stewart [Tue, 17 Nov 2015 17:13:23 +0000 (17:13 +0000)]
Merge "WifiEnterpriseConfiguration: Do not print credentials in toString"
Bryce Lee [Tue, 17 Nov 2015 16:41:39 +0000 (16:41 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9 am:
52d93db91d
am:
17ffebf8c8
* commit '
17ffebf8c802ccc5ee6db36aad88e560297d6c33':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:35:14 +0000 (16:35 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9
am:
52d93db91d
* commit '
52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:28:47 +0000 (16:28 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3
am:
e2861471b9
* commit '
e2861471b906d94b1211beeee824ae43b7e931c3':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:21:59 +0000 (16:21 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903
am:
0fa22022a3
* commit '
0fa22022a378db8de881af397b73d28b0939e5ff':
Add Bluetooth headset API to allow disabling audio route.
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
Alan Viverette [Tue, 17 Nov 2015 14:47:11 +0000 (09:47 -0500)]
APIs for querying and controlling display magnification
Also separates magnification state and touch event handling. Moves
callbacks for window manager changes and display state changes into
the magnification controller.
Bug:
22718911
Change-Id: I3a8ba060a07d8f1f51856855a5f85601766fd45d
Nicolas Geoffray [Tue, 17 Nov 2015 12:26:01 +0000 (12:26 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Daichi Hirono [Tue, 17 Nov 2015 06:47:45 +0000 (06:47 +0000)]
Merge "Start using MtpDatabase in DocumentLoader."
Daichi Hirono [Mon, 16 Nov 2015 04:01:31 +0000 (13:01 +0900)]
Start using MtpDatabase in DocumentLoader.
BUG=
25704514
Change-Id: I4d9247c148679ee7e40a1a03443e4c0299b1e44d
Sungsoo Lim [Tue, 17 Nov 2015 06:35:16 +0000 (06:35 +0000)]
Merge "Make TvContentRating.contains() public"
Filip Gruszczynski [Tue, 17 Nov 2015 05:07:56 +0000 (05:07 +0000)]
Merge "Don't animate move triggered by resizing using dock divider."
Filip Gruszczynski [Mon, 16 Nov 2015 04:36:38 +0000 (20:36 -0800)]
Don't animate move triggered by resizing using dock divider.
Also includes some small, nice refactoring:
* move code that sets the move animation into WindowStateAnimator;
* a few fields can be made private in WindowStateAnimator this way;
* one boolean flag in WindowStateAnimator popped out as unused after
being privatized, so could be deleted.
Bug:
25690109
Change-Id: I8144114244892c4f27aff21455e8e76eddbd039f
Joe LaPenna [Tue, 17 Nov 2015 04:02:41 +0000 (04:02 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours am:
dbe1804f58 -s ours am:
9cb81aa210 -s ours
am:
6412751108 -s ours
* commit '
6412751108070a3e591546d4bc6e660fea52b49f':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Sanket Padawe [Tue, 17 Nov 2015 04:01:10 +0000 (04:01 +0000)]
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:
7bb34d7517 am:
fc8f7cee01
am:
5c63189f4a
* commit '
5c63189f4a83c71d6c7a8e705e5560cb353e4b69':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 03:59:41 +0000 (03:59 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7 am:
9f275ec3fd
am:
d00380a560
* commit '
d00380a560dff6a2237086f2f4c96313785ce93f':
WindowDecorActionBar name change fix.
Michael Kwan [Tue, 17 Nov 2015 03:58:01 +0000 (03:58 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours am:
2c8f3734af -s ours
am:
03f62d7af2 -s ours
* commit '
03f62d7af2cd6618ed775b4183fa5cb3a274e01d':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Rom Lemarchand [Tue, 17 Nov 2015 03:48:50 +0000 (19:48 -0800)]
resolve merge conflicts of
152d353e87 to master.
Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff
Joe LaPenna [Tue, 17 Nov 2015 03:11:51 +0000 (03:11 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours am:
dbe1804f58 -s ours
am:
9cb81aa210 -s ours
* commit '
9cb81aa210419ea14ff396fb533ad500094b00f2':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 03:03:13 +0000 (03:03 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours
am:
dbe1804f58 -s ours
* commit '
dbe1804f580dcde68ac272b865808a8263219efb':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:55:44 +0000 (02:55 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours
am:
7f0a1556ec -s ours
* commit '
7f0a1556ecebe9cd861296897000e4b61f541158':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
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 02:06:14 +0000 (02:06 +0000)]
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:
7bb34d7517
am:
fc8f7cee01
* commit '
fc8f7cee0124bee1c75f05a18c112e37705836a9':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:58:39 +0000 (01:58 +0000)]
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:
7bb34d7517
* commit '
7bb34d7517cfef519a01e365c0da665852ac6b0b':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:43:07 +0000 (01:43 +0000)]
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
* commit '
32a190bd787cbecfc4c87cda50ab6973b9e1c3cb':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:37:54 +0000 (01:37 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7
am:
9f275ec3fd
* commit '
9f275ec3fd422045f95c048905b112c0a93f4d34':
WindowDecorActionBar name change fix.
Sungsoo Lim [Tue, 17 Nov 2015 00:14:07 +0000 (09:14 +0900)]
Make TvContentRating.contains() public
Apply the feedback from API council.
Bug:
25726616
Change-Id: I9858a61eea50ff95221d453117fe3d991f88a33f
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.
Deepanshu Gupta [Tue, 17 Nov 2015 01:28:58 +0000 (01:28 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a
am:
80bd5e6fd7
* commit '
80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
WindowDecorActionBar name change fix.
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.
Deepanshu Gupta [Tue, 17 Nov 2015 01:17:25 +0000 (01:17 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am:
62302bd72a
* commit '
62302bd72aaa6b0f934257447e8dcd636799180e':
WindowDecorActionBar name change fix.
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
Daichi Hirono [Tue, 17 Nov 2015 01:05:20 +0000 (01:05 +0000)]
Merge "Add a mehtod definition to StorageManager for appfuse."
Dianne Hackborn [Tue, 17 Nov 2015 00:41:35 +0000 (00:41 +0000)]
Merge "Don't send PACKAGE_CHANGED of components to manifest receivers."
Dianne Hackborn [Tue, 17 Nov 2015 00:41:07 +0000 (00:41 +0000)]
Merge "Some debugging improvements."
Dianne Hackborn [Thu, 12 Nov 2015 02:10:30 +0000 (18:10 -0800)]
Be smarter about determining when we can stop idle maintenance.
The device idle service now knows when the system is actively
doing significant things (syncs, jobs, alarms, downloads). It
uses this, when in an idle maintenance window, to determine when
it can end that window early -- when such work is no longer
happening.
For now this just allows us to shorten the windows. In the future
we should use this to allow us to expand the windows to a longer
potential time, adjusting future windows to shorter durations if
earlier ones use more time. This will allow us to batch occasional
long operations (such as downloads) into one window, making up
for that with much shorter later windows.
Change-Id: Ie482abd50bc43be9a8917a769a5175851eee4ec4
Michael Kwan [Tue, 17 Nov 2015 00:14:34 +0000 (00:14 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours
am:
2c8f3734af -s ours
* commit '
2c8f3734afd5f104166bfb045794970414eb5052':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Tue, 17 Nov 2015 00:06:28 +0000 (00:06 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours
am:
b0aae584ea -s ours
* commit '
b0aae584ea2a5649ac113ba05c88cbbe6616709e':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Adam Lesinski [Tue, 17 Nov 2015 00:00:48 +0000 (00:00 +0000)]
Merge "AAPT2: Prevent duplicate enums/flags"
Adam Lesinski [Mon, 16 Nov 2015 23:59:10 +0000 (15:59 -0800)]
AAPT2: Prevent duplicate enums/flags
Change-Id: I998cba12ac194000e9c778cb620ed7ab33003e7d
Michael Kwan [Mon, 16 Nov 2015 23:57:47 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours
am:
f23229f45f -s ours
* commit '
f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
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
Wale Ogunwale [Mon, 16 Nov 2015 23:45:13 +0000 (23:45 +0000)]
Merge "Crop window input region to stack bounds."
Adam Lesinski [Mon, 16 Nov 2015 23:44:49 +0000 (23:44 +0000)]
Merge "AAPT2: Fix tokenizer to deal with the separator as last char"
Adam Lesinski [Mon, 16 Nov 2015 23:37:30 +0000 (15:37 -0800)]
AAPT2: Fix tokenizer to deal with the separator as last char
When the separator was the last character, the tokenizer would skip
the empty string, which is wrong.
Change-Id: I64ceb4e8d4ac48ee41d40781ab5785a3bc61b24d
Daichi Hirono [Fri, 13 Nov 2015 05:37:00 +0000 (14:37 +0900)]
Add a mehtod definition to StorageManager for appfuse.
BUG=
25091416
Change-Id: Id4d4a000daf89fab4917528fcd0d1270547fbfa4
Adam Lesinski [Mon, 16 Nov 2015 23:41:25 +0000 (23:41 +0000)]
Merge "AAPT2: Fix a bug where files would only show up for one config"
Jeffrey Vander Stoep [Mon, 16 Nov 2015 23:33:53 +0000 (23:33 +0000)]
Merge "fix ApplicationInfo flag collision"
Daichi Hirono [Thu, 12 Nov 2015 03:12:48 +0000 (12:12 +0900)]
Prepare for adding MtpDocumentsProvider tests to APCT.
BUG=
25093356
Change-Id: I0c194e6bf3abeb632171e9be49471b9d94a0cb4c
Jeff Vander Stoep [Mon, 16 Nov 2015 23:23:38 +0000 (15:23 -0800)]
fix ApplicationInfo flag collision
Give PRIVATE_FLAG_AUTOPLAY unique value
Bug:
25726468
Change-Id: I1dabe26eb4c72004ebd7e33252240e10c15c9159
Wale Ogunwale [Mon, 16 Nov 2015 23:16:07 +0000 (23:16 +0000)]
Merge "Set-up dummy animation when setting a replacing window token"
Adam Lesinski [Mon, 16 Nov 2015 23:07:54 +0000 (15:07 -0800)]
AAPT2: Fix a bug where files would only show up for one config
The set of files to build was only comparing resource name and
not configuration.
Also support --extra-packages as a colon separated list of packages.
Change-Id: I36b65cd15299cdc722b785a7891a24ca1bc4fb45
Chris Craik [Mon, 16 Nov 2015 23:08:48 +0000 (23:08 +0000)]
Merge "Finish shadow support in new reorderer/renderer"
Wale Ogunwale [Mon, 16 Nov 2015 22:27:21 +0000 (14:27 -0800)]
Crop window input region to stack bounds.
Prevents the input region of a window from extending outside
the stack bounds. For example, if you have a non-sizeable
activity in docked mode you don't want the app getting touchs
when you tap on the side occupied by the other app.
Bug:
25710884
Change-Id: I044b4e87448fbd3eb51822e6d71e8ed8d06f55ec
Alan Viverette [Mon, 16 Nov 2015 22:24:29 +0000 (22:24 +0000)]
Merge "Clean up PopupMenu"
Alan Viverette [Mon, 16 Nov 2015 22:24:12 +0000 (22:24 +0000)]
Merge "Clean up TimePicker"
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
Alan Viverette [Mon, 16 Nov 2015 21:55:58 +0000 (16:55 -0500)]
Clean up PopupMenu
No functional changes, only refactoring:
- remove unused mShowCascadingMenus member variable
- move private interface implementations to anonymous inner classes
- move interfaces to end of class
- clean up docs formatting
Change-Id: Ib82ca0d3a3ff49207959a17b77c4ff4f11a1afc2
Philip P. Moltmann [Mon, 16 Nov 2015 21:43:22 +0000 (21:43 +0000)]
Merge "Show "select a printer" as "destination" the first the the user prints"
Rom Lemarchand [Mon, 16 Nov 2015 21:43:06 +0000 (21:43 +0000)]
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
am:
5032e49f9e
* commit '
5032e49f9e8ec8307dbc265a78649c2b49e4e5ad':
resolved conflicts for
7de7e0b0 to stage-aosp-master
BatteryService: Add Max charging voltage
Stop setting swappiness.
Adam Lesinski [Mon, 16 Nov 2015 21:36:54 +0000 (21:36 +0000)]
Merge "AAPT2: Be more strict parsing references"
Adam Lesinski [Mon, 16 Nov 2015 21:36:14 +0000 (21:36 +0000)]
Merge "AAPT2: Minor fixes to SymbolTable and diagnostic output"
Rom Lemarchand [Mon, 16 Nov 2015 21:33:48 +0000 (21:33 +0000)]
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
resolved conflicts for
7de7e0b0 to stage-aosp-master
BatteryService: Add Max charging voltage
Stop setting swappiness.
Alan Viverette [Mon, 16 Nov 2015 21:10:56 +0000 (16:10 -0500)]
Clean up TimePicker
No functional changes, only refactoring:
- shorten method and variable names
- remove unused validation callback
- avoid using return in setters
Change-Id: Ie7c19cfe3c5cb515695f943c534899d37ad032bb
Wale Ogunwale [Mon, 16 Nov 2015 21:01:41 +0000 (13:01 -0800)]
Set-up dummy animation when setting a replacing window token
Set-up dummy animation so we can start treating windows associated
with the replacing app token like they are in transition before the
new app window is ready for us to run the real transition animation.
This allows us to make the right decisions at various call points
where an animation is expected to be running for a replacing window
but the real animation isn't set yet.
Also, removed unused field indicating if an app token is animating
a replacement window since it was always set to true and checked/set
to the same value as AppWindowToken.mWillReplaceWindow.
Bug:
25645069
Change-Id: Ie216ed5bd60fb2a15da61c7050c9344c48b1c5fb
Eino-Ville Talvala [Mon, 16 Nov 2015 20:59:58 +0000 (20:59 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c am:
784f0f15a9 am:
c24b39e0c0 am:
579cc90e61
am:
e1cbe99e5f
* commit '
e1cbe99e5ff222f5d017af83466793209e668ed7':
Camera: Minor documentation update
Fyodor Kupolov [Mon, 16 Nov 2015 20:52:05 +0000 (20:52 +0000)]
Merge "Reduce excessive locking in UserManager"
Eino-Ville Talvala [Mon, 16 Nov 2015 20:51:32 +0000 (20:51 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c am:
784f0f15a9 am:
c24b39e0c0
am:
579cc90e61
* commit '
579cc90e61598c57a8225cbea4bfe035e5e1963c':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:44:44 +0000 (20:44 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c am:
784f0f15a9
am:
c24b39e0c0
* commit '
c24b39e0c0f760ac6a53d4fbbf1ed1885fd64529':
Camera: Minor documentation update
John Reck [Mon, 16 Nov 2015 20:36:01 +0000 (20:36 +0000)]
Merge "Extensions must load in ctor"
Eino-Ville Talvala [Mon, 16 Nov 2015 20:35:48 +0000 (20:35 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c
am:
784f0f15a9
* commit '
784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
Camera: Minor documentation update
Adam Lesinski [Mon, 16 Nov 2015 20:31:52 +0000 (12:31 -0800)]
AAPT2: Be more strict parsing references
Change-Id: I3d54a519687fff1e66acb8e395ef99ba01a1b845
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
Philip P. Moltmann [Mon, 16 Nov 2015 20:16:23 +0000 (20:16 +0000)]
Merge "Switch add icons to the default menu add icon"
Philip P. Moltmann [Fri, 13 Nov 2015 23:33:40 +0000 (15:33 -0800)]
Show "select a printer" as "destination" the first the the user prints
The Spinner does not support a prompt, hence temporarily hijack the
first element and install an alternate view. Once the Spinner is touched
revert to the old behavior.
If we showed a prompt the views in the spinner cannot be recycled.
Bug:
24132864
Change-Id: Iaf97878f85388a8c6351e716117b16f34919ad84
Filip Gruszczynski [Fri, 13 Nov 2015 03:08:20 +0000 (19:08 -0800)]
Remove unnecessary DisplayContent.mDisplaySizeLock synchronization.
All operations are performed with WindowManagerService.mWindowMap lock
held, therefore the second lock is not necessary.
Change-Id: I762fb322ddeb8b45191a3d297de0d33a10674f8a
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
Adam Lesinski [Mon, 16 Nov 2015 19:59:14 +0000 (11:59 -0800)]
AAPT2: Minor fixes to SymbolTable and diagnostic output
The SymbolTable lookup relied on the configuration, which we NEVER
want. Now we rely solely on the symbols defined in the ResTable
and no specific configuration or value of that symbol.
Also added some better source logging.
Change-Id: I983855c283493e924b2e92a9fd8e4cb841769349
Philip P. Moltmann [Sat, 14 Nov 2015 01:09:50 +0000 (17:09 -0800)]
Switch add icons to the default menu add icon
Also use the material search icon.
Bug:
22563699
Change-Id: Iff7c6b5cac8a9f0bf282e061d2ed09c4c0fb480a
Steve McKay [Mon, 16 Nov 2015 19:47:53 +0000 (19:47 +0000)]
Merge "Add test size annotations to docsui tests."
Jeffrey Vander Stoep [Mon, 16 Nov 2015 19:38:33 +0000 (19:38 +0000)]
Merge "pm: selinux support for AutoPlay apps"
Erik Wolsheimer [Mon, 16 Nov 2015 19:26:12 +0000 (19:26 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e am:
529893f84c am:
7698dd970f
am:
ae4ab3501a
* commit '
ae4ab3501a0400940ace2d0bfdf0d7021c740603':
Log errno when dup fd cannot be allocated BUG:
25165471
Chris Craik [Fri, 13 Nov 2015 18:55:30 +0000 (10:55 -0800)]
Finish shadow support in new reorderer/renderer
Now passes alphas and light radius, and correctly transforms light
center for layers.
Also fixes begin-frame/layer clears to be damage rect aware.
Change-Id: I3b1415cd7bf1518c510145ebebdb745f494a2542
Erik Wolsheimer [Mon, 16 Nov 2015 19:20:35 +0000 (19:20 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e am:
529893f84c
am:
7698dd970f
* commit '
7698dd970fbfb81fcdc700827c1620440c6e81a1':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:12:17 +0000 (19:12 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e
am:
529893f84c
* commit '
529893f84cc62893ad6111816954b0bc7c829cee':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:03:52 +0000 (19:03 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9
am:
b45defae8e
* commit '
b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG:
25165471
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
Selim Cinek [Mon, 16 Nov 2015 18:52:32 +0000 (18:52 +0000)]
Merge "Fixed a crash with the heads up manager"
Selim Cinek [Mon, 16 Nov 2015 18:46:33 +0000 (18:46 +0000)]
Merge "Fixed error in GroupManager"
Selim Cinek [Mon, 16 Nov 2015 18:44:56 +0000 (18:44 +0000)]
Merge "Fixed a bug where a notification could get removed"
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
(cherry picked from commit
9f8602644418ecfb1a5c9555792ceed285fa72bd)
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Badhri Jagan Sridharan [Tue, 27 Oct 2015 20:59:34 +0000 (13:59 -0700)]
BatteryService: Add Max charging voltage
Bug:
25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit
f92fcfe36ad841cba4774e7f2129e8dab7ac784a)