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

149222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sascha Prueter
3d040ef649 am d8ea6587: Merge "Compress miscellaneous fonts." into lmp-dev 
* commit 'd8ea658752c71ce1aaf08ca33d998d7051c94a3d':
  Compress miscellaneous fonts.
 2014-08-20 03:26:55 +00:00
Jeff Brown
f87e528580 am 7d2a336e: Merge "Use the CAST_SETTINGS activity for Cast Screen / More Settings." into lmp-dev 
* commit '7d2a336e37d222aefb17f4b643c4ef53bf157842':
  Use the CAST_SETTINGS activity for Cast Screen / More Settings.
 2014-08-20 03:19:27 +00:00
Jeff Brown
5f55b9d29c am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev 
* commit '53509444443c45cf519105294f1acf3e4f0c0c1e':
  Remove incomplete media router API. (DO NOT MERGE)
 2014-08-20 03:19:22 +00:00
Wenchao Tong
8716fbb682 am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 
* commit '3ddfe1ceb759ed8c746544a694be1bea6dd93ad0':
  Annotate @SystemApi on some WifiManager methods.
 2014-08-20 03:08:07 +00:00
Etan Cohen
307789985e am 962f4011: Enable VoLTE with overlay configuration allowing disabling. 
* commit '962f40115b888e983845b81627a8aee7c907e5f8':
  Enable VoLTE with overlay configuration allowing disabling.
 2014-08-20 02:54:19 +00:00
Adam Powell
81af1aa168 am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev 
* commit '330a5bece1685fb75a0bcb3067f245ae8e802b13':
  Update text selection handles to have a minimum touch target size.
 2014-08-20 02:54:11 +00:00
Etan Cohen
155bbf1ea4 Enable VoLTE with overlay configuration allowing disabling. 
Bug: 17134661
Change-Id: Ie6262b2b39848a13729a4b9d6acad10ebb91636b
 2014-08-20 02:42:49 +00:00
Sascha Prueter
3d848bbef6 Merge "Compress miscellaneous fonts." into lmp-dev 2014-08-20 01:43:56 +00:00
Jungshik Jang
8d78f60eb6 am 12feec33: Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev 
* commit '12feec334fd6672f42b61b7dab0f916b887e1293':
  Clean up MHL local devices when HdmiControlService turns into disabled state
 2014-08-20 01:30:09 +00:00
Jungshik Jang
05a0a9b3a5 am 4dfffc8c: Implement missing mhl apis 
* commit '4dfffc8c553731d92f2ca9c1feeee49510a2907b':
  Implement missing mhl apis
 2014-08-20 01:30:04 +00:00
Jungshik Jang
2738e2d872 Implement missing mhl apis 
1. get_supported_features
2. get_ecbug_device_rols
3. set_option in native.
4. get_mhl_version
5. get_peer_mhl_version
6. send_scratchpad_command
 - it includes send_scratchpad_command but does not include
  java side implementation. It will be added when we implement
  scratchpad.

Bug: 17096490

Change-Id: Iacb4a41234cbbd2d832908b48d188bd81a301b0f
 2014-08-20 10:11:34 +09:00
Jae Seo
f415ed959c am d2366e55: Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 
* commit 'd2366e559b396f6821ac5af53ede64466574be76':
  TIF: Add the video frame rate information to TvTrackInfo
 2014-08-20 00:54:44 +00:00
Alan Viverette
70641d8492 am bcd4112c: Merge "Update toggle switch asset to include content area" into lmp-dev 
* commit 'bcd4112cb1c038c25f4fc62a89c58e8a0a414198':
  Update toggle switch asset to include content area
 2014-08-20 00:22:33 +00:00
Deepanshu Gupta
6895b85776 am 93294c92: Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 
* commit '93294c92376749685ef720ddadb0f5d40aa0c180':
  Fix "@null" resource values in LayoutLib.
 2014-08-20 00:22:29 +00:00
Deepanshu Gupta
d27eb7f8c2 am df6d9cd8: Merge "Add time to status bar and fix wifi icon." into lmp-dev 
* commit 'df6d9cd834638bc23c5fcbe47ab77f93a3e7f078':
  Add time to status bar and fix wifi icon.
 2014-08-20 00:22:24 +00:00
