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

137362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
2fd1d454b8 Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 2014-05-29 19:23:48 +00:00
Paul Jensen
36aad060c6 am 7df1decc: (-s ours) Merge "Implement bind-to-network functionality of android.net.Network." into lmp-preview-dev 
* commit '7df1deccfee0a98234960fa76bd0357f84a614c4':
  Implement bind-to-network functionality of android.net.Network.
 2014-05-29 19:23:20 +00:00
Paul Jensen
8ef3401d2a Adjust Network's SocketFactory to restrict host name resolution to that Network 
bug: 13885501

Change-Id: Iab9a5a2e060fe261f4be9ba974c1a55fb6b9c98b
(cherry picked from commit 92064edf55ee11967d9cc7529125236ee8e469b2)
 2014-05-29 19:17:06 +00:00
Adam Powell
8e5372fe93 Fix for setting Toolbar content descriptions 
Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
 2014-05-29 12:16:09 -07:00
Paul Jensen
f0db8b622b Merge "Implement bind-to-network functionality of android.net.Network." into lmp-preview-dev 2014-05-29 19:15:29 +00:00
Paul Jensen
2d6f265d00 Implement bind-to-network functionality of android.net.Network. 
This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)
 2014-05-29 18:53:57 +00:00
Yin-Chia Yeh
5e078e49f0 am 6118de49: Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-dev 
* commit '6118de493ea6b5f42c464c00328bfddb527e2c2f':
  Camera2: Test null TonemapCurve behavior
 2014-05-29 18:45:46 +00:00
Yin-Chia Yeh
789de110c7 Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-dev 2014-05-29 18:42:15 +00:00
Ed Heyl
08d62965d3 Merge "changes related to moving the trust agent setting s in thne security menu" 2014-05-29 18:39:54 +00:00
Craig Mautner
47df9873fb am 9f09a024: Merge "implement keyguardGoingAway() fixes build." into lmp-preview-dev 
* commit '9f09a024aae8a66074bb5a503a8dec118917d169':
  implement keyguardGoingAway() fixes build.
 2014-05-29 18:38:18 +00:00
Craig Mautner
c7b1b7aeec Merge "implement keyguardGoingAway() fixes build." into lmp-preview-dev 2014-05-29 18:32:41 +00:00
George Mount
fffa58ef3e am 225f5d1c: Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 
* commit '225f5d1c69395301f9782cc38714e5ca5db5e3d5':
  Moved shared element motion to be in called Activity.
 2014-05-29 18:20:22 +00:00
George Mount
eb61eb786a Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 2014-05-29 18:14:48 +00:00
Chris Wren
8756a9897a Merge "add tests for ValidateNotificationPeople.getExtraPeople()" 2014-05-29 17:59:37 +00:00
Craig Mautner
8bd94d502d implement keyguardGoingAway() fixes build. 
Fix bug 15326529.

Change-Id: I9095fe70721bfb031dd1080da1d61ff4e1a8c8ab
 2014-05-29 10:53:46 -07:00
Nicolas Prevot
1015efb143 Merge "Making the content resolver work with result intents." 2014-05-29 17:02:20 +00:00
Craig Mautner
88d4c398ea am cd461c00: (-s ours) Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 
* commit 'cd461c00f737cd9f843254e1aa2c7345164909a3':
  Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
 2014-05-29 16:56:13 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
 2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE 
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
 2014-05-29 16:50:59 +00:00
Craig Mautner
fdaaf91f35 Merge "Revert "Modify task navigation to return to recent tasks."" 2014-05-29 16:50:11 +00:00
Craig Mautner
719e621186 Revert "Modify task navigation to return to recent tasks." 
This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
 2014-05-29 16:49:41 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Dongwon Kang
f95b1d8d53 Fix a typo on TvContract. 
Change-Id: I2558f4d463653c7e35de7dccb60189ee9eb0a307
 2014-05-29 09:40:11 -07:00
George Mount
c93ca16173 Moved shared element motion to be in called Activity. 
Bug 15198605

Change-Id: I07ce4f3366dbdc6957d789f724e49d260fe34faf
 2014-05-29 09:36:03 -07:00
Chris Wren
92af372fc6 add tests for ValidateNotificationPeople.getExtraPeople() 
Change-Id: Ieb8acce58574c25cccce674b4494f75d96b57125
 2014-05-29 16:14:31 +00:00
