summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-191-0/+2
|\ | | | | | | Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
| * Pair ActivityStacks with DisplaysCraig Mautner2013-12-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce concept of ActivityStacks residing on Displays and able to be decoupled and moved around. - Add a new interface, IActivityContainer for clients to handle ActivityStacks. - Abandon ordering of stacks based on mStackState and instead use ActivityDisplayInfo.stacks<ActivityStack> ordering. Progress towards closing bug 12078972. Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
| * am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer ↵Ying Wang2013-12-051-2/+2
| |\ | | | | | | | | | | | | | | | | | | functions." * commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd': libcore_to_document and junit_to_document are no longer functions.
| | * libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | They are evaluated only once in the corresponding export .mk file. This fixes build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
* | | Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-091-0/+1
| | | | | | | | | | | | Change-Id: Ie55a5d4bb58c2944952fc84cce32d3573a3a1a22
* | | libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | They are evaluated only once in the corresponding export .mk file. This fixes build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
* | | am 713e3853: am 0b492138: am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '713e3853bf57410f389496c20db1fc3818b3d5d8': Re-enable samples browser.
| * | am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
| |\ \ | | | | | | | | | | | | | | | | * commit '6000f1ed3d402e3136df173d987c901cc3cc1ff2': Re-enable samples browser.
| | * | Re-enable samples browser.Dirk Dougherty2013-11-221-4/+4
| | | | | | | | | | | | | | | | Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab
* | | | am a6703462: am a0501105: am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a6703462926408fa83f41a2cb319e4f51fa7d4ca': Disable samples browsing temporarily.
| * | | am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9eaa94439121f6cb03bff8ecf0acbcbc74442f2d': Disable samples browsing temporarily.
| | * | Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
| | | | | | | | | | | | | | | | Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e
* | | | am 3ee2c60e: am 8b5da356: am 1448d3cd: Merge "Pass a new samplesdir param to ↵Dirk Dougherty2013-11-221-162/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs * commit '3ee2c60e453e19b02b0ab52793045d2dd9a20912': Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
| * | | am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting ↵Dirk Dougherty2013-11-221-162/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | point for generating samples browsing files. Removes older project-based configuration." into klp-docs * commit '1448d3cd81a685c68b0102e8303c0db4e6e5668f': Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
| | * | Pass a new samplesdir param to doclava as the starting point for generating ↵Dirk Dougherty2013-11-211-162/+4
| | | | | | | | | | | | | | | | | | | | | | | | samples browsing files. Removes older project-based configuration. Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067
* | | | am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized ↵Dirk Dougherty2013-11-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs * commit '3d763e258b6643d29a495b5dfb1cb376e6b61f87': Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
| * | | am acca12fa: Merge "Doc change: move localized files into an intl dir. Build ↵Dirk Dougherty2013-11-201-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | output remains the same for online, offline, and ds docs." into klp-docs * commit 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a': Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
| | * | Doc change: move localized files into an intl dir. Build output remains the ↵Dirk Dougherty2013-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | same for online, offline, and ds docs. Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
* | | | Add ThirdPartyCall APIs to masterSailesh Nepal2013-11-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are APIs for the new ThirdPartyPhone feature. Note, these APIs can't actually be used yet on master for two reasons: - initiating a call from a 3rd party app isn't possible yet because the TelephonyManager APIs aren't being added to master. - the TeleService implementation of these APIs aren't being added to master. Also, these APIs will be removed and the final ones will be added once they're ready to be merged into master. Change-Id: Ie783290451da448a011f813983e55b12047b5d99
* | | | am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and ↵Jeff Brown2013-11-071-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | integrate with remote displays." into klp-dev * commit 'c2b652fd4d386b79dc99af249b6ad3844e53fdf1': Add media router service and integrate with remote displays.
| * | | am d40a4d74: Merge "Add media router service and integrate with remote ↵Jeff Brown2013-11-071-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displays." into klp-dev * commit 'd40a4d74c623175c96a2e9d865a99826e56d1132': Add media router service and integrate with remote displays.
| | * \ \ Merge "Add media router service and integrate with remote displays." into ↵Jeff Brown2013-11-081-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| | | * | | Add media router service and integrate with remote displays.Jeff Brown2013-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new media router service whose purpose is to track global state information associated with media routes. This service publishes routes to the media router instance in application processes and handles requested state changes such as selecting or unselecting global routes. The service also binds to remote display provider services which can offer new remote display routes to the system. Includes a test application for manually verifying certain aspects of the operation of the media router service. The remote display provider interface is essentially a stripped down media route provider interface as defined in the support library media router implementation. For now, it is designed to be used only by first parties to publish remote display routes to the system so it is not exposed as public API in the SDK. In the future, the remote display provider interface will most likely be deprecated and replaced with a more featureful media route provider interface for third party integration, similar to what is in the support library today. Further patch sets integrate these new capabilities into the System UI and Settings for connecting remote displays. Bug: 11257292 Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
* | | | | | am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for ↵Jeff Brown2013-11-071-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote display providers." into klp-dev * commit '84d760257f46232601e5f47411fb4e59f57f1872': Add a platform library for remote display providers.
| * | | | | am 1f7a8a06: Merge "Add a platform library for remote display providers." ↵Jeff Brown2013-11-071-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | into klp-dev * commit '1f7a8a06256907e03405f89108f081289c23e97a': Add a platform library for remote display providers.
| | * | | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-081-0/+2
| | |\ \ \ | | | |/ /
| | | * | Add a platform library for remote display providers.Jeff Brown2013-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This interface allows applications to register services that offer remote displays to the system. The system will then provide UI to allow user to connect to these displays and enable mirroring. Bug: 11257292 Change-Id: I34da5b9dfdaf71267bd3450c505bc1b7368d1b40
* | | | | am 40730533: am f7188557: am 03ec3428: fix buildScott Main2013-11-061-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '40730533d45e310891b4e949eee92eb31a87515f': fix build
| * | | | fix buildScott Main2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9916113fde67afa04789f451355da215f9b015f7
* | | | | am 5cfa3fcb: am d183aae9: am 4cf4f521: add storage provider sample to buildScott Main2013-11-061-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5cfa3fcbba2916279dd43f8c031d0526581c8098': add storage provider sample to build
| * | | | add storage provider sample to buildScott Main2013-11-011-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I76f1e64f68b9db7c39ab3ec9bbbe0ecdd7729ae6
| * | | | Enable samples browsing in builds.Dirk Dougherty2013-10-311-4/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic47ef693dd5b2cd4010e68a600cae3b88d426bd2 (cherry picked from commit e8b32feb72bf4347c1bd98e6b21b18a506d2c5e3)
* | | | | am 65fe1908: am b2a905f0: am d51578ee: Merge "Enable samples browsing in ↵Dirk Dougherty2013-10-311-4/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | builds." into klp-dev * commit '65fe1908fc0af13c19e02b7a56f9c5697046c4f5': Enable samples browsing in builds.
| * | | | Enable samples browsing in builds.Dirk Dougherty2013-10-301-4/+6
| |/ / / | | | | | | | | | | | | Change-Id: Ic47ef693dd5b2cd4010e68a600cae3b88d426bd2
* | | | am ad064dac: am 52de9b52: am fd391d6f: Merge "Doc change: add new list of ↵Dirk Dougherty2013-10-291-15/+71
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | browseable samples and sample groups." into klp-dev * commit 'ad064dac70a7ad54b3eefc67fa99e06aa0845a79': Doc change: add new list of browseable samples and sample groups.
| * | | Doc change: add new list of browseable samples and sample groups.Dirk Dougherty2013-10-291-15/+71
| |/ / | | | | | | | | | Change-Id: I5f0c6899a34ada9f8dfc492f849c9e03203bc920
* | | am 8a51e2f4: am a53e1f81: am 23757527: Merge "Hide the print dialog if the ↵Svetoslav Ganov2013-10-181-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | printing activity is destroyed." into klp-dev * commit '8a51e2f48cb24113e8463eb251a097080eb46a7f': Hide the print dialog if the printing activity is destroyed.
| * | Hide the print dialog if the printing activity is destroyed.Svetoslav Ganov2013-10-181-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. For an app to print it creates a PrintDocumentAdapter implementation which is passed to the print dialog activity. If the activity that created the adapter is destroyed then the adapter, which may rely on the activity state, may be in an invalid state. For example, an app creates an adapter and calls print resuting in the app activity and the print dialog activity being stacked. Now the user rotates the device which triggers the recreating of the activity stack (assume the app does not handle rotation). The recreated print dialog activity receives the intent that originally created it with containing the adapter that was constructed in the context of the old, now destroyed, app activity instance. To handle this we are limiting an app to be able to print only from and activity and when this activity is destroyed we mark the adapter as invalid which will result in hiding the print dialog activity. Note that if the app process is killed we already handle this in the print dialog activiy by registering a death recipient on the adapter binder. 2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is accessed only on the main thread and some from miltiple threads. The code was trying to avoid locking for state that is not accessed by multiple threads but this is error prone and the benefit does not justify the complexity and added fragility. Now grabbing a lock all the time. 3. The PrintJobConfigActivity waits for it to bind to the print spooler service before instantiating its print controller and editor. However, these can be accessed by invoking some of the activity cycle callbacks. This change is adding null checks for the case where the activity callbacks are called before the binding to the spooler is completed. bug:11242661 Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
* | am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog ↵Svetoslav2013-10-111-1/+0
|\ \ | |/ | | | | | | | | | | activity is started." into klp-dev * commit '5c880d0d1551603dcc4366406ec9ee3b812a8fc4': Refactor how the print dialog activity is started.
| * Refactor how the print dialog activity is started.Svetoslav2013-10-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Before the print job activity was started asyncronously with respect to the print call on to the print manager. This was creating a situation where the starting activity may finish before the print dialog appears which may lead to an orphaned print document adapter with no data to print (as the UI is is gone), or strange behaviors where the print dialog starts on as a separate task. To address this the pending intent for starting the print dialog is not started by the print spooler since we cannot call into it synchronously as we have to start its process and bind to the spooler service which leads to jankyness in the client app. Now the pending intent is created by the print manager service in the synchronous print call so from an app's perspective calling print starts the activity. The side effect of this design is that the print dialog activity may start before the system is bound to the spooler service. In such a case the print activity cannot start poking the print spooler state as the system registers callback to observe the spooler state. To address this the print spooler activity disables the UI and also binds to the spooler service which happenes immediately after it is started. As soon as the print dialog binds to the service it starts the UI. 2. Fixed an bug in the printer adapter of the print dialog that was leading to a crash if the only item in the adater is the all pritners option and it is selected. 3. Piping the package name that started the printing so we can pass it to the storage UI as a hint to open the last location the app used. bug:11127269 Change-Id: Ia93820bdae0b0e7600a0930b1f10d9708bd86b68
* | am 856441e7: am 920de6c6: am 332408f8: update version number for doc stampScott Main2013-10-041-1/+1
|\ \ | |/ | | | | | | * commit '856441e72fa6a79a5421e9538e5af17df281eaab': update version number for doc stamp
| * update version number for doc stampScott Main2013-10-041-1/+1
| | | | | | | | Change-Id: I881510209a56204a464df082840d2dde56312303
* | am 2cf2948d: am 3f90705a: am 795b6e42: Merge "add -since flag for api level ↵Scott Main2013-10-041-0/+1
|\ \ | |/ | | | | | | | | | | 19 to filter javadocs" into klp-dev * commit '2cf2948dbf15e8c0645154957f511379d8ef53bf': add -since flag for api level 19 to filter javadocs
| * add -since flag for api level 19 to filter javadocsScott Main2013-10-031-0/+1
| | | | | | | | Change-Id: I96e7e31f93b1e3c3877a342b84fb069bda5d92e3
* | am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-10-011-0/+1
|\ \ | |/ | | | | | | * commit '65cacb3c5174f93debd481c7d573f34bc36f80f4': Add android.provider.Telephony to public API.
| * Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-09-301-0/+1
| |\
| | * Add android.provider.Telephony to public API.Jake Hamby2013-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add directory containing android/provider/Telephony.java to build. Add unhidden Telephony fields and classes to api/current.txt. Bug: 10653081 Change-Id: Ib4ba66e09be5320d35257fcf481db58f840fdc53
* | | Supress contents of this project in embedded buildsMike Lockwood2013-09-301-0/+6
| | | | | | | | | | | | Change-Id: Ib5c2853f8a20be2cba21cab081a31a327239cfd4
* | | am 4609d9a9: am 5cab967b: Merge "Adding hidden APIs for observing the print ↵Svetoslav Ganov2013-09-261-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | jobs state." into klp-dev * commit '4609d9a9ebc17d804d31d5241968157439c92a57': Adding hidden APIs for observing the print jobs state.
| * | Adding hidden APIs for observing the print jobs state.Svetoslav Ganov2013-09-251-0/+1
| |/ | | | | | | | | | | | | | | This is needed for implementing the print job settigns UI. bug:10935736 Change-Id: I63b42cbf4ce6a259fa1af47fa368b148ca5621c1
generated by cgit v1.1 at 2025-01-09 04:11:07 +0000