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

166335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohei Yukawa
d3f51271f5 Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 
automerge: ba910df

* commit 'ba910dfaddb2e2926c9c52fbc6ca3f2f8cf1028b':
  Fix not to show a log with empty default ime
 2014-10-31 03:35:40 +00:00
Mark Renouf
2182bf5ac8 am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit '3d875f804018ebd48189633bb48ad6083c953eed':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:22:07 +00:00
Tyler Gunn
450f9047ce Merge "Creating connections for conference event package participants." into lmp-mr1-dev 2014-10-31 03:16:09 +00:00
Mark Renouf
3d875f8040 am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:13:21 +00:00
Yohei Yukawa
ba910dfadd Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 2014-10-31 03:09:05 +00:00
Adam Powell
5dd072d884 Allow swipe down to dismiss for ResolverDrawerLayout 
Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!

Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.

Bug 18026675

Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
 2014-10-30 19:51:41 -07:00
Mark Renouf
cf0f740e39 If no display settings are matched, return the first one. DO NOT MERGE 
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.

BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
 2014-10-30 21:42:11 -04:00
Alan Viverette
e0e16794af am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit '19745dc0f1686dbcadd0107a18e4336ce2de2729':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:38:56 +00:00
George Mount
104257bac6 am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:38:48 +00:00
Alan Viverette
1dfcd0cc96 am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:38:39 +00:00
Rich Slogar
96b245acf0 docs:studio-update-814 
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
 2014-10-30 17:31:33 -07:00
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
 2014-10-31 00:29:52 +00:00
Alan Viverette
b65a27da39 am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:29:29 +00:00
Guang Zhu
3ef0189a82 am 3a68e181: am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '3a68e1811f8d374fec04e75e34a89042ca9d1862':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-31 00:29:22 +00:00
Santos Cordon
523271dee7 am 52e34e6a: am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '52e34e6a623095f00629af09e89889fd34ae6e0a':
  More updates to javadocs for Telecom APIs.
 2014-10-31 00:29:09 +00:00
Santos Cordon
b99e154ac2 am 3ae9505f: am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev 
* commit '3ae9505f67b24fd29388d2ab0666086e81db6fce':
  Even more javadocs for telecom.
 2014-10-31 00:28:58 +00:00
Selim Cinek
47278983d9 am db885e22: am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 
* commit 'db885e22bd518fef27a339efddff8b3484610b53':
  Fixed a bug with notification clipping
 2014-10-31 00:28:40 +00:00
John Spurlock
68fdbd0179 am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit 'a0adb0bd46389b7ac0474b7727cdbdb36d0d48a0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:28:28 +00:00
Alan Viverette
71c2789930 am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:28:11 +00:00
Jean-Michel Trivi
8fdb0d4def More AudioPolicy registration 
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
 is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
 the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
 and AudioRecord objects that are respectively used as the
 source and sink of the mixes created by the policy owner.

Bug 16009464

Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
 2014-10-30 17:22:34 -07:00
Ricardo Cervera
9a0e242c84 am 44e79cc5: am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit '44e79cc59ab32f37e3e0c91046e01e47c24fc1e6':
  docs: Two-page notification fix.
 2014-10-31 00:16:38 +00:00
Jorim Jaggi
15962f1da5 am 196edbc9: am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 
* commit '196edbc9f650d1840116e625092b8e9f5727806f':
  Make status bar expanding more tightly coupled to finger
 2014-10-31 00:16:29 +00:00
Jorim Jaggi
0b2c319f4c am 37651a8b: am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 
* commit '37651a8baa1405a8b53b41f8c75d75fa3d760956':
  Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
 2014-10-31 00:16:20 +00:00
Lorenzo Colitti
58d86a5c2a am 1a9864db: am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev 
* commit '1a9864db0af701074d9060f8eef8189e108485be':
  Enable 464xlat on wifi.
 2014-10-31 00:16:14 +00:00
Lorenzo Colitti
fa186dbd3d am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:16:09 +00:00
Nicolas Prevot
da0611a759 am ad93adfb: am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev 
* commit 'ad93adfb3d4b5470098ec82ea320b9e3669abddb':
  Schedule to write package restrictions.
 2014-10-31 00:15:55 +00:00
Chris Banes
3726cd1285 am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:15:48 +00:00
Dongwon Kang
c86090ea0c am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d 
* commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-31 00:15:40 +00:00
Dongwon Kang
27219325d5 am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-31 00:15:33 +00:00
Yigit Boyar
9d0a2dc15d am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
  Move all actionbar related methods to DecorToolbar
 2014-10-31 00:15:16 +00:00
Alan Viverette
af896cc719 am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'ce0bc26443bb61832ac59a0d367b9ec1a540301b':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-31 00:15:09 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Alan Viverette
370403dbde am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 
* commit '07a08010a87daec2091b643a8fcf2f7a27588098':
  Add theme and config change support to more Drawable types
 2014-10-31 00:14:51 +00:00
Alan Viverette
349e93ea65 am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
  Show scroll indicators in AlertDialog
 2014-10-31 00:14:38 +00:00
kmccormick
8909977bd1 am 30c27afc: am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '30c27afcc79ac574ab4dd8a8341ebd9e26b5ada3':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-31 00:14:29 +00:00
kmccormick
fa0af98f1b am d61ce7db: am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit 'd61ce7db43015fde515d85fe6c7a424030f8c8d3':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-31 00:14:23 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
Wale Ogunwale
75b1e8c5c6 am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit '0319e704c19deeea7cd8c93a6275ac02e565b473':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-31 00:13:36 +00:00
Eric Laurent
c27169e0d2 am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 
* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
  SoundTrigger JNI: fix local reference leak.
 2014-10-31 00:13:30 +00:00
Svetoslav
6c70290ff0 Adding APIs to enable apps to influence accessibility traversal. 
Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.

Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.

This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.

This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.

bug:17319923

Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
 2014-10-30 16:55:53 -07:00
Alan Viverette
c2663dfdab am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
  Update drawable state after updating tint list
 2014-10-30 23:44:49 +00:00
Svetoslav
65895facf2 am 39f35336: am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev 
* commit '39f35336e528434e59f4ea317498919d8d4f9dbd':
  Print preview disappearing if printer is changed.
 2014-10-30 23:44:43 +00:00
Alan Viverette
b50a6f39ca am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'baed009eaeaacffef7cc0972517434451e357aef':
  Add setters for window elevation and clipToOutline properties
 2014-10-30 23:44:37 +00:00
Alan Viverette
aff329f867 am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit '9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309':
  Ensure accessibility focus rect is drawn correctly
 2014-10-30 23:44:31 +00:00
Alan Viverette
136974c066 am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '19b1c26622bd17165f2bb187fcddf036fd3f53cd':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-30 23:44:25 +00:00
Dianne Hackborn
92faa96a26 am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '8f53ad8e7335068b4dd96db10916c3889960de5a':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-30 23:44:20 +00:00
Tom Taylor
d034f1a3d4 am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 
* commit 'b281c06834f8d5b60a8757f3fe603f003e06aa77':
  Add a missing mms_config constant to SmsManager
 2014-10-30 23:44:15 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Tyler Gunn
2a36953394 am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '7577f3dd8b738d73253f0c6bfe2383ef71a9ba20':
  Communicating participant changes to conference controller.
 2014-10-30 23:44:03 +00:00
Alan Viverette
bfc8599f43 am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
  Use action mode context for ActionMode menu inflater
 2014-10-30 23:43:58 +00:00