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

181660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
0aa7a1ca8e am b43e74bb: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit 'b43e74bbce46f2f328e2031a7ae3447f415ef9ca':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:41:31 +00:00
Lorenzo Colitti
b43e74bbce am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:31:40 +00:00
Lorenzo Colitti
12b26c1248 am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '21702263d96341bc13420e2c74af9a4bec6c7907':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:24:31 +00:00
George Mount
efee230fe1 am 8e7c154b: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c automerge: 23eef1e 
* commit '8e7c154b07162fd91a5db1150f097606fb93f6c4':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 02:12:42 +00:00
Miao Wang
6a84f3d828 am 4bd2c00d: Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc automerge: 58fd96c 
* commit '4bd2c00d8d27d37c5e90a42ec2e39dd9fdd149eb':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 02:12:23 +00:00
George Mount
8e7c154b07 Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c 
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:32:01 +00:00
Miao Wang
4bd2c00d8d Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc 
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:27:49 +00:00
Chris Craik
ecad24b49d Merge "GlopBuilder, and test app refactor" 2015-02-05 00:25:04 +00:00
Lorenzo Colitti
21702263d9 Merge "Add a unit test for StaticIpConfiguration." 2015-02-05 00:21:57 +00:00
George Mount
23eef1ec5e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:15:50 +00:00
Miao Wang
58fd96c607 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 
automerge: 9a55cbc

* commit '9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:07:17 +00:00
Miao Wang
9a55cbc052 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 2015-02-05 00:03:05 +00:00
Chris Craik
031888744e GlopBuilder, and test app refactor 
Change-Id: I2cd299ccf178007fd5f83bab6c3448f03aec7843
 2015-02-04 15:57:59 -08:00
George Mount
c3a043cf0e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
 2015-02-04 15:27:56 -08:00
Alan Viverette
e8d05b5bab Merge "Avoid unnecessary exception handling for <include> tag" 2015-02-04 23:24:24 +00:00
John Reck
3f5175fccd resolved conflicts for merge of c7e6b93a to master 
Change-Id: I4b791f37193727a0306214645f2f98cdf218cad0
 2015-02-04 14:47:23 -08:00
John Reck
c7e6b93aba am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4 
* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
  Fix ANR caused by hwuiTask thread
 2015-02-04 22:08:27 +00:00
John Reck
af6eaf656e Merge "Fix ANR caused by hwuiTask thread" 
automerge: 5ad36d4

* commit '5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
  Fix ANR caused by hwuiTask thread
 2015-02-04 21:58:39 +00:00
John Reck
5ad36d4591 Merge "Fix ANR caused by hwuiTask thread" 2015-02-04 21:53:48 +00:00
Chris Wren
37a6ad9755 Merge "Add dumpsys info for heads up view." 2015-02-04 21:09:40 +00:00
Chris Wren
428c6b6580 Add dumpsys info for heads up view. 
Bug: 18640969
Change-Id: Ie8d271fad3259da48854e9fd5e3f8eeec51ba91e
 2015-02-04 16:07:50 -05:00
Elliott Hughes
969f0708d9 am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build." 
* commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af':
  Fix build.
 2015-02-04 20:45:18 +00:00
Elliott Hughes
4c49b1fb77 am b2d7ca7c: am fd2c1307: Merge "Fix build." 
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
  Fix build.
 2015-02-04 20:37:59 +00:00
Elliott Hughes
b2d7ca7c6f am fd2c1307: Merge "Fix build." 
* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
  Fix build.
 2015-02-04 20:31:45 +00:00
Elliott Hughes
fd2c1307e6 Merge "Fix build." 2015-02-04 20:26:03 +00:00
Elliott Hughes
f953ca2ec8 Fix build. 
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
 2015-02-04 12:24:21 -08:00
Jason Monk
d52356aa5e Move Settings wifi tracking to SettingsLib 
Make SettingsLib capable of tracking which wifi networks are
available/saved and their state.

Also modify Quick Settings to use this code rather than having
its own logic.

Bug: 19180466
Change-Id: Iff9f9aed240d79323dba41496496e8076b9fa6f2
 2015-02-04 15:08:55 -05:00
Christopher Ferris
1a81b83e1e am 9d25fcae: am 4fb79d14: Merge "Fix comment according to review." automerge: ff6cebf 
* commit '9d25fcae8560a2e2bc2e28b08778bd1a94261cd1':
  Fix comment according to review.
 2015-02-04 19:39:52 +00:00
Christopher Ferris
9d25fcae85 am 4fb79d14: Merge "Fix comment according to review." 
automerge: ff6cebf

* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
  Fix comment according to review.
 2015-02-04 19:29:56 +00:00
Christopher Ferris
ff6cebf0a6 am 4fb79d14: Merge "Fix comment according to review." 
* commit '4fb79d14bb6c81f72a92da85420090a05ec2c76d':
  Fix comment according to review.
 2015-02-04 19:15:47 +00:00
Christopher Ferris
4fb79d14bb Merge "Fix comment according to review." 2015-02-04 19:07:15 +00:00
Geoff Mendal
151eadfde3 am 8911c2ae: (-s ours) Import translations. DO NOT MERGE automerge: 140a22d -s ours 
* commit '8911c2aeb17dfde123b9d412f700c20a33babbfc':
  Import translations. DO NOT MERGE
 2015-02-04 18:58:09 +00:00
Amith Yamasani
281dfe7fd2 Merge "Use ResolveInfo for label and icon for LauncherActivityInfo" 2015-02-04 18:46:54 +00:00
Amith Yamasani
7e19f5016f Use ResolveInfo for label and icon for LauncherActivityInfo 
Instead of using the ActivityInfo, use the ResolveInfo so that
any label or icon specified on the intent-filter is used.

Also handle the density param in getIcon()

Bug: 18482039
Change-Id: I65cb7adb34b2e472bfc68e7734f3a40fd0a6244c
 2015-02-04 18:45:07 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review. 
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
 2015-02-04 10:40:12 -08:00
Geoff Mendal
ab6b238d62 Merge "Import translations. DO NOT MERGE" 2015-02-04 17:54:37 +00:00
Geoff Mendal
af8f512c75 Import translations. DO NOT MERGE 
Change-Id: I8869a20890b6395ef7facc7397fff2df6553997d
Auto-generated-cl: translation import
 2015-02-04 11:41:54 -06:00
Sailesh Nepal
fd34df0f20 Merge "Don't set address for failed remote connections" 2015-02-04 17:23:43 +00:00
Geoff Mendal
041349f338 Merge "Import translations. DO NOT MERGE" 2015-02-04 16:33:56 +00:00
Geoff Mendal
b23b7798fe Import translations. DO NOT MERGE 
Change-Id: Ic5a8c3b60bfd6618b43a914c43b79eec1ffb73fe
Auto-generated-cl: translation import
 2015-02-04 07:53:42 -08:00
Adrian Roos
761c156756 Follow-up to I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d 
Bug: 19233606
Change-Id: I394a015371acd124f84f1f6f82bc565fefc669d1
 2015-02-04 15:16:04 +00:00
Geoff Mendal
bf40f24bc2 Import translations. DO NOT MERGE 
Change-Id: I1045d9d3bcb2ddce2eb2c57fff87827c5ee23f04
Auto-generated-cl: translation import
 2015-02-04 06:51:45 -08:00
Geoff Mendal
8911c2aeb1 Import translations. DO NOT MERGE 
automerge: 140a22d  -s ours

* commit '140a22de8ead0f166eaea320a37b7134f265353e':
  Import translations. DO NOT MERGE
 2015-02-04 14:40:51 +00:00
Geoff Mendal
140a22de8e Import translations. DO NOT MERGE 
Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import
 2015-02-04 06:28:45 -08:00
Adrian Roos
75fa38539d Add API for light status bar 
Adds a systemUiVisibility flag and links it
to the status bar icon controller. Also adds a
theme attribute for setting the flag.

Bug: 19233606
Change-Id: I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
 2015-02-04 14:28:14 +01:00
Jorim Jaggi
3bef2929fa Merge "Add ability to colorize status bar" 2015-02-04 11:46:56 +00:00
Jorim Jaggi
dd0107a0db Add ability to colorize status bar 
Bug: 19233606
Change-Id: I756599395c202c4d0dd04c44beac706fc19bfe17
 2015-02-04 12:44:22 +01:00
Narayan Kamath
406e1ed988 Remove apache specific socket factory API. 
Note that this change also includes another (non-breaking) update from
another of my changes from a month ago. I guess nobody has updated API on
master in a very long time..

bug: 18027885
Change-Id: I1fb1bcdaac07131c3bc43b13ad21cacd12a2e7c8
 2015-02-04 09:50:46 +00:00
Lorenzo Colitti
83faf72f84 Add a unit test for StaticIpConfiguration. 
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
 2015-02-04 17:28:35 +09:00
Lajos Molnar
46a9721aeb Merge "MediaCodecInfo: remove stack trace logspam when querying invalid sizes" 2015-02-04 08:19:27 +00:00