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

44257 Commits

Author SHA1 Message Date
Tor Norbye
311913d09e Removing trailing comma in initializer; fails on some javac versions 
Change-Id: Ie651ca8ee625a881f739dc3ede5190adb9eb9860
 2013-09-12 16:03:45 -07:00
Tor Norbye
b6a3ef1834 Merge "Add typedefs and nullness annotations." 2013-09-12 22:22:06 +00:00
Eino-Ville Talvala
b91133c73a am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit 'a937b013f5ebe81562a0d298f9c990c975ba1dcf':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:39:42 -07:00
Eino-Ville Talvala
a937b013f5 am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit '184b17ddef985ba99f1b1ad8f660a742a9f31a19':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:36:51 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Igor Murashkin
d6b8a4ab4c am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit 'ddc74f5ed1d541ea89964228417eff3d5d6ad071':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:32:28 -07:00
Igor Murashkin
ddc74f5ed1 am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:26:16 -07:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Adam Powell
d488b785df am 179ba0c0: am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit '179ba0c04b446406d226cdfe866317d0d2bcecce':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:15:43 -07:00
Adam Powell
179ba0c04b am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit 'a2906cb4d9355b7a08e7fdec1924c2dbc7fda622':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:13:58 -07:00
Adam Powell
a2906cb4d9 Merge "Show alternate menu panel on devices with menu key" into klp-dev 2013-09-12 18:12:05 +00:00
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode 
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
 2013-09-12 11:11:27 -07:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Daniel Sandler
c77a18beca am 22dbb77b: am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit '22dbb77b194536191770a64b4fd7d8df7feb9167':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:41:54 -07:00
Daniel Sandler
22dbb77b19 am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit 'f3da15bde723e6f27ae6b64e8f0765e98b02e45d':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:38:37 -07:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Jeff Sharkey
d4aa10d5be am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit 'c3414dc4baf2bb2c3ef5761912fea7f44d804ebc':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:22:22 -07:00
Flavio Lerda
9df07d19e3 am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit '3f36b33dca0c1c9599c81b273e88b85d0e6fb06e':
  Document the order of values returned by keyAt().
 2013-09-12 09:22:18 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
Flavio Lerda
b25cfdf1ec Merge "Document the order of values returned by keyAt()." into klp-dev 2013-09-12 11:49:29 +00:00
Primiano Tucci
14a2d2fbe6 Merge "Adding freeMemoryForTests static method to WebView." 2013-09-12 11:04:07 +00:00
Primiano Tucci
2442675002 Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
 2013-09-12 10:58:29 +01:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value 
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
 2013-09-11 21:43:50 -07:00
Baligh Uddin
1d6c7990ba Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:24 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Adam Powell
5fcf5b9fd3 Show alternate menu panel on devices with menu key 
Provide a softer transition to the overflow-everywhere world for
devices with menu keys. The panel menu will still be used on these
devices in response to a menu key press even in the presence of an
action bar with overflow.

Fix a few lingering bugs around dispatching the open-overflow
transition that caused problems with this along the way.

Change-Id: I9d77c70f6d15c47160ac06292984101d619c44e6
 2013-09-11 19:17:38 -07:00
Selim Gurun
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Alex Ray
2cfb6826c3 am 6d6c5de1: am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '6d6c5de165ab99b1c8e131425f51c2ac749312e0':
  consumer ir: clarify @link in documentation
 2013-09-11 17:46:42 -07:00
Alex Ray
6d6c5de165 am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '03ad7ae1bc406dbdb452cb5f91f2bde1848fd4cb':
  consumer ir: clarify @link in documentation
 2013-09-11 17:42:53 -07:00
Alex Ray
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs. 
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
 2013-09-11 17:33:52 -07:00
Xia Wang
486ad2a7ba am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit '6c2ad7ac97ecc23525ff5ad499edaa9316c230e9':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:31:04 -07:00
Xia Wang
6c2ad7ac97 am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit 'b32a80425db68f67ecafb89093e01e7c1d75770b':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:26:09 -07:00
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
 2013-09-11 17:25:05 -07:00
Eino-Ville Talvala
1663033d96 am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'fb09a7381992c6ca88b35d3d0103b38051174928':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:24:56 -07:00
Ruben Brunk
b78b4af70d am fae16ab3: am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit 'fae16ab39fe651f97bf86e6f5fe07f95342450aa':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:24:49 -07:00
Elliott Hughes
16a584096a am 2df0f9ed: am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit '2df0f9ed82f9dab253d2359df12b119ed36af522':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 17:24:43 -07:00
Amith Yamasani
05a1278ea4 am 2861921c: am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit '2861921c2433867679bd7bd1bb674239eb0afa50':
  Change selection highlight for intent disambig dialog
 2013-09-11 17:24:39 -07:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00:00
Mindy Pereira
3878b78631 am 21497c5f: am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-dev 
* commit '21497c5f5d6ed3ddf90cf48c5a21b7f7de1f91b5':
  Scale feels too quick in relation to movement
 2013-09-11 17:24:30 -07:00
Adam Powell
a395e70109 am 18149fcf: am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '18149fcf86eee3335b28b2c2373b585c4e18745a':
  Action bar refactoring and transitions
 2013-09-11 17:23:37 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 17:23:29 -07:00