Paul Lawrence
f5152735b5 am 8a518d92: (-s ours) Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 
* commit '8a518d9233c4351e2b90252156bb5bc3a7a140e1':
  DO NOT MERGE: Hide crypto consts from docs
 2014-05-29 16:12:24 +00:00
Paul Lawrence
575510c48f Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 2014-05-29 16:07:27 +00:00
Paul Lawrence
fab7cbc9ce DO NOT MERGE: Hide crypto consts from docs 
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
 2014-05-29 16:03:43 +00:00
Dan Sandler
1811efdcc2 am afad5df6: Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 
* commit 'afad5df6425c2e6682b203e3e075e70ef56df9d0':
  Use DecorToolbar.getViewGroup() to get the view properly.
 2014-05-29 15:57:53 +00:00
Dan Sandler
5ec96a201e Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 2014-05-29 15:53:03 +00:00
Deepanshu Gupta
f100bc4e9f am 4a0e3c7c: (-s ours) Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 
* commit '4a0e3c7c9ef18ab0451922c4e2743eff659a7582':
  Recurse into directories to find fonts. [DO NOT MERGE]
 2014-05-29 15:43:15 +00:00
Deepanshu Gupta
5390ba1da1 am 70d0c48b: (-s ours) Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 
* commit '70d0c48babd5b117bf705dd271db9e2f8bc0450b':
  Parallel processing of the fonts. [DO NOT MERGE]
 2014-05-29 15:43:06 +00:00
Deepanshu Gupta
cf6aac168f am 36dbe009: (-s ours) Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 
* commit '36dbe009bf7ad448c4aeb18f6a74fcf97d49f3d9':
  Add multiple dir support to build_font.py [DO NOT MERGE]
 2014-05-29 15:42:51 +00:00
Deepanshu Gupta
c2f8b30efc am a046f4d1: Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 
* commit 'a046f4d1ee7bff98dfe94dc52539c88dfd290647':
  Layoutlib: Fix FontFamily_Delegate use after unref
 2014-05-29 15:42:46 +00:00
Deepanshu Gupta
151131a3c0 am f9b3f3c5: Merge "Update delegates" into lmp-preview-dev 
* commit 'f9b3f3c5844de42d0a15475ae430317e661d5fc5':
  Update delegates
 2014-05-29 15:42:41 +00:00
Deepanshu Gupta
85c69944bd Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:38:17 +00:00
Deepanshu Gupta
f251b06089 Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:55 +00:00
Deepanshu Gupta
28b13b2332 Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:45 +00:00
Deepanshu Gupta
2cb50d45a8 Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 2014-05-29 15:37:24 +00:00
Deepanshu Gupta
1a5b0de877 Merge "Update delegates" into lmp-preview-dev 2014-05-29 15:37:07 +00:00
Griff Hazen
2be1740884 am 50db238f: (-s ours) Merge "DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender" into lmp-preview-dev 
* commit '50db238f71cbbefc2340503d2f93c73111d837ba':
  DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender
 2014-05-29 15:20:55 +00:00
Robert Greenwalt
3b95b2fa7a am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev 
* commit '67cf4bad7bad05ff0a3a0704305c9eed4c92a338':
  Don't break things if a network goes back to CONNECTED.
 2014-05-29 15:20:50 +00:00
Griff Hazen
6326ef4dd5 Merge "DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender" into lmp-preview-dev 2014-05-29 15:17:26 +00:00
Robert Greenwalt
33051471cf Merge "Don't break things if a network goes back to CONNECTED." into lmp-preview-dev 2014-05-29 15:15:14 +00:00
Dan Sandler
6fdeeb34ae Use DecorToolbar.getViewGroup() to get the view properly. 
Bug: 15320825
Change-Id: Ib7e162c816fadf2b5c83af1326e7158f6bd69c8e
 2014-05-29 11:02:41 -04:00
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
John Spurlock
c19a72c447 am 499f4a0a: VolumeZen: Don\'t clear stream type if embedded. 
* commit '499f4a0a4df37558801a712a24daebb91df0b327':
  VolumeZen: Don't clear stream type if embedded.
 2014-05-29 14:23:21 +00:00
John Spurlock
f71205c1ee VolumeZen: Don't clear stream type if embedded. 
Clearing the stream type makes sense if the volume panel is
in dialog mode, but not when embedded.

Bug:15186070
Change-Id: Ice5f547ef987e28ef51050faef682c5dfa5f7604
 2014-05-29 10:19:14 -04:00