summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* LayoutLib: Support getting resource arrays.Deepanshu Gupta2015-05-2622-14/+245
| | | | | | | | | | | | | | | | - Don't crash when Resources.get<Type>Array() is called. - If the IDE supports it, actually return the value. - Add tests for getArray. - Update test app to latest gradle plugin version. - Switch to using AppTheme for tests, since the tests depend on some custom theme attributes. The AppTheme now inherits from Material.Light.DarkActionBar, so other tests should be unaffected. Depends on a newer version of sdk-common, which fixes the parsing of array resource in value files. Bug: 12372031 Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
* LayoutLib: Change nullity annotations.Deepanshu Gupta2015-05-2236-53/+57
| | | | | | | | | | | | | Switch from using tools nullity annotations (com.android.annotations) to android framework annotations (android.annotation). A new sdk-common prebuilt is required for LayoutLib tests. The new sdk-common requires an updated tools-common. The updated tools-common doesn't have nullity annotations. So, instead of adding the annotation dependency, just reuse the platform ones. This also paves the way to include other platform annotations like IdRes etc. Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
* Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into ↵Dianne Hackborn2015-05-2318-191/+76
|\ | | | | | | mnc-dev
| * Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-2218-191/+76
| | | | | | | | | | This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.
* | Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into ↵Simranjit Singh Kohli2015-05-232-26/+32
|\ \ | | | | | | | | | mnc-dev
| * | [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]Simranjit Singh Kohli2015-05-222-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing lots of bugs related to the ChooseAccount Activities. 1. Fix jank which is seen when no accounts are present on the device. 2. After addition of the account, return to the user. 3. Don't crash when the user provides null to allowableAccountTypes. 4. Updated documentation of AccountManager#newChooseAccountIntent. 5. Fix NPE. Bug: 13104800 Bug: 17926560 Bug: 9626001 Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
* | | am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into ↵Dirk Dougherty2015-05-238-95/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'c56a8313760243740b684fef4ae71d791a885b4d': Doc change: updates for preview.
| * \ \ am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docsDirk Dougherty2015-05-238-95/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'b1410bc306195dc807f223bc5955780275fc6468': Doc change: updates for preview.
| | * \ \ Merge "Doc change: updates for preview." into mnc-preview-docsDirk Dougherty2015-05-228-95/+16
| | |\ \ \
| | | * | | Doc change: updates for preview.Dirk Dougherty2015-05-228-95/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a
* | | | | | am 93cc5190: am b373f49a: docs: NDK table of contents fixesJoe Fernandez2015-05-234-60/+100
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '93cc51908c6d57d43f5a2ae98a850aaa67ac6b64': docs: NDK table of contents fixes
| * | | | | am b373f49a: docs: NDK table of contents fixesJoe Fernandez2015-05-234-60/+100
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b373f49a85fcbe82993940416ce04e0a1fb1e340': docs: NDK table of contents fixes
| | * | | | docs: NDK table of contents fixesJoe Fernandez2015-05-224-60/+100
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixing the encoding of the left navigation files for - Guides - References - Samples - Downloads Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae
* | | | | Merge "Add getPermissionGrantState method in device policy" into mnc-devAmith Yamasani2015-05-235-0/+60
|\ \ \ \ \
| * | | | | Add getPermissionGrantState method in device policyAmith Yamasani2015-05-225-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to have a way to query what permission state was set by the profile owner. Bug: 21356830 Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
* | | | | | Merge "Camera: update available LSC map mode key type" into mnc-devYin-Chia Yeh2015-05-223-4/+4
|\ \ \ \ \ \
| * | | | | | Camera: update available LSC map mode key typeYin-Chia Yeh2015-05-223-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21403373 Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
* | | | | | | am 09ffc01d: am 61e6be64: Merge "Doc change: updates for preview content." ↵Dirk Dougherty2015-05-2222-44/+89
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | into mnc-preview-docs * commit '09ffc01dd3bfd21410d4d620ca8f8c40d4688a86': Doc change: updates for preview content.
| * | | | | am 61e6be64: Merge "Doc change: updates for preview content." into ↵Dirk Dougherty2015-05-2222-44/+89
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c': Doc change: updates for preview content.
| | * | | | Merge "Doc change: updates for preview content." into mnc-preview-docsDirk Dougherty2015-05-2222-44/+89
| | |\ \ \ \
| | | * | | | Doc change: updates for preview content.Dirk Dougherty2015-05-2222-44/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea
* | | | | | | am eed8e782: am dd4dc4a0: resolved conflicts for merge of 7044ee16 to ↵David Friedman2015-05-2233-26/+5895
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'eed8e782ec22a11957c563e79010794571d43be9': Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
| * | | | | | am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docsDavid Friedman2015-05-2233-26/+5895
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b': Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
| | * | | | | resolved conflicts for merge of 7044ee16 to mnc-preview-docsDavid Friedman2015-05-2233-26/+5895
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7
| | | * | | | am e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a ↵David Friedman2015-05-2233-11/+5895
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single CL. * commit 'e23031c974c9b051ba639f9ad68f891e2ae87da3': Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
| | | | * | | | Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.David Friedman2015-05-2233-11/+5895
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3867d70f9d669fa08cd7d533d79e02c15339d4ff
* | | | | | | | Merge "No longer trigger immersive cling on panic" into mnc-devAdrian Roos2015-05-221-16/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | No longer trigger immersive cling on panicAdrian Roos2015-05-211-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we now request transient bars. Bug: 19282730 Change-Id: I75de4515e2df1964de8a52d3983540f7bb5379e8
* | | | | | | | | Merge "Request transient bars after panic" into mnc-devAdrian Roos2015-05-221-3/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Request transient bars after panicAdrian Roos2015-05-211-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19282730 Change-Id: Ib621a837ba06847a02333e1786ea50e5d854c7d7
* | | | | | | | | Merge "Camera2: update FpsRange requirement" into mnc-devYin-Chia Yeh2015-05-221-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: update FpsRange requirementYin-Chia Yeh2015-05-221-2/+20
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codegen doc update only. Bug:13639914 Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
* | | | | | | | | Merge "Suppress benign clang warning." into mnc-devChih-Hung Hsieh2015-05-221-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Suppress benign clang warning.Chih-Hung Hsieh2015-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To unblock continuous clang/llvm builds. BUG: 21337624 Change-Id: I38e5d11fd3c44f50430a3a8519c5071674b3df9f
* | | | | | | | | | Merge "ImageReader: Register estimated native allocation" into mnc-devChien-Yu Chen2015-05-222-0/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ImageReader: Register estimated native allocationChien-Yu Chen2015-05-222-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Estimate the native allocation and register it so it can be accounted for during GC. Bug: 20299272 Change-Id: I43af3058b6fe9a41e5e7e119e390ed079402c4b8
* | | | | | | | | | | am d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge ↵Griff Hazen2015-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit 'd2632a83668001065e6de9d38cc7166f309a2ca3':
| * | | | | | | | | | am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable ↵Griff Hazen2015-05-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit '8f585128f5ce28219f4f56bef27caac139bbfbd7':
| | * \ \ \ \ \ \ \ \ \ am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on ↵Griff Hazen2015-05-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891': Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
* | | \ \ \ \ \ \ \ \ \ \ am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert ↵Griff Hazen2015-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Reduce display device log spam." DO NOT MERGE ANYWHERE * commit 'cc6029b82bb83faf237e3f718a5479db0c53d839':
| * | | | | | | | | | | | am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device ↵Griff Hazen2015-05-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log spam." DO NOT MERGE ANYWHERE * commit 'dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f':
| | * | | | | | | | | | | am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ↵Griff Hazen2015-05-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANYWHERE * commit '5825ad231319207a64debacaa3db4812548b0442': Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* | | | | | | | | | | | | | Doc update for MediaDrm's OnExpirationUpdate methodJeff Tinker2015-05-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on EME spec clarification that expiration time of 0 means unlimited. bug: 21393975 Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
* | | | | | | | | | | | | | Merge "Fixed a flash when launching keyguard affordances" into mnc-devSelim Cinek2015-05-222-7/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a flash when launching keyguard affordancesSelim Cinek2015-05-222-7/+25
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When media artwork was present the screen would briefly show the artwork and the scrim when launching the affordances on the keyguard. Bug: 21379150 Change-Id: Ica36e7f7ef11beef9b2351af4cf43ab4e20151ac
* | | | | | | | | | | | | | Merge "Restore app expectations around drawable visibility change timing" ↵Adam Powell2015-05-222-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | Restore app expectations around drawable visibility change timingAdam Powell2015-05-222-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we update drawable visibility has changed to be part of View.onVisibilityChanged instead of an overload of setVisibility. While this covers more cases that we were previously missing, it also means that we now set drawable visibility from the View constructor via the call chain view.setFlags to view.onVisibilityChanged to drawable.setVisibility, resulting in us passing a 'this' pointer all over before the object is fully initialized. (i.e. a Bad Thing.) In general we've gotten away with playing fast and loose with this sort of thing as a part of view inflation - calling various non-final setters that may invoke callbacks as needed rather than initializing view fields directly. Unfortunately it also means that we can cause a lot of hard to trace bugs and in the long run we should try to clean up as much of it as we can. In this case, some apps were expecting inflation to have finished completely before any drawable visibility changed. If a view's visibility changes but it's not attached to a window, does it make a callback? The fix: no. We won't dispatch onVisibilityChanged to detached views, but we will dispatch it when a view becomes attached. Also fix a bug where we could end up telling a view its visibility changed to (INVISIBLE | GONE), which just doesn't make any sense. Bug 20103422 Change-Id: Ifba54c36114e85cf64869afcca766c30d601a16c
* | | | | | | | | | | | | | Merge "Improve reporting to apps of transaction too large failures." into ↵Dianne Hackborn2015-05-228-13/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | Improve reporting to apps of transaction too large failures.Dianne Hackborn2015-05-218-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the app tried to do various things with too much data -- starting an activity, starting a service, sending a broadcast -- this would fairly silently fail with little indication of what was going on. Fix this in two ways: - Now when the native code generates a TransactionTooLargeException, it may include an additional message in it telling you how much data was in the parcel being sent, to help you understand why this happening. - In all the framework code paths where we call to the system and may fail, convert these failures into a a runtime exception and rethrow them back to the app so that it will clearly get the above message. Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
* | | | | | | | | | | | | | Merge "Camera2: Implement toString() for camera2 params" into mnc-devChien-Yu Chen2015-05-223-0/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
generated by cgit v1.1 at 2025-03-27 12:40:32 +0000