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

167362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
6189bdd883 am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '6a7335acd862babb40435f678348e3e651d77c89':
  Support negative value in exponential data in the pathData.
 2014-10-10 22:08:02 +00:00
Shriram Ganesh
b52d5aaa17 am 26100906: am 91f7af97: am 69f35c8e: IMS: Unsol TTY notification support 
* commit '261009066751c9efad4e87ac12667182b0c13d43':
  IMS: Unsol TTY notification support
 2014-10-10 22:07:51 +00:00
Shriram Ganesh
9d00a58f19 am fae794a5: am 79fd7a57: am 163900a6: Ims: Send user selected TTY mode to lower layers. 
* commit 'fae794a51a84ba1ea4b4c9eca0e1b7c3a9507bdc':
  Ims: Send user selected TTY mode to lower layers.
 2014-10-10 22:07:46 +00:00
Tom O'Neill
084cd5cdf4 am 2a30585a: am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev 
* commit '2a30585a4fa086089478d5068fbf354a8a967c19':
  Fix a race where NLP consent dialog can be shown unnecessarily
 2014-10-10 22:07:41 +00:00
Svetoslav
1f2b656371 am d7c3816f: am f874a06b: am e78aa531: am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit 'd7c3816f8415c59d34daa203f6651200cb04458e':
  Fix child view ordering for accessibility.
 2014-10-10 22:07:36 +00:00
Selim Cinek
48e35f728e am 9344ddf1: am bb3627bd: am bedae0db: am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit '9344ddf1a0f138c0b83ea94fbccece588728710d':
  Fixed an issue where the notification could become transparent
 2014-10-10 22:07:30 +00:00
Christopher Tate
cab0173149 am 4cc3cff6: am 2ec14166: am df9cab2f: am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '4cc3cff6f965e81e1aaa6d14106d79dbd39ae0ae':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 22:07:25 +00:00
Christoph Studer
384548c8a5 am d55008d4: am efeb94a8: am a6a6f4b2: am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'd55008d4b78c8f90a3e52565d656f91e6f07142d':
  WallpaperCropper: Use white color for action bar
 2014-10-10 22:07:20 +00:00
Justin Koh
59439f0249 am fd9bfce6: am a53995be: am d853a900: am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit 'fd9bfce697143d8a6ac88cb03a66bdaeb51b39c1':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 22:07:15 +00:00
Adam Lesinski
c34a7c9ca2 am 97ce1a6a: am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit '97ce1a6a23bdb4213303384c6cf73b43cce6aa8f':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 22:07:09 +00:00
Dianne Hackborn
1cef19a306 am a22d2fc3: am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit 'a22d2fc319069407d29a792e23910d8ba826ac34':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 22:07:04 +00:00
Jorim Jaggi
93d457c239 am 1aec6356: am f47ca477: am e10e0dbc: am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '1aec63568aaf12aa6cbcd25da4f1929fab1e99f5':
  Fix content description for bluetooth icon
 2014-10-10 22:06:54 +00:00
Joe Fernandez
88ebf2d057 am 7810a53c: am 039e217d: am daf00ceb: am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '7810a53c57bc2e19f5f61a3bc51534c781284179':
  Revert "Removed preview license."
 2014-10-10 22:06:48 +00:00
Sandeep Siddhartha
2d1cd5b20b am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'f9c45addceed8d98f5a9a8a7486e91e4980b1fec':
  Add tests for model management [SDK Only]
 2014-10-10 22:06:43 +00:00
Etan Cohen
5fef96c5a6 am eaecf6a2: am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit 'eaecf6a2c98169534dc8d4bd98099b3731b67b1d':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 22:06:38 +00:00
Dianne Hackborn
ce09f5a53c Fix issue #17829949: Don't kill Bluetooth service... 
...even in extreme low memory condition

Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.

Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high.  Instead,
introduce a new oom adj level for it that is right below persistent.

Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
 2014-10-10 15:05:33 -07:00
Selim Cinek
a07421c6db am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '2c461def93f235d3a7853851ee125cb3caaf2955':
  Fixed missing translation for wallpaper cropper
 2014-10-10 21:18:32 +00:00
Selim Cinek
2c461def93 Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 2014-10-10 21:14:34 +00:00
Alan Viverette
cdd5e067f2 Fix inset drawable's intrinsic size, replace ic_text_dot asset 
BUG: 17648301
Change-Id: I8af0f6d1beee7a1cb3a3b9db571ed2c407e24556
 2014-10-10 14:08:32 -07:00
Dianne Hackborn
5457d5ccb6 am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.
 2014-10-10 21:06:48 +00:00
Dianne Hackborn
8f6928f139 am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit 'e61e68d001ac858d87a7f639515f12c3eafcd297':
  Improve some docs, fix some debugging.
 2014-10-10 21:01:42 +00:00
Selim Cinek
b7cde675a2 Fixed missing translation for wallpaper cropper 
Also a fixed a small visibility issue.

