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

181688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
3ec5f97ac5 Merge "Conditionally include org.apache.http.legacy in app classpaths." 2015-02-05 12:45:24 +00:00
Narayan Kamath
e2d2ed4923 Conditionally include org.apache.http.legacy in app classpaths. 
bug: 18027885

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
 2015-02-05 12:10:06 +00:00
Yohann Roussel
de873a64c8 Merge "Adapt to change of LOCAL_USE_JACK values" 2015-02-05 11:01:36 +00:00
Yohann Roussel
f50a51fb4c Adapt to change of LOCAL_USE_JACK values 
Also remove depency to the dx main dex list when building with
Jack.

Change-Id: I13e45dc8406a6a71309d151bf1542b1296c17792
 2015-02-05 10:11:34 +01:00
Alan Viverette
323d888b64 am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4 
* commit 'eeb69d171b4023e92fb729bf61d566540bdd5220':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:50:28 +00:00
Zhijun He
d7c32e4843 am 1350671f: am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev automerge: 6bafb86 
* commit '1350671f406c238439e1dc4378287bd422aaf636':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:50:18 +00:00
Alan Viverette
eeb69d171b Move layer-list to be top-level element in seek bar progress automerge: bac8e12 
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:45:31 +00:00
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress 
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:35:27 +00:00
Alan Viverette
77ad055957 am c2bf7440: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 automerge: a638c44 
* commit 'c2bf7440ba9e3484d37d9c5df2ef02710682b7ed':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:53:52 +00:00
Alan Viverette
29d267c7b3 am fcce8e1a: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 automerge: f89e06f 
* commit 'fcce8e1a8250681bdbdb31301660036c170a8d57':
  Replace ic_clear with vector icon
 2015-02-05 02:53:46 +00:00
Yang Ni
bacbb8f378 am b457258b: am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'b457258b5adc76989e39fe5f3e63781d4ee47576':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:41:47 +00:00
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
Alan Viverette
c2bf7440ba Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:39:32 +00:00
Alan Viverette
fcce8e1a82 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 
automerge: f89e06f

* commit 'f89e06fa58c08ff550a69b268832a2ea338b8700':
  Replace ic_clear with vector icon
 2015-02-05 02:38:25 +00:00
Yang Ni
b457258b5a am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'da91dfbdf20271dffce5357195800cf36183ad97':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:31:46 +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
Yang Ni
da91dfbdf2 am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit '1269ff961000c726247d510762e42b21562b8c2b':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:24:35 +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
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 02:15:49 +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
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 01:13:06 +00:00
Alan Viverette
f89e06fa58 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 01:11:28 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Yang Ni
1269ff9610 Merge "Adds invocable functions to ScriptGroup" 2015-02-05 01:05:08 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable 
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
 2015-02-04 16:44:02 -08: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
Yang Ni
be392ad35e Adds invocable functions to ScriptGroup 
This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
 2015-02-04 16:24:48 -08:00
Lorenzo Colitti
21702263d9 Merge "Add a unit test for StaticIpConfiguration." 2015-02-05 00:21:57 +00:00
Alan Viverette
721a95784e Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 2015-02-05 00:20:15 +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
Alan Viverette
b0d672376d Replace ic_clear with vector icon 
Fixes the clear icon being really tiny.

Bug: 19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab
 2015-02-04 22:49:02 +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
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements 
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
 2015-02-04 13:59:43 -08: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