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

193414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
469fb1efd6 Fix build 
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
 2015-05-28 15:33:40 -07: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
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
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +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
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
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
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
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
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
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
Bryce Lee
f33da5188d Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 2015-05-28 19:39:45 +00:00
David Friedman
e9ac81745e am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs 
* commit 'dd6ccfd0d97c7a794793cd465be029310efa67ea':
  Docs: Quick typo fix.
 2015-05-28 19:20:19 +00:00
Luan Nguyen
dd054f505b am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby 
* commit '15afeaa99f6da12f6237a2b24fdd544b298bf589':
  docs: Fix bad heading link for doze-standby
 2015-05-28 19:20:13 +00:00
David Friedman
dd6ccfd0d9 am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs 
* commit '8bf833e40f403f5f40233bf7c68778b2401c5673':
  Docs: Quick typo fix.
 2015-05-28 19:03:28 +00:00
Luan Nguyen
15afeaa99f am 2429cc41: docs: Fix bad heading link for doze-standby 
* commit '2429cc419794a06866670675a5e5b3d7a746dd6b':
  docs: Fix bad heading link for doze-standby
 2015-05-28 19:03:21 +00:00
David Friedman
8bf833e40f Merge "Docs: Quick typo fix." into mnc-preview-docs 2015-05-28 18:59:47 +00:00
Peng Xu
08ecf676e6 Merge "Bug fix and documentation clarification" into mnc-dev 2015-05-28 18:57:46 +00:00
Joe Fernandez
e0e8570d59 am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit '46e58a17890f9013f2d3714607c4c835df3638e0':
  docs: Fix broken links on M Preview.
 2015-05-28 18:54:43 +00:00
Luan Nguyen
587748cdf7 am a21ff962: am c5d3758e: docs: Remove api-changes.html and references 
* commit 'a21ff9621e3b9b8d64945ea55165acf435acd9b9':
  docs: Remove api-changes.html and references
 2015-05-28 18:54:39 +00:00
Luan Nguyen
2429cc4197 docs: Fix bad heading link for doze-standby 
bug: 21491909
Change-Id: Id8c10262ab311aca42d3b4d37a479d6543530505
 2015-05-28 11:48:31 -07:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent. 
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
 2015-05-28 11:44:58 -07:00
Joe Fernandez
46e58a1789 am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 
* commit 'c8bcfe285626da3734281a17bb1748c68a33d46a':
  docs: Fix broken links on M Preview.
 2015-05-28 18:37:07 +00:00
Luan Nguyen
a21ff9621e am c5d3758e: docs: Remove api-changes.html and references 
* commit 'c5d3758eab49974dde9f2c3796e8abed79c69a1c':
  docs: Remove api-changes.html and references
 2015-05-28 18:37:02 +00:00
David Friedman
319213eea1 am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit '52454e38625e7457f645afe97ca3f666d615acc6':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 18:36:51 +00:00
Joe Fernandez
c8bcfe2856 Merge "docs: Fix broken links on M Preview." into mnc-preview-docs 2015-05-28 18:25:59 +00:00
Luan Nguyen
c5d3758eab docs: Remove api-changes.html and references 
bug: 21491968
Change-Id: I4e3c9f135cb568735bbdce999c89699ef13b4cfe
 2015-05-28 11:19:05 -07:00
David Friedman
52454e3862 am bb7877c4: Docs: IO quick fix--commenting out part of script. 
* commit 'bb7877c4fe2c70ece0ab7d596e2a01a0e7c3c0db':
  Docs: IO quick fix--commenting out part of script.
 2015-05-28 18:18:47 +00:00
Sanket Padawe
3a017f2c32 Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev 2015-05-28 18:10:44 +00:00
David Friedman
bb7877c4fe Docs: IO quick fix--commenting out part of script. 
Change-Id: Iaa7aa1d5e055e8ae05c636e1504fa80261f4a78f
 2015-05-28 11:07:41 -07:00
Bryce Lee
b99b91cdf8 Introduce indirection for base micro themes. 
This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.

Bug: 21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e
 2015-05-28 11:03:57 -07:00
Yin-Chia Yeh
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00:00
Luan Nguyen
17e46067c0 docs: Fix broken links on M Preview. 
bug:21490711
Change-Id: I1608dae5518f7335b5bc366cc28ee27a73a08521
 2015-05-28 10:47:35 -07:00
Sanket Padawe
3e9e5fa66e Fix display of "null" string shown in Wifi Settings for AP. 
Bug: 21476825
Change-Id: I643dcaa3112ff896e7b0abd998f2ad5e13187706
 2015-05-28 10:41:14 -07:00
Brian Attwell
8d38a8d84f Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 2015-05-28 17:36:36 +00:00
Luan Nguyen
56edce33fb am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs 
* commit '759b1673dd682db6dbddf8531b704dba1853ae1b':
  docs: Remove broken image link from samples.
 2015-05-28 17:28:24 +00:00
Nancy Chen
ec7100d011 Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev 2015-05-28 17:17:19 +00:00