Bug: 17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
 2014-10-10 13:55:36 -07:00
George Mount
52fb8a4245 am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 
* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
  Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
 2014-10-10 20:52:22 +00:00
George Mount
1a285496fb Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 2014-10-10 20:48:10 +00:00
Dianne Hackborn
e61e68d001 am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.
 2014-10-10 20:47:07 +00:00
George Mount
5ac9b20b41 Allow using setLeft/Top/Right/Bottom to control ChangeBounds. 
Bug 17938614

Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
 2014-10-10 13:22:36 -07:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:12:06 +00:00
ztenghui
3406be853d am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '5237c0c3c99eb5dcaf237a291e3c97b030e4e52a':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:07:08 +00:00
ztenghui
5237c0c3c9 Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 2014-10-10 19:59:23 +00:00
Alan Viverette
4f9140b52c Add Cutive Mono as serif monospace font for captioning 
Sets up Courier and Courier New to point to Cutive Mono, since
Courier is a serif monospace font.

BUG: 17666124
Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
 2014-10-10 12:52:25 -07:00
Jerome Dochez
c9c512e0ff am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'f47f8855175213b4bf1014593f97bc81c042dfd1':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 19:24:48 +00:00
Jerome Dochez
f47f885517 Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 2014-10-10 19:21:49 +00:00
Selim Cinek
5c401a0e0b am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 18:53:10 +00:00
Selim Cinek
3e683b6a0f Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 2014-10-10 18:49:12 +00:00
Jorim Jaggi
6151222e31 am 1137ea7e: am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '1137ea7eaf9d806b17a110c2f8ddfa21b58fc3fc':
  Apply color to progress bar for notifications
 2014-10-10 18:41:48 +00:00
Elliott Hughes
e4384e93ad am 801dbe73: am 67ed9bde: am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 
* commit '801dbe73abc712e3c4fb8d3d0e760346591349ce':
  Remove some unused %% strings from frameworks/base.
 2014-10-10 18:41:42 +00:00
Elliott Hughes
3f679eb3a7 am be002304: am 8d092c23: am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev 
* commit 'be002304a39428677b91f0d9fa6d96d9f51be760':
  Track change to private libcore data structure.
 2014-10-10 18:41:37 +00:00
Adam Powell
5093be6a54 am f0eba024: am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit 'f0eba02485e10d4d9a843e67a05ca345c81f0741':
  Document that MarginLayoutParams margins should be positive.
 2014-10-10 18:41:31 +00:00
Adam Powell
892a8095aa am de640f02: am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit 'de640f02108f327a9920a2c4b435a7d425c3ef78':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-10 18:41:25 +00:00
Robin Lee
effb3c7d75 am 967bc00f: am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '967bc00fc1067d27159a6d9e528db941e6d53ec2':
  DevicePolicy: One cert tracker warning per profile
 2014-10-10 18:41:19 +00:00
Joe Fernandez
b03b9661ed am 5d5f3d1d: am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit '5d5f3d1d873a11b0a1b927f8c08b8c0c7cc732b4':
  docs: Android TV publishing requirements
 2014-10-10 18:41:13 +00:00
Chong Zhang
582570a78e am 67253051: am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit '672530513782944d7271f880679f751c2d618d15':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-10 18:41:07 +00:00
Christopher Tate
26baaa48b4 am 798965a6: am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '798965a693ff0a5ab1cdbba5d7ae5b6b23193edb':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-10 18:41:01 +00:00
Fred Fettinger
683dca32a8 am a6758f66: (-s ours) am 0ebdc70d: am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit 'a6758f664ae97cc579967d7a73826110e51f5d57':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-10 18:40:55 +00:00
mike dooley
324aa02703 am 7f1f1391: am a83896ce: am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '7f1f1391c25eef6b951c99234fbafe60c8d747ff':
  Fix hangouts conference calling regression.
 2014-10-10 18:40:49 +00:00
Tim Kilbourn
716b1f1992 am 9d285e7f: am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '9d285e7f9905923a23c400ab76b630e4ad7c8c91':
  Don't start SearchDialog on television.
 2014-10-10 18:40:44 +00:00
Jeff Brown
60eba29a0b am 1a624272: am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '1a624272315c45903240fda1807505fc47c6e83e':
  Ensure we correctly unblank displays when added.
 2014-10-10 18:40:39 +00:00
smain@google.com
e3aa88b805 am ea2a8ba4: am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'ea2a8ba464ed68eac7f0c75c7513b07751484578':
  fix unclickable link due to overlay from offset dev below
 2014-10-10 18:40:33 +00:00
smain@google.com
b90ca71683 am 5c90ccc3: am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '5c90ccc34e3fc13ac9c0ffbc52581bf02c0bf32b':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-10 18:40:28 +00:00
Christopher Tate
5f93e86d4a am 5a651161: am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '5a65116141e393a67e263f60c627d0ffd0cba6fa':
  Actually tell the widget service that restore is starting
 2014-10-10 18:40:23 +00:00