Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,616 Commits 3 Branches 0 Tags
c01898c073de88ad4cefb96b35fed65016b62b62
Commit Graph

40861 Commits

Author SHA1 Message Date
Yin-Chia Yeh
c01898c073 am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev 
* commit '3661aa8594e17d4d1401a86993d19e436f3ae525':
  Camera2: add toString for TonemapCurve
 2014-09-12 23:21:28 +00:00
George Mount
bc3e75a5c1 am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev 
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
  Reset the alpha for offscreen views.
 2014-09-12 23:21:23 +00:00
Adam Powell
214860b030 am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev 
* commit '7362db5d1c24ccc9e0c641d8d3f5ff0eefb1bc37':
  Make Toolbars eat touch events
 2014-09-12 23:21:18 +00:00
George Mount
cb9ebc088a am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
  Changed method name to match Activity's method name.
 2014-09-12 23:21:01 +00:00
Yin-Chia Yeh
8eec09a1fc Merge "Camera2: add toString for TonemapCurve" into lmp-dev 2014-09-12 21:55:12 +00:00
George Mount
54f4ba8d7a Merge "Reset the alpha for offscreen views." into lmp-dev 2014-09-12 21:52:28 +00:00
Adam Powell
f116056a80 Merge "Make Toolbars eat touch events" into lmp-dev 2014-09-12 21:49:25 +00:00
George Mount
26f68a01b4 Merge "Changed method name to match Activity's method name." into lmp-dev 2014-09-12 21:28:45 +00:00
George Mount
85ea498d86 Changed method name to match Activity's method name. 
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
 2014-09-12 14:19:40 -07:00
Yin-Chia Yeh
b086421b41 Camera2: add toString for TonemapCurve 
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
 2014-09-12 14:12:13 -07:00
Adam Powell
61d15b9856 Make Toolbars eat touch events 
Just like action bars, toolbars shouldn't allow touches to fall
through to sibling views that they overlap.

Bug 17483356

Change-Id: I9068e1f9cf3c4226000e0058c371283a997b1bd0
 2014-09-12 14:11:28 -07:00
George Mount
653ea66a9f Reset the alpha for offscreen views. 
Bug 17469303

When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.

Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
 2014-09-12 13:58:12 -07:00
Alan Viverette
7d6fc23fe7 am 99c628c4: am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 
* commit '99c628c49642ac29511f7ae642ebfd031091a026':
  Fix toolbar height, list divider alpha, action item padding
 2014-09-12 20:27:11 +00:00
Alan Viverette
c1cbe8cfb9 Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 2014-09-12 20:01:09 +00:00
Alan Viverette
9d9581f52e Fix toolbar height, list divider alpha, action item padding 
BUG: 17487305
BUG: 17470290
BUG: 17486967
Change-Id: Ib0cb4308f9d57e730504bdeb125662b648cad0f7
 2014-09-12 12:54:02 -07:00
Jessica Hummel
f5f5ed7bc3 am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
 2014-09-12 19:19:46 +00:00
Marcin Kosiba
26dd49f4c1 am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 19:19:04 +00:00
Sander Alewijnse
fc27bbc043 am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
  Rename email extra.
 2014-09-12 19:18:48 +00:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-12 19:18:43 +00:00
George Mount
a03396e080 am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-12 19:18:33 +00:00
Chris Wren
2ec88183e8 am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '043222093990ee001561dc86b6850056d65dfe9b':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-12 19:18:27 +00:00
Christoph Studer
9758f55262 am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'fa1033fc2119942ca3f8578e257ed52fee227f37':
  Notification: Reset chronometer visibility
 2014-09-12 19:18:20 +00:00
Kenny Guy
bc1c747855 am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit '4624746908b1792eee967305b6db368f0263ebae':
  Hide APIs renamed during API review of LauncherApps
 2014-09-12 19:17:54 +00:00
Jessica Hummel
d4463cd8bf am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '8dd58a3e642c25cf7c2b9984fbb46c0961a0da45':
  Use correct string for provisioning complete action.
 2014-09-12 19:17:38 +00:00
