drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,007 Commits 1 Branch 0 Tags
Commit Graph

197007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
378102071d am 1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev 
* commit '1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff':
  Use path intersection instead of saveLayer+mesh to mask projected ripples
 2015-05-28 22:08:39 +00:00
Deepanshu Gupta
f5b914cf2c am 5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev 
* commit '5cd795a9094eb02c983751ecabca6f24b0a01c58':
  Fix NPE in BridgeContext.obtainStyledAttributes()
 2015-05-28 22:08:34 +00:00
Deepanshu Gupta
47c99a5d85 am 1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev 
* commit '1421583bca78ed1d2e22d091d64ae72352c4a9f5':
  Fix BridgeTypedArray.getType()
 2015-05-28 22:08:30 +00:00
Chris Craik
1cd7e4c3d0 Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev 2015-05-28 22:03:08 +00:00
Deepanshu Gupta
5cd795a909 Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev 2015-05-28 21:59:12 +00:00
Quddus Chong
01c4d8d357 am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing. 
* commit 'dcfa755616504fb4443f4d79d936f30c3742d77a':
  docs: Fixed training TOC formatting and broken link in TV training landing.
 2015-05-28 21:59:02 +00:00
David Friedman
ed8c62955a Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs 2015-05-28 21:58:58 +00:00
Deepanshu Gupta
1421583bca Merge "Fix BridgeTypedArray.getType()" into mnc-dev 2015-05-28 21:58:58 +00:00
Deepanshu Gupta
d758e042ce Fix NPE in BridgeContext.obtainStyledAttributes() 
Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
 2015-05-28 14:57:43 -07:00
Deepanshu Gupta
5779ad71ea Fix BridgeTypedArray.getType() 
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
 2015-05-28 14:57:43 -07:00
Tao Bao
5f90a8c5bd am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 
* commit '165102f350e08bd186b25b90dd8a42aad8975890':
  Wait for uncrypt to finish before rebooting
 2015-05-28 21:51:44 +00:00
Dianne Hackborn
da71e10040 am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev 
* commit '4573dddcce3f232d2eeb20bfe0e204e15a9416e9':
  Add new API to set URI on AssistContent.
 2015-05-28 21:51:37 +00:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
Quddus Chong
dcfa755616 docs: Fixed training TOC formatting and broken link in TV training landing. 
Change-Id: Ie159a1e5d3d84bfc20b2e2f0f5d4973d3880876d
 2015-05-28 14:46:24 -07:00
Evgenii Stepanov
0f167ab4b1 am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev 
* commit 'bf7fe1e051fefc5e6c1b96411a842b0305a9192c':
  Update asan/app_process.
 2015-05-28 21:36:13 +00:00
Quddus Chong
3ef682bd36 am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs 
* commit '0e591ef26ae060bf1d47ffdd02b23b5da416fad7':
  docs: Misc. fixes for M Preview docs.
 2015-05-28 21:36:09 +00:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Evgenii Stepanov
bf7fe1e051 Merge "Update asan/app_process." into mnc-dev 2015-05-28 21:30:58 +00:00
Quddus Chong
0e591ef26a am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs 
* commit '7138643f4185d402ac216cfcfe3c871c860bf84e':
  docs: Misc. fixes for M Preview docs.
 2015-05-28 21:20:18 +00:00
Olawale Ogunwale
1dfb539b50 am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev 
* commit 'aa47d8d97600e439c73cdbdcc47db44e71831ea6':
  Revert "Revert "Remove debugging and skip InputMethod windows""
 2015-05-28 21:12:17 +00:00
Quddus Chong
7138643f41 am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs 
* commit 'd5db0f63b4cf03294c2871eb3bf9d3b944700788':
  docs: Misc. fixes for M Preview docs.
 2015-05-28 21:05:02 +00:00
Olawale Ogunwale
aa47d8d976 Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev 2015-05-28 20:59:10 +00:00
David Friedman
56d16c020c Docs: A few minor corrections: deleted obsolete sentences, fixed references. 
Change-Id: I39c5c060f41cc501ef595e136fa2376232ea108d
 2015-05-28 13:57:33 -07:00
Alan Viverette
b63b93dee7 Fix drawable CTS breakages 
1. ClipDrawable.getOpacity() now correctly respects the current level
2. DrawableWrapper checks the contained drawable's changing config even
   if it doesn't have a constant state
3. DrawableWrapper gives priority to the last valid child drawable
   rather than the drawable attribute

Bug: 21406104
Change-Id: I442fe90d0a3865bfdc6b2d14a7358178310dde02
 2015-05-28 13:50:44 -07:00
Quddus Chong
d5db0f63b4 Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs 2015-05-28 20:47:15 +00:00
John Spurlock
87d969a893 am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev 
* commit '517f3ee41afb7713f1fc6fa37a6f3a6efa97a020':
  Backup/restore notification policy.
 2015-05-28 20:39:44 +00:00
Doris Liu
7b554a8f15 am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev 
* commit '057d93971a5415a989ec5c8a8b0437ee12b6604f':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag
 2015-05-28 20:39:39 +00:00