Svetoslav
e2078eb03b am 4b6229fd: Merge "Update the print spooler theme." into lmp-dev 
* commit '4b6229fd5e5d352ebe782ce7d5b738f4bf91fc7f':
  Update the print spooler theme.
 2014-08-20 00:09:14 +00:00
Alan Viverette
49ac95de90 am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev 
* commit '44b61fde4a65667d6aabed0d6808ad012e418bc1':
  Draw accessibility focus in View rather than ViewRootImpl
 2014-08-19 23:56:49 +00:00
Tenghui Zhu
d1a8395070 am f010cb69: Revert "Update indeterminate linear progress bar" 
* commit 'f010cb690c49887ba8fc6f925c468b8fa865a4c1':
  Revert "Update indeterminate linear progress bar"
 2014-08-19 23:35:28 +00:00
Jose Lima
9a67c8a85c am 8aabb4f2: Fixes for a few bugs related to visible-behind activities 
* commit '8aabb4f2627663ba1e264c4b53b287f654635c57':
  Fixes for a few bugs related to visible-behind activities
 2014-08-19 23:27:27 +00:00
Adam Lesinski
6417b8cd92 am f3d07927: Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev 
* commit 'f3d079270b690ff4592ad32e1e3d7411cf37a659':
  Allow enum generated IDs to reuse existing IDs
 2014-08-19 23:27:22 +00:00
Tenghui Zhu
4ba3c3733c Revert "Update indeterminate linear progress bar" 
This reverts commit 00282d5a5182293d401164278738f454b42cf979.

Change-Id: I1c1d167c32006cef807e0eeb44cfef784a6444e5
 2014-08-19 23:23:29 +00:00
Jose Lima
34ff492978 Fixes for a few bugs related to visible-behind activities 
- Allow activities currently not visible to switch back to not
     visible-behind state.
   - Do not allow an activity that is not set as the visible-behind
     activity to cancel the visible-behind state.
   - Immediately mark a finishing activity as no longer visible behind.

Bug: 17070266
Change-Id: I2c5016793e5264013b8a54b84098e6ffae34ae6c
 2014-08-19 23:20:51 +00:00
Igor Murashkin
891088f0fd am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev 
* commit '1a054ea879292367e0ebfbe124585e32be595d21':
  camera2: legacy: disable shutter sounds unconditionally via camera2 api
 2014-08-19 23:15:17 +00:00
Alan Viverette
7ca96807d5 am 314d0b0f: Merge "Fix button text color, reduce alert dialog padding" into lmp-dev 
* commit '314d0b0ff845ed88159c77a9430c2bf7265a2735':
  Fix button text color, reduce alert dialog padding
 2014-08-19 23:04:11 +00:00
Alan Viverette
824a53450d am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev 
* commit '7617ae5fe9aa1a5459e782490e70d16c9d6a7432':
  Fix alignParentRight/End in RelativeLayout
 2014-08-19 23:04:06 +00:00
George Mount
0880561892 am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev 
* commit '273f568ddfd14902640854f7cedd2a0324518be9':
  Fixed ChangeBounds matching against the wrong View.
 2014-08-19 23:04:01 +00:00
Alan Viverette
b19fe38840 Merge "Update toggle switch asset to include content area" into lmp-dev 2014-08-19 22:53:25 +00:00
Alan Viverette
a5e1301bf5 Update toggle switch asset to include content area 
Remove optical bounds workaround from NinePatchDrawable, which was
incorrect anyway since we were missing a content area rather than
missing padding.

BUG: 17114103
Change-Id: I51461be666f59534dfdea7ab79bc867ee3eb3c92
 2014-08-19 16:55:47 -07:00
ztenghui
f2b6fdce16 am 6e1a41fa: Merge "Update indeterminate linear progress bar" into lmp-dev 
* commit '6e1a41fa25a5cc6f6fb077b292d24e0f484e2e14':
  Update indeterminate linear progress bar
 2014-08-19 22:50:16 +00:00
Chris Craik
ec10276136 am 06b155eb: Merge "Update setShadowLayer doc" into lmp-dev 
* commit '06b155eb510a6087035c474992b43111700f69bb':
  Update setShadowLayer doc
 2014-08-19 22:50:11 +00:00
