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

137385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
22e2ea670f DO NOT MERGE: Revert "Make Wifi WPS API available on application layer" 
This reverts commit 1f3b490645f7c14459ac6f864eaf742448f7b764.

This is to hide WPS API for developer preview. They may get
activated again later.

Bug: 15191968
Change-Id: I21dbd5cd0345fbb2e55603d6b2af23d83d9c2ae2
 2014-05-29 21:57:24 +00:00
Winson Chung
056fa3b6fd am 339f4022: Merge "Fixing issue with configuration states not being reset on configuration change." into lmp-preview-dev 
* commit '339f4022d0cf93622b4073f66d0ea066b822c118':
  Fixing issue with configuration states not being reset on configuration change.
 2014-05-29 21:52:25 +00:00
John Reck
c8affe0e1b Re-enable atlas 
Bug: 14590563

Change-Id: I04ed5bf1b2654dab4a65c1e43faaeba32459870f
 2014-05-29 14:50:37 -07:00
Winson Chung
457fa27704 Merge "Fixing issue with configuration states not being reset on configuration change." into lmp-preview-dev 2014-05-29 21:50:02 +00:00
John Spurlock
4b3bda2225 Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS. 
Hide notifications on the lockscreen if the setting = 0.

Bug:15104826
Change-Id: I394f10a9958a3ee4d03198f21eb09b778e00903e
(cherry picked from commit ac639f28502a7e8a6c52a6585810c8d94e0e5388)
 2014-05-29 21:48:03 +00:00
Winson Chung
b01ed681fe Fixing issue with configuration states not being reset on configuration change. 
- Also updating some interpolators

Change-Id: Ia29fc6f10705c7d286246162f894a25de7b4be40
 2014-05-29 14:44:27 -07:00
Jinsuk Kim
b8861f8b6b Merge "Stop publishing HdmiCecService, start publishing HdmiControlService" 2014-05-29 21:36:47 +00:00
Christopher Tate
a8f12f2aa9 am c0c19a88: (-s ours) Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 
* commit 'c0c19a88cfd76a56dee521b063c663b1dee8b8e1':
  DO NOT MERGE Implementation of TaskManager reschedule/cancel
 2014-05-29 21:23:40 +00:00
Raph Levien
f9e3d31127 Language and variant selection for Minikin 
This is the frameworks/base side of what's needed to support language
selection (especially Han unification, but also compact/elegant
selection for scripts that require more vertical space).

This is part of the fix for bug 15179652 "Japanese font isn't shown on
LMP".

Change-Id: I8f0f3aa9a1915659f8d0b590cf1c56529356049a
 2014-05-29 14:21:24 -07:00
Christopher Tate
3d5e5c7b26 Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 2014-05-29 21:17:32 +00:00
Winson Chung
c5b5275b8d am 48e3f61c: Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev 
* commit '48e3f61cfcd804575780d2958bd4e53420bd8266':
  Updating task view style, fixing performance on enter-recents animation.
 2014-05-29 21:15:20 +00:00
Winson Chung
073c2e4ad1 Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev 2014-05-29 21:10:15 +00:00
Martijn Coenen
df48db3c7c Address HCE API review comments. 
Remove AidGroup from public APIs.

Bug: 15089341
Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
 2014-05-29 21:10:01 +00:00
Jinsuk Kim
8692fc68a4 Stop publishing HdmiCecService, start publishing HdmiControlService 
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
 2014-05-29 21:09:43 +00:00
Zhijun He
421ddbe670 Camera2: Fix availableCapabilities incorrect type 
Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
 2014-05-29 21:00:26 +00:00
Adam Powell
4926f12f31 am f8884777: Merge "Remove default toolbar content inset for action bars" into lmp-preview-dev 
* commit 'f8884777303d7788ec1684e3e502d564519dc759':
  Remove default toolbar content inset for action bars
 2014-05-29 20:53:00 +00:00
Derek Sollenberger
139088228f Update HWUI matrix API 
1. more closely mirror Skia API by using const ref instead of ptrs
2. store SkMatrix in the drawOp instead of the linear allocation heap

Change-Id: I4b9f6f76b9f7d19325e29303d27b793679fd4823
 2014-05-29 16:51:23 -04:00
Adam Powell
8d1de048d7 Merge "Remove default toolbar content inset for action bars" into lmp-preview-dev 2014-05-29 20:48:52 +00:00
Dongwon Kang
4792881e6f am 3dc91b99: Merge "Fix a typo on TvContract." into lmp-preview-dev 
* commit '3dc91b99281d53f414bb4db4bd2e5a61bbb86483':
  Fix a typo on TvContract.
 2014-05-29 20:27:17 +00:00
Dongwon Kang
ec80df818f Merge "Fix a typo on TvContract." into lmp-preview-dev 2014-05-29 20:23:53 +00:00
Adam Powell
11223ffd37 Remove default toolbar content inset for action bars 
While this may still be a good idea in the long run, it has a number
of negative effects on the layout for activities that never plan to
use a navigation button. Needs further consideration with UX.

Change-Id: If418e6124601f3978fa169ac9c9f48fc39409fec
 2014-05-29 12:39:10 -07:00
Winson Chung
24cf152483 Updating task view style, fixing performance on enter-recents animation. 
Change-Id: I42ca9296170a93a14184ae8963abbd3f0494e503
 2014-05-29 12:30:26 -07:00
Adam Powell
7d330757d9 am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 
* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions
 2014-05-29 19:27:17 +00:00
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