Guang Zhu
0ea60834f7 am 6ac0c8c5: lock device orientation during app compatibility test 
* commit '6ac0c8c5faaa2fdf56a533a6a3452d53850809ee':
  lock device orientation during app compatibility test
 2015-05-28 20:39:33 +00:00
John Spurlock
517f3ee41a Merge "Backup/restore notification policy." into mnc-dev 2015-05-28 20:34:18 +00:00
Doris Liu
057d93971a Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev 2015-05-28 20:33:12 +00:00
David Srbecky
94ea95d0d8 am 9d698acf: am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info." 
* commit '9d698acfc487e2e161bc3e56d7ba664c329a57a3':
  Replace --include-cfi with --generate-debug-info.
 2015-05-28 20:31:03 +00:00
Evgenii Stepanov
a4a4d9fbde am fa4eeb66: am b8e100d7: am 495ebb11: Merge "Update asan/app_process." 
* commit 'fa4eeb66c39dd599651760851430741b643bd7f8':
  Update asan/app_process.
 2015-05-28 20:30:57 +00:00
Doris Liu
c81c082628 Fix ScrollView's EdgeEffect to respect clipToPadding flag 
bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408
 2015-05-28 13:29:44 -07:00
Guang Zhu
6ac0c8c5fa lock device orientation during app compatibility test 
Devices on test benches are usually held sideways, which leads to app
rotation during launch. While it's useful to identify such issue from an
app perspective, the app compatibility test should be isolated from such
noise for the purpose of the testing for basic level of compatibility.

Change-Id: I403f96e5d8512ca6a17b05a83d69f4b02f760a32
 2015-05-28 20:26:37 +00:00
David Friedman
9f33a25749 Docs: Fixes a broken link and a typo; deletes obsolete sentence/link. 
Change-Id: I78d719f48f795f0477e4a08920ddb05fce48b5fc
 2015-05-28 13:25:32 -07:00
John Spurlock
35ef0a626c Backup/restore notification policy. 
- Include zen + ranking config in the backup payload.
 - Owner user only for now.
 - For the most part, reuse existing policy file structure
   as the payload format, but elide items that do not survive
   across devices (info for secondary users, uids).
 - Also elide the manual zen rule, if set.
 - During restore, keep ranking info for uninstalled apps
   in purgatory until the apps exist.

Bug: 17755700
Change-Id: Iadf71a43cd0efd44fe9a0a29874d60666b6d2076
 2015-05-28 16:25:32 -04:00
Quddus Chong
276ec483e2 docs: Misc. fixes for M Preview docs. 
Change-Id: I816bb18d0110a4a7e585fe727471c2356a93caac
 2015-05-28 13:17:55 -07:00
David Srbecky
9d698acfc4 am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info." 
* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.
 2015-05-28 20:16:45 +00:00
Evgenii Stepanov
fa4eeb66c3 am b8e100d7: am 495ebb11: Merge "Update asan/app_process." 
* commit 'b8e100d7a46b1bee4b2e055fb354bfc72df8809c':
  Update asan/app_process.
 2015-05-28 20:16:39 +00:00
Bryce Lee
fc2cb1551e am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit '3aeb5f848eee2c6de9bb49c9dcc7ca5127ef7c1e':
  Introduce indirection for base micro themes.
 2015-05-28 20:15:44 +00:00
Adam Lesinski
e87126e891 am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 
* commit '8a179cab7971782900f5b4a872f4f432c7d17987':
  BatteryStats: Output per-app wifi controller distribution
 2015-05-28 20:15:39 +00:00
Bryce Lee
3aeb5f848e am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.
 2015-05-28 20:07:57 +00:00
Adam Lesinski
8a179cab79 Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 2015-05-28 20:04:18 +00:00
Bryce Lee
2836b863fb am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.
 2015-05-28 19:52:17 +00:00
Adam Lesinski
049c88b48a BatteryStats: Output per-app wifi controller distribution 
Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
 2015-05-28 12:51:19 -07:00
Evgenii Stepanov
5ca3afa296 Update asan/app_process. 
Build both 32 and 64-bit versions and don't limit it to eng.

Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630
(cherry picked from commit e740b17d2400ed0db17d1f7fce4f052bbbf808ab)
 2015-05-28 12:47:30 -07:00
Peng Xu
f84a27b5e5 am 0df9a7cf: am 2c530e41: am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev 
* commit '0df9a7cfd8401317dcfd84c346a128efd0dedd05':
  Bug fix and documentation clarification
 2015-05-28 19:44:28 +00:00
Joe Fernandez
1197951848 am 61b3adaa: am f4dcdc02: am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit '61b3adaa4d755503f593dfbdb381ca492a5a26bd':
  docs: Fix broken links on M Preview.
 2015-05-28 19:44:23 +00:00
Luan Nguyen
e163091d47 am b7342841: am 0fb1421c: am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references 
* commit 'b734284134c3a94a083501c2c85e568f14aacc9c':
  docs: Remove api-changes.html and references
 2015-05-28 19:44:18 +00:00
Bryce Lee
f33da5188d Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 2015-05-28 19:39:45 +00:00