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

154870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
1eeec4e4ea am 3bb0b296: am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 
* commit '3bb0b2964df28a17999a53a4b3c7667f81a58506':
  Add Cutive Mono as serif monospace font for captioning
 2014-10-11 02:50:03 +00:00
Ihab Awad
d410a2f4ee am a516e445: Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev 
* commit 'a516e445651724da3a833d08540c42fabe4f34b7':
  Add color to PhoneAccount objects (1/3)
 2014-10-11 02:49:21 +00:00
Alan Viverette
3bb0b2964d am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 
* commit '99cc35bbde7415fcdeada6fb4243097af85ae33f':
  Add Cutive Mono as serif monospace font for captioning
 2014-10-11 00:24:03 +00:00
Alan Viverette
284559bfb8 Merge "Fix inset drawable's intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev 2014-10-11 00:14:27 +00:00
Alan Viverette
99cc35bbde Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 2014-10-10 23:41:17 +00:00
Ihab Awad
a516e44565 Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev 2014-10-10 23:02:12 +00:00
Selim Cinek
3b0169aec3 am a07421c6: am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit 'a07421c6dbcc1e34d9c91a416cf0dd2255c79701':
  Fixed missing translation for wallpaper cropper
 2014-10-10 22:53:58 +00:00
George Mount
e6308c7eb2 am 52fb8a42: am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 
* commit '52fb8a4245aad87972bb6b52697fcd2dd111fe99':
  Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
 2014-10-10 22:53:47 +00:00
Jerome Dochez
0757e5fd6d am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'c9c512e0ff2faf86eb544bf175a1d177f9b7ba6d':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 22:53:16 +00:00
Selim Cinek
b7981719b0 am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '5c401a0e0bf3b5f647f7f1791e10195f748bfe96':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 22:53:07 +00:00
Christopher Tate
f1178b23ac am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold 
* commit '2c15bbc8382ac7e5f04d149c8f576261f1dca334':
  Tweak wallpaper restore rejection threshold
 2014-10-10 22:52:57 +00:00
Jinsuk Kim
62ba538b94 resolved conflicts for merge of 3170c035 to lmp-mr1-dev 
Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86
 2014-10-11 07:23:18 +09: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
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
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
ztenghui
897f6daeff Support negative value in exponential data in the pathData. 
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
 2014-10-10 11:11:34 -07:00
Christopher Tate
2c15bbc838 am 1133e29f: Tweak wallpaper restore rejection threshold 
* commit '1133e29f22252cc36102f41204c3de35779e49d2':
  Tweak wallpaper restore rejection threshold
 2014-10-10 18:05:32 +00:00
Ihab Awad
82816c11bd Add color to PhoneAccount objects (1/3) 
Change-Id: I1887ba14f284453784299434cbc3d67c950d4266
 2014-10-10 11:04:21 -07:00
Christopher Tate
1133e29f22 Tweak wallpaper restore rejection threshold 
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.

Bug 17882661

Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
 2014-10-10 17:54:14 +00:00
Shriram Ganesh
69f35c8e1b IMS: Unsol TTY notification support 
Code changes to support UNSOL_TTY_NOTIFICATION handling.

Change-Id: I74bba5d06198e016db259ec1f7d28663d475cb92
 2014-10-10 16:24:13 +00:00
Shriram Ganesh
163900a6a1 Ims: Send user selected TTY mode to lower layers. 
Irrespective of whether TTY device is connected or not
send TTY mode setting to modem whenever user changes it
from settings.

Change-Id: I2797cdffea0c10c90cd4f213bd0ea9d63c09f29d
 2014-10-10 16:23:24 +00:00
Tom O'Neill
1db0cce028 Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev 2014-10-10 15:26:30 +00:00
Jinsuk Kim
3170c03543 am 294297df: Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev 
* commit '294297df4e3f327a81d922563c518aee8ee3e51d':
  CEC: Prevents HdmiControlService from turning on TV on wakeup
 2014-10-10 14:45:33 +00:00
Dianne Hackborn
18d2d51ee3 am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
  Improve some docs, fix some debugging.
 2014-10-10 14:44:59 +00:00
Jinsuk Kim
294297df4e Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev 2014-10-10 03:52:27 +00:00
Dianne Hackborn
7ea69880bd Merge "Improve some docs, fix some debugging." into lmp-dev 2014-10-10 01:27:13 +00:00
Dianne Hackborn
ab4a81b3c6 Improve some docs, fix some debugging. 
- Add docs to Binder, Messenger, ResultReceier to explain their
  relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
  and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
  the input as a package, so including all processes that are
  running code of that package.
- Fix top-level per-package debug output to correctly include all
  of these improvements and give them a little more time (10s) to
  complete for timing out.

Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
 2014-10-09 18:21:59 -07:00
Selim Cinek
6bb4a9b356 Fixed a bug where the panel got into a wrong state 
Bug: 17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
 2014-10-09 17:48:05 -07:00
Svetoslav
e78aa53123 am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit '9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199':
  Fix child view ordering for accessibility.
 2014-10-10 00:32:15 +00:00
Selim Cinek
bedae0dbf1 am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit '3e056aa0e09003679c2b96f6d5c966d299d8b70a':
  Fixed an issue where the notification could become transparent
 2014-10-10 00:31:59 +00:00
Christopher Tate
df9cab2f12 am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:31:53 +00:00
Christoph Studer
a6a6f4b218 am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'a2830b7da7bb27976bd497245e6e1fa4d8a428e9':
  WallpaperCropper: Use white color for action bar
 2014-10-10 00:31:31 +00:00
Justin Koh
d853a90026 am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit '1840bfee70ac85026072222cabe77709d849d7c7':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 00:31:24 +00:00
Adam Lesinski
be003a3570 am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'f23e3ea629f29060f34ea10a0d89c6ec22766789':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:30:39 +00:00
Dianne Hackborn
d190a5ca4c am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:30:33 +00:00
Jorim Jaggi
e10e0dbc86 am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'fc779ccf865df605310a2da309a3d694b4c0e613':
  Fix content description for bluetooth icon
 2014-10-10 00:30:28 +00:00
Joe Fernandez
daf00ceb3b am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '487e15b90140b0a1f343c61eb0ea658db3caa1b7':
  Revert "Removed preview license."
 2014-10-10 00:30:23 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Etan Cohen
c3f8a8b1ec am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:30:14 +00:00