Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Chris Wren
a6d4fb60ed Push back notification means snooze the package. 
Bug: 18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
 2014-11-21 15:51:41 -05:00
Alan Viverette
d7c5acdf1c am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
  Fix error overwriting when restoring error
 2014-11-21 20:49:11 +00:00
Alan Viverette
47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:49:04 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Alan Viverette
e606a7884d am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit '0218970afaeefcabf7ed4b476cb93f28d61847b8':
  Fix error overwriting when restoring error
 2014-11-21 20:45:15 +00:00
Alan Viverette
e442e904ae am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit '47172f53659e4e98988dab99a4155653b638b1e5':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:45:09 +00:00
Alan Viverette
0218970afa Merge "Fix error overwriting when restoring error" 2014-11-21 20:40:30 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Joe Fernandez
fbdfdef43d am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '9034ead0ba8ce1d0c8c162d9516ca188b783d407':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-21 20:37:02 +00:00
Joe Fernandez
9034ead0ba am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '5b94d00b896b2bbc71a0c925e92e8c7e08978975':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-21 20:32:03 +00:00
Joe Fernandez
5b94d00b89 docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links

Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
 2014-11-21 20:27:13 +00:00
ztenghui
996f22f4df Supporrt tapas build for vector tests 
Such that UX team has less pain on building the VD / AVD assets.
This also requires removing internal API dependence in the test.

To build the VectorDrawableTest with prebuilt SDK.
<root dir>/tapas VectorDrawableTest
<root dir>/make -j64 showcommand
Then later for incremental build.
<root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20

b/18260896

Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
 2014-11-21 19:40:34 +00:00
Bryce Lee
296ea91742 am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'deee5566417af229a142cf8c1964e98a356513e4':
  Make default windows features configurable.
 2014-11-21 19:27:55 +00:00
Jinsuk Kim
4d1189e283 CEC: Enable log for non-user builds 
This helps get better bugreports for dogfooding. Accompanying bug
will be kept track of to ensure the log is turned off before
shipping. See ag/175890 for reference.

Bug: 18471978
Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
 2014-11-22 04:25:20 +09:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Sailesh Nepal
7a4e3871e7 Add system API to get registered connection managers 
This API is used to check if we're in the simplified
version of the call assistant settings UI or the version
that displays a full list.

Bug: 18473946
Change-Id: I7dca50ada80b2203bd8d646bb510418646382df8
 2014-11-21 11:01:40 -08:00
Jim Miller
879a4ee8b0 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e 
automerge: eab3240

* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
  Add multi-sim support to keyguard
 2014-11-21 18:55:36 +00:00
Chih-hung Hsieh
9ebffb40d8 Revert "Frameworks/base: Mask Skia warning in GraphicsJNI" 
Should be unnecessary after c/115476.
This reverts commit ba823cee8b.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
 2014-11-21 18:54:15 +00:00
Jim Miller
eab3240c78 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard
 2014-11-21 18:53:10 +00:00
Andreas Gampe
42ddc18d10 Frameworks/base: Unused parameters in hwui 
Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
 2014-11-21 10:39:21 -08:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Andreas Gampe
7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp 
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
 2014-11-21 10:36:14 -08:00
Andreas Gampe
5e88177ecb Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
automerge: 935fd8d

* commit '935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97':
  Frameworks/base: Wall Werror in media/tests
 2014-11-21 18:27:52 +00:00
Adrian Roos
c7cf8cca6b am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev automerge: 0108d98 
automerge: 034b909

* commit '034b9092fb93f03e6e723ac6eac8d8d0e8c4048a':
  Explicitly specify user for public mode
 2014-11-21 18:26:41 +00:00
Rubin Xu
f6a1ef1d7b am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
automerge: 83f2f47

* commit '83f2f4795060352886943fff714ff14030bfdc9a':
  String literals for CL ag/586597
 2014-11-21 18:25:13 +00:00
Ruben Brunk
faa5ccabbc am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
automerge: 2847eb7

* commit '2847eb7324ea94fb60f63c0de84c16316cb2851f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 18:23:43 +00:00
Andreas Gampe
3fc5e3cabf am 2c596a53: Merge "Frameworks/base: Consistency in core/jni" 
* commit '2c596a533488320444e28bbe37b7032589a0c5dd':
  Frameworks/base: Consistency in core/jni
 2014-11-21 18:22:36 +00:00
Andreas Gampe
f17c1d7db1 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
automerge: 55dbf00

* commit '55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3':
  Frameworks/base: Remove unused header
 2014-11-21 18:21:41 +00:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni 
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
 2014-11-21 10:15:08 -08:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Andreas Gampe
935fd8d0b1 Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-21 18:08:12 +00:00
Adrian Roos
034b9092fb am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
automerge: 0108d98

* commit '0108d9836971d9f40bf7856d1858ecc4b153e511':
  Explicitly specify user for public mode
 2014-11-21 18:04:23 +00:00
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
 2014-11-21 18:02:26 +00:00
Rubin Xu
83f2f47950 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit '55a05e4d35c0886733586db0d5aa1af5030d35a7':
  String literals for CL ag/586597
 2014-11-21 17:59:49 +00:00
Andreas Gampe
307218c7f2 resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp 
Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9
 2014-11-21 09:57:52 -08:00
Adrian Roos
26750711e1 Merge "Explicitly specify user for public mode" into lmp-mr1-dev 2014-11-21 17:57:01 +00:00
Ruben Brunk
2847eb7324 am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit 'a345b3671a8e2d1a91ccb594f219303d3e1f135f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:55:19 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Scott Rowe
63108ee362 am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:50:17 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Andreas Gampe
55dbf00fd8 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
  Frameworks/base: Remove unused header
 2014-11-21 17:47:57 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Andreas Gampe
09910723c5 am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests" 
* commit 'ed368be79248d8e0a71c383b2ed6eb93b451810e':
  Frameworks/base: Wall Werror in media/tests
 2014-11-21 17:41:31 +00:00
Andreas Gampe
0da1cbaaab am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit 'e042791e753d35d7fd60f0a9a2b5764dc8d9afac':
  Frameworks/base: Remove unused header
 2014-11-21 17:41:25 +00:00
Scott Rowe
02cb1fe6c4 am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '14f78ed7b8c374017fa37f29cfed2208a072ea28':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:41:06 +00:00