Chris Craik
dee4e296e1 am 5bdd7e48: Merge "Early reject drawText calls that will not draw" into lmp-dev 
* commit '5bdd7e48306c32fe3d4ffdb0c92e539245937908':
  Early reject drawText calls that will not draw
 2014-08-19 22:50:06 +00:00
Jae Seo
563e7eca8c am 03d07be7: API Review: android.media.tv 
* commit '03d07be733caa36262ef8c9c3aef400d9bca118b':
  API Review: android.media.tv
 2014-08-19 22:31:08 +00:00
Jae Seo
1553a528a5 API Review: android.media.tv 
TvView:
- Instead of ERROR_INPUT_DISCONNECTED, a separate callback
  onDisconnected; change onError to onConnectionFailed.

Bug: 17114406
Change-Id: I9457ac81c883610f96954494bf75a4e78e53383f
 2014-08-19 22:20:22 +00:00
Adam Powell
31ec9a3fec am 09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev 
* commit '09662e68baf9748ff9bedcfb0fa59e388ec54588':
  Make Toolbars (and Toolbar-based ActionBars) have constant text size
 2014-08-19 22:19:41 +00:00
Ihab Awad
f0bad75f74 am 940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev 
* commit '940e67a88bb5cc6f97afa4f0a703e428d55c537f':
  ConnectionService API has only one completed callback (1/3)
 2014-08-19 21:31:34 +00:00
Jae Seo
3acf66f558 Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 2014-08-19 21:23:09 +00:00
Deepanshu Gupta
92973b8f37 Merge "Add time to status bar and fix wifi icon." into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
7622f46c78 Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
54509d5a68 Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
567e44797b Fix alignParentRight/End in RelativeLayout 
BUG: 17136816
Change-Id: If7edb2e0216384429f4caf7e9aae01c09ddd8be4
 2014-08-19 15:41:51 -07:00
George Mount
3ec10e72b9 Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev 2014-08-19 21:23:09 +00:00
George Mount
4d1ecf5daf Fixed ChangeBounds matching against the wrong View. 
ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.

Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1
 2014-08-19 14:39:47 -07:00
Winson Chung
74c86ebd64 am a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev 
* commit 'a4f6df0f51adc0ae69fa845ceb7d0a20713cc1b2':
  Adding shadows to the focus state and fab button. (Bug 16950262)
 2014-08-19 20:55:14 +00:00
Winson Chung
0fc0748e38 am e6c940f7: Small tweaks to the stack curve and header transition. (Bug 16656169) 
* commit 'e6c940f7a6a831e1e0a1bf18f9e57b0408dc72ef':
  Small tweaks to the stack curve and header transition. (Bug 16656169)
 2014-08-19 20:55:09 +00:00
Adam Lesinski
6e6bc85c1c am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '960ab6de31ddd1a92e7a2e1829a2f2cd9b209c13':
  Add Shell command to set AppOps permissions
 2014-08-19 20:55:05 +00:00
Amith Yamasani
3dbbd63410 am 1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev 
* commit '1e8ba427abacc928f018ceaf21a9278de886b43d':
  Rephrase the Exit guest action and dialog text
 2014-08-19 20:47:10 +00:00
Winson Chung
abedcab44c Small tweaks to the stack curve and header transition. (Bug 16656169) 
Change-Id: I96120063a66f267ad0b6a39b3dd020bc030083b8
 2014-08-19 20:45:36 +00:00
Tim Murray
b616aa78a1 am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev 
* commit '9ba9298e028e32eb6b1058dfb47eeae5fda164c4':
  Stop sign-extending RS IDs.
 2014-08-19 20:39:05 +00:00
Tim Murray
5e8e9c336f am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev 
* commit '3c02b0201c4e57bb493a926ee79aaf80fbd1ff7b':
  Fix IO_INPUT with 64-bit.
 2014-08-19 20:39:01 +00:00
Alan Viverette
997aa40645 Draw accessibility focus in View rather than ViewRootImpl 
This ensures that the focus rect position is correct when running in
render thread accelerated mode. Also adds a missing call to draw the
overlay.

BUG: 16796647
BUG: 17063342
Change-Id: I377e5eaea89d3f20c8c7e82c264a0f106021d58b
 2014-08-19 20:36:07 +00:00