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

150577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Powell
ae4a10c17f Merge "Correctly populate title for ResolverActivity" into lmp-dev 2014-08-19 22:53:25 +00:00
Adam Powell
11f59a0899 Correctly populate title for ResolverActivity 
This affects accessibility feedback.

Bug 17147141

Change-Id: I3e90b80c2813e79e0abe1c5ddc6e0c115a6369dd
 2014-08-20 13:22:16 -07:00
Alan Viverette
aff1efa622 Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev 2014-08-19 22:53:25 +00:00
Alan Viverette
fd2dd208d9 Use correct single-letter date format in SimpleMonthView 
Also fixes layout on sw600dp-land (by removing the sw600dp layout!).

BUG: 17068298
Change-Id: I2545d0e1904a0028156b96b6ad17674c6107ce5d
 2014-08-19 18:11:54 -07:00
Chris Craik
e2527bc206 Merge "Add outlineProvider attribute" into lmp-dev 2014-08-19 22:53:25 +00:00
Chris Craik
f56885d413 Add outlineProvider attribute 
bug:16871683
Change-Id: Iae9326c41872ac03d40ebeec6257522a34cbe1ff
 2014-08-19 18:04:14 -07:00
Chris Craik
aba9715ae7 Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev 2014-08-19 22:53:25 +00:00
Chris Craik
fe7a18eead Make getOutline account for gravity BitmapDrawable 
bug:17112454

Also cleans up several subtle bugs in updating gravity/tile mode/insets.

Change-Id: Idbd2c52e5f572d11b651f5e93d000535880f5708
 2014-08-19 17:44:20 -07:00
Amith Yamasani
609aaca4d8 Merge "Rename restrictions API class and method" into lmp-dev 2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6 Rename restrictions API class and method 
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission

Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
 2014-08-19 17:03:41 -07: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
719c8cd3c0 am 785c8732: am 03d07be7: API Review: android.media.tv 
* commit '785c87329d928c76a3fa951d3a8183f8a470b31e':
  API Review: android.media.tv
 2014-08-19 22:36:27 +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
Adam Powell
a74e6b49a6 am 38ec99a8: am 09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev 
* commit '38ec99a8b18c503a46165c23f2cf25400ee89ffc':
  Make Toolbars (and Toolbar-based ActionBars) have constant text size
 2014-08-19 22:28:25 +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
4c5cbf9a2e am b5d4eaae: am 940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev 
* commit 'b5d4eaae622e2f885235de67568dc9b40ffbb502':
  ConnectionService API has only one completed callback (1/3)
 2014-08-19 21:37:33 +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
20c790f1f1 am 08d36ec1: am a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev 
* commit '08d36ec134c83b25055acf9384fbd65c6f6d1377':
  Adding shadows to the focus state and fab button. (Bug 16950262)
 2014-08-19 21:08:11 +00:00