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

150395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sascha Prueter
a31f3214ee am 6be959ad: am d8ea6587: Merge "Compress miscellaneous fonts." into lmp-dev 
* commit '6be959adfb0dd4c306a03475c148929652a40de0':
  Compress miscellaneous fonts.
 2014-08-20 03:35:50 +00:00
Jeff Brown
534c9c1a1b am fd1fa128: am 7d2a336e: Merge "Use the CAST_SETTINGS activity for Cast Screen / More Settings." into lmp-dev 
* commit 'fd1fa128a16aa75d4276df64b53e866138c8a84a':
  Use the CAST_SETTINGS activity for Cast Screen / More Settings.
 2014-08-20 03:26:56 +00:00
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
961ccb13bc am 012ddc53: am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev 
* commit '012ddc53f7da5c50606e689cb6a7d87779076739':
  Remove incomplete media router API. (DO NOT MERGE)
 2014-08-20 03:26:50 +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
459fcb6c31 am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 
* commit '3e76a3aa299c6c7abde43ed5e9b780eb1dd13b8d':
  Annotate @SystemApi on some WifiManager methods.
 2014-08-20 03:17:57 +00:00
Etan Cohen
c58f18d3a1 am 5584e3d9: am 962f4011: Enable VoLTE with overlay configuration allowing disabling. 
* commit '5584e3d98626d0ba382acd2d42812930c1be22d2':
  Enable VoLTE with overlay configuration allowing disabling.
 2014-08-20 03:10:47 +00:00
Adam Powell
6240d0bc3f am 04fd54d4: am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev 
* commit '04fd54d4c543e6516fb2bfd823f53e376e97197d':
  Update text selection handles to have a minimum touch target size.
 2014-08-20 03:10:42 +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
f4a4d0bdfa am 49b227af: am 12feec33: Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev 
* commit '49b227af955741e9cfb5bc0bafdbd38be7ea60e7':
  Clean up MHL local devices when HdmiControlService turns into disabled state
 2014-08-20 01:41:31 +00:00
Jungshik Jang
04e91be3df am 1867763a: am 4dfffc8c: Implement missing mhl apis 
* commit '1867763a0ed7af696aa9ffd7240561bba5f5b619':
  Implement missing mhl apis
 2014-08-20 01:41:21 +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
d311f9f41f am 2377dbed: am d2366e55: Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 
* commit '2377dbedfb328bdebb143890895d452cf769f816':
  TIF: Add the video frame rate information to TvTrackInfo
 2014-08-20 01:08:19 +00: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
77deee679a am 35913400: am bcd4112c: Merge "Update toggle switch asset to include content area" into lmp-dev 
* commit '35913400e60499b55fd9e05436fd641b3d6b46d2':
  Update toggle switch asset to include content area
 2014-08-20 00:31:09 +00:00
Deepanshu Gupta
8292994c20 am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 
* commit '0c64e11d1c9deb6d425be80808372f5bc1730fd7':
  Fix "@null" resource values in LayoutLib.
 2014-08-20 00:31:04 +00:00
Deepanshu Gupta
c6ec49e705 am 6cd282f4: am df6d9cd8: Merge "Add time to status bar and fix wifi icon." into lmp-dev 
* commit '6cd282f44468ff9143913c2fc9e1e2470c247cfd':
  Add time to status bar and fix wifi icon.
 2014-08-20 00:31:00 +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
6f7b812827 am a08da437: am 4b6229fd: Merge "Update the print spooler theme." into lmp-dev 
* commit 'a08da43793914445d5702a1c66e717c8633952e3':
  Update the print spooler theme.
 2014-08-20 00:17:15 +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
c9b499b4e9 am e330a384: am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev 
* commit 'e330a384a067f95ed1e89d83f82ea848301040f7':
  Draw accessibility focus in View rather than ViewRootImpl
 2014-08-20 00:05:47 +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
f6cd490f0c am c144b122: am f010cb69: Revert "Update indeterminate linear progress bar" 
* commit 'c144b12294e1b5b346085ffb53e83c9759110e75':
  Revert "Update indeterminate linear progress bar"
 2014-08-19 23:44:52 +00:00
Jose Lima
74d8608459 am 6ab33ee8: am 8aabb4f2: Fixes for a few bugs related to visible-behind activities 
* commit '6ab33ee8d35849d4f55ba305216a7f0f80178a1d':
  Fixes for a few bugs related to visible-behind activities
 2014-08-19 23:44:47 +00:00
Adam Lesinski
662e3221f7 am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev 
* commit 'f668e0ba54fa836a818807ec6f76600fc97343ae':
  Allow enum generated IDs to reuse existing IDs
 2014-08-19 23:44:42 +00:00
Igor Murashkin
c88cf74d40 am bdf49aa1: am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev 
* commit 'bdf49aa1211d87c4c25571d70a5669e1622318ba':
  camera2: legacy: disable shutter sounds unconditionally via camera2 api
 2014-08-19 23:44:34 +00:00
Alan Viverette
df362b53ec am 420330ba: am 314d0b0f: Merge "Fix button text color, reduce alert dialog padding" into lmp-dev 
* commit '420330ba39b2b8ca9a8a0fe8c4bd5f644e80d68d':
  Fix button text color, reduce alert dialog padding
 2014-08-19 23:44:25 +00:00
Alan Viverette
3ae3e02022 am 0118f49a: am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev 
* commit '0118f49a9edf5a0f64a3967539f9c3a474cd0db7':
  Fix alignParentRight/End in RelativeLayout
 2014-08-19 23:44:21 +00:00
George Mount
914e2cc89a am 31894079: am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev 
* commit '3189407931c46c4440ff040f494e8f027e771812':
  Fixed ChangeBounds matching against the wrong View.
 2014-08-19 23:44:16 +00:00
ztenghui
79445ffe64 am 23ef7e67: am 6e1a41fa: Merge "Update indeterminate linear progress bar" into lmp-dev 
* commit '23ef7e67793d4c400f416041dba7f43bb706d74e':
  Update indeterminate linear progress bar
 2014-08-19 23:44:05 +00:00
Chris Craik
afd9d11b28 am 963827fa: am 06b155eb: Merge "Update setShadowLayer doc" into lmp-dev 
* commit '963827fa908b46bf95e584092fa5ce2832fe81e7':
  Update setShadowLayer doc
 2014-08-19 23:44:00 +00:00
Chris Craik
4760ad250d am 5895f085: am 5bdd7e48: Merge "Early reject drawText calls that will not draw" into lmp-dev 
* commit '5895f085af7ee10b013df5b4e9b8fe41723d546c':
  Early reject drawText calls that will not draw
 2014-08-19 23:43:55 +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