Jinsuk Kim
ff0133a194 am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling 
* commit '527346ab17d4090a15c3408db2047f5e6800c8f4':
  CEC: Bug fixes for vendor-specific command handling
 2014-09-12 19:17:22 +00:00
Jessica Hummel
b38e07572f Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 2014-09-12 18:39:22 +00:00
Marcin Kosiba
288e7de22e Remove an @removed member of andorid.webkit.WebResourceResponse. 
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
 2014-09-12 18:24:49 +01:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02 Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 2014-09-12 16:03:39 +00:00
Jessica Hummel
d8b61f62cd Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE. 
Change-Id: I420797291fe141e295a6197c6d453d98e679ac9e
bug: 17390600
 2014-09-12 16:25:30 +01:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI. 
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
 2014-09-12 15:43:42 +01:00
George Mount
2418d7381f Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 2014-09-12 14:09:23 +00:00
Chris Wren
135ce76a26 Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 2014-09-12 14:04:33 +00:00
Christoph Studer
c30afd1e74 Merge "Notification: Reset chronometer visibility" into lmp-dev 2014-09-12 13:57:37 +00:00
Kenny Guy
b6edee0dad Hide APIs renamed during API review of LauncherApps 
Bug: 17390765
Change-Id: I79a979365005b13a2268b1cfe455241ae4fecb51
 2014-09-12 11:44:58 +00:00
Sander Alewijnse
2b338a27be Rename email extra. 
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
 2014-09-12 12:28:40 +01:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action. 
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
 2014-09-12 09:27:30 +00:00
Yohei Yukawa
6468b783c6 am 5bdb322f: am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev 
* commit '5bdb322f8cdbc89113df20d79054d3f6c5d1ad44':
  API Review: Clean up removed APIs
 2014-09-12 08:27:06 +00:00
Jinsuk Kim
d4a94db1cd CEC: Bug fixes for vendor-specific command handling 
- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
  is not ready

Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
 2014-09-12 16:22:23 +09:00
Jinsuk Kim
73046f81a6 am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev 
* commit '6d4c60e82ccf11122b7dec64695c20104119af83':
  Replace the MHL register name 'scratchpad' with 'vendor'
 2014-09-12 05:47:20 +00:00
Craig Mautner
6ec7cd9dab am a7027783: am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev 
* commit 'a7027783e39e4da9ef6cc66a200746ffb81e720e':
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
 2014-09-12 05:47:14 +00:00
Alan Viverette
129890704d am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '36348edf997963043ca1fbf91dc59615d43ebcb1':
  Remove unsafe methods that take TypedArray
 2014-09-12 05:47:03 +00:00
Michael Wright
3dd0a6aabc am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit '7987089963e29c993146a24470d412c2e83f98fa':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 05:46:19 +00:00
George Mount
9e30945202 am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 
* commit '4ac75dced476a891b874a1c573067f2220898bb6':
  Fixed empty TransitionSet not notifying listeners.
 2014-09-12 05:46:14 +00:00
Amith Yamasani
95edc2dce0 am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit '807bce1c3f178c196783f1cceec7d6d9cc42a520':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 05:46:09 +00:00
Alan Viverette
1c3d3e6a01 am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit 'bba2b9e8221a91dd03036b47e90f1ea364dc4fd2':
  Vertically align toolbar child views with similar gravities
 2014-09-12 05:45:53 +00:00
Adam Powell
9c8cfa5a3b am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit 'e82480b3a5ba0c342225035fac94020e41e5170a':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 05:45:37 +00:00
Craig Mautner
f20d09c17f am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2c85b1fcebdf08601124eada828da553a8d9f820':
  If activity is an alias get maxRecents from target
 2014-09-12 05:45:32 +00:00
Jeff Davidson
85e36549ae am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit 'bf2ac88fc4bceb56db27bfd3aa1483216648468f':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 05:45:26 +00:00