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

130519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
7c3606c103 initial Best Network Selection implementation 
-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration
-add default gateway mac address to RouteInfo
-add a Date to the ScanResult
-add BSSID date to the WifiConfiguration
- make framework auto-join into a config option
- add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration

Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821

 Changes to be committed:
	modified:   core/java/android/provider/Settings.java
	modified:   wifi/java/android/net/wifi/ScanResult.java
	modified:   wifi/java/android/net/wifi/WifiConfiguration.java
 2014-05-07 18:48:48 -07:00
Jorim Jaggi
15560a84df Merge changes Idc1e6e52,If1729a01 
* changes:
  Allow different animation lengths in StackStateAnimator.
  Only handle scroll events when over content.
 2014-05-08 01:22:55 +00:00
Jorim Jaggi
5aa045cc6b Allow different animation lengths in StackStateAnimator. 
Combine them using the maximum length.

Change-Id: Idc1e6e52f7f36ed46fbfba013c23773eeed95cd6
 2014-05-08 01:18:00 +00:00
Jorim Jaggi
28bc6df693 Merge "Enable "More"-card double tap interaction." 2014-05-08 01:13:43 +00:00
Jorim Jaggi
8a2a5fa0d1 Merge "Introduce AmbientState for StackScroller." 2014-05-08 01:13:31 +00:00
Jason Monk
607562a766 Merge "Fix Docs breakage" 2014-05-08 01:00:54 +00:00
Craig Mautner
f12fca4ba5 Merge "Use new doccentric flags and attributes in Sharing" 2014-05-08 00:59:54 +00:00
Jorim Jaggi
fe6bfa644c Only handle scroll events when over content. 
This makes sure that the unlock text is always shown when tapping
the bottom area.

Bug: 14381296
Change-Id: If1729a01dab21ddf0b93e665c85fd72ed399c0fd
 2014-05-08 02:46:10 +02:00
Jorim Jaggi
e96fcd1faa Enable "More"-card double tap interaction. 
Bug: 14492098
Change-Id: I8b80df407df8b6df0af616932018e40e903a7966
 2014-05-08 02:45:39 +02:00
Jorim Jaggi
d552d9d8e9 Introduce AmbientState for StackScroller. 
AmbientState is a global state for the algorithm of the
StackScroller. Dimmed and which child is activated was moved
into this state. Further, scale and dimmed is also a
StackScrollState and animated in StackStateAnimator.

Change-Id: Ia68131cee62b2e0005f55ea6dc400d149ec15278
 2014-05-08 02:33:56 +02:00
Russ Schnapp
7359b0b885 Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras" 2014-05-08 00:24:10 +00:00
Craig Mautner
41db4a77fa Use new doccentric flags and attributes in Sharing 
Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.

Fixes bug 14463859.

Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
 2014-05-07 17:20:56 -07:00
Jason Sams
8999bdc63c Merge "Add flags to context creation for RS" 2014-05-08 00:01:39 +00:00
Alan Viverette
b466977765 Merge "State based animators for Views" 2014-05-07 23:58:15 +00:00
Yigit Boyar
f4c5bf30b4 State based animators for Views 
Set quantum theme buttons to elevate 2dp on press

Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
 2014-05-07 16:52:17 -07:00
Jason Monk
41a2e33744 Fix Docs breakage 
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.

Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
 2014-05-07 19:18:38 -04:00
John Reck
ae493d967f Merge "Allow all loopers to be RT-accelerated" 2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
 2014-05-07 22:57:45 +00:00
John Reck
030d619aaa Allow all loopers to be RT-accelerated 
Bug: 14445956

Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
 2014-05-07 15:46:36 -07:00
Florin Malita
531fecca1c Merge "Encapsulate Canvas.mNativeCanvas" 2014-05-07 22:44:47 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage 
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
 2014-05-07 18:41:13 -04:00
Brian Carlstrom
dfad99ad9f resolved conflicts for merge of 0b5598c9 to master 
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
 2014-05-07 15:24:01 -07:00
Selim Gurun
b5a449e488 Merge "Fix build" 2014-05-07 22:08:31 +00:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
Selim Gurun
5ba69bef8c Fix build 
Fix the java reflection to have the devices boot again.

Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
 2014-05-07 15:04:40 -07:00
Winson Chung
945c27836b Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants." 2014-05-07 22:04:16 +00:00
Winson Chung
814086db67 Disabling shadowing (until bugs are addressed) and refactoring some constants. 
Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
 2014-05-07 15:01:14 -07:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master 
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
 2014-05-07 14:46:40 -07:00
Jorim Jaggi
4f0128fb8f Merge "New layout structure for the expanded status bar." 2014-05-07 21:43:14 +00:00
Jim Miller
46426009a5 am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions." 
* commit '424edf064fb705b07f5f7d41e875dd2b24ccf271':
  Fix can't change airplane mode from GlobalActions.
 2014-05-07 21:40:15 +00:00
John Reck
832b151465 Cleanup attachFunctor 
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
 2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags 
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
 2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
John Reck
841057ffc0 Merge "Don't try to draw if there's no canvas or surface" 2014-05-07 21:24:23 +00:00
Jason Sams
26e9051957 Add flags to context creation for RS 
We have a number of context options exposed though native
that were not available though the Java API.  This brings them
to parity.  Will finish plumbing in a follow on CL.

Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
 2014-05-07 14:23:46 -07:00
John Reck
63a0667325 Implement TODO(romainguy) 
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
 2014-05-07 13:45:54 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService" 
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
 2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp 
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
 2014-05-07 13:20:23 -07:00
John Reck
368cdd8526 Don't try to draw if there's no canvas or surface 
Bug: 14616376

 doFrame() can happen after the canvas or surface is destroyed,
 handle it gracefully

Change-Id: Ibbbbdbfa77fa2134bd2abc215ca1a0886d706969
 2014-05-07 13:19:28 -07:00
Jorim Jaggi
603d270a53 Merge "Add intermediate lock icon so users know how to unlock." 2014-05-07 20:18:35 +00:00
Jorim Jaggi
47a7b0769f Add intermediate lock icon so users know how to unlock. 
Bug: 14381296
Change-Id: I51c63dd5ba9a26b7e03be092482f4c4f69b31754
 2014-05-07 22:10:17 +02:00
Jason Monk
f2e074604b Fix Build 
Change-Id: I0035256b41199041bc1bc7d625f2c8f5a6a23e43
 2014-05-07 15:59:10 -04:00
Russ Schnapp
c43a6bbe88 Fix erroneous javadoc example SyncRequest.Builder.setExtras 
Change-Id: I2072a729b2db48d336590363509d9b8e9047c0bc
 2014-05-07 12:56:13 -07:00
Jim Miller
424edf064f am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions." 
* commit 'cc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4':
  Fix can't change airplane mode from GlobalActions.
 2014-05-07 19:44:28 +00:00
Jason Monk
54a9ebb509 Fix build 
Change-Id: I87c037faee19b434be741104cdddb9c467f20606
 2014-05-07 15:26:34 -04:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00