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

149182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
John Spurlock
3f5b887cba am cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev 
* commit 'cb8771459629d1801cbecb1bad1754351e24f083':
  Zen: Remove "allow disable" filter from noman.
 2014-08-19 20:26:46 +00:00
George Mount
3485d63b07 am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev 
* commit '793b08cd65f98edb48fd6e3dae440b0d71405567':
  Set start transform before animator starts.
 2014-08-19 19:58:10 +00:00
Lorenzo Colitti
f049f56b70 am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '14152c7994d690a5ee0a0aad19701557407a4d70':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:29:11 +00:00
Chris Craik
b38934179c am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev 
* commit 'fc1bf228ec27ca3a1fd2d570650a003f0045a64b':
  Don't cast shadows from gradients with transparent parts
 2014-08-19 19:29:07 +00:00
Jesse Hall
bebaa8c470 am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit 'd30eb64f61f1cacb1bfca1be512bc1d208206f08':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 19:16:50 +00:00
Shishir Agrawal
426fb16355 am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 
* commit '0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
  Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
 2014-08-19 19:16:45 +00:00
Jesse Hall
efa5a01dc6 am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit '87978406b405cafc773703b7c849e372339527b8':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 19:12:08 +00:00
Igor Murashkin
7940bde7eb am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 
* commit '77af33f81d2cbef1580a103c4efda6829f20c7e1':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
 2014-08-19 18:42:38 +00:00
Igor Murashkin
32052c01ff am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 
* commit '3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates
 2014-08-19 18:42:35 +00:00
Lajos Molnar
2f9aec66ee am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme 
* commit 'd127a4ebe9cbd96dfe4879d969c4de0feedd4717':
  media.MediaPlayer: don't check file-existence for URI-s with scheme
 2014-08-19 18:14:43 +00:00
Lajos Molnar
d504ab14d2 media.MediaPlayer: don't check file-existence for URI-s with scheme 
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).

Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
 2014-08-19 11:08:08 -07:00
RoboErik
c5daf4228d am 368325e4: Update MediaSession APIs for council feedback 
* commit '368325e4ea45f51b28a09c78a7f0f3c1f052443f':
  Update MediaSession APIs for council feedback
 2014-08-19 17:23:56 +00:00
RoboErik
a66c40bf6e Update MediaSession APIs for council feedback 
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
 2014-08-19 17:12:42 +00:00
Chris Craik
84044a3ecf am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 
* commit 'fb52669c01cb31164801e2320f9d3fc954b3f16b':
  Respect round rect clip when determining op opaqueness
 2014-08-19 16:59:09 +00:00
George Mount
c3a0b0a998 am 2d0cb7d1: Add a way to get Transitions from a TransitionSet. 
* commit '2d0cb7d16f3c280c1c4b317cbfc96a5bb9f3bc94':
  Add a way to get Transitions from a TransitionSet.
 2014-08-19 16:51:15 +00:00
John Spurlock
abd87a1e2e am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev 
* commit 'a21bd779ae24cbb08ae95361f13006b09e7e273a':
  Revert workaround for network limit dialog.
 2014-08-19 16:51:11 +00:00
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet. 
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
 2014-08-19 16:43:06 +00:00
Tyler Gunn
f7252e1a97 am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev 
* commit 'd324e32f6643f9630fdc2dc6d88b6bf6e771886e':
  Exposing in-call API to other implementing classes. (1/4)
 2014-08-19 16:35:16 +00:00
Nicolas Prevot
7d01ea71d9 am 0587c834: When notify uri changes, changing the way we retrieve the userId. 
* commit '0587c834eeb980687e46b13b9cdeae54e5cb06cd':
  When notify uri changes, changing the way we retrieve the userId.
 2014-08-19 16:35:12 +00:00
Jesse Hall
87978406b4 am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c VirtualDisplayAdapter: Set the transaction surface even if NULL 
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
 2014-08-19 09:18:40 -07:00
Nicolas Prevot
ec4bb45a8c When notify uri changes, changing the way we retrieve the userId. 
Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.

BUG: 16126891

Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137
 2014-08-19 17:09:09 +01:00
Selim Cinek
7e0ced5a31 am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev 
* commit '29b3fee4e4f04ca023ee1302be47507e5635e921':
  Removed bugreport tile code from Quick settings
 2014-08-19 15:51:17 +00:00