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

50973 Commits

Author SHA1 Message Date
Emily Bernier
530f133a3f am f5a4eabb: Merge "New user restrictions for EDU" 
* commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168':
  New user restrictions for EDU
 2014-05-08 19:55:39 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
Craig Mautner
662274281a am acf92242: Merge "Make ChooserActivity intents doccentric and transitory" 
* commit 'acf922428803d5a6b619254df0daa3a724580970':
  Make ChooserActivity intents doccentric and transitory
 2014-05-08 19:48:58 +00:00
Craig Mautner
7486ae202f Merge "Make ChooserActivity intents doccentric and transitory" 2014-05-08 19:44:53 +00:00
Craig Mautner
411d2aed2b Make ChooserActivity intents doccentric and transitory 
Activities launched from the chooser activity will now appear in
their own tasks which will be automatically removed from recents
when they are finished.

Also qualified application of new flags with null check and
Action check. Must be either ACTION_SEND or ACTION_SEND_MULTIPLE.

Fixes bug 14463859.
Fixes bug 14633773.

Change-Id: I8832462163958f6a43bc4c6a020f78948ce70ac3
 2014-05-08 12:43:50 -07:00
Selim Gurun
635afd0a80 am f60667b1: Merge "Cleanup a unused setting" 
* commit 'f60667b17423fbf1e03fe26ca04e012391034219':
  Cleanup a unused setting
 2014-05-08 18:51:42 +00:00
Selim Gurun
6cab9b3814 Merge "Cleanup a unused setting" 2014-05-08 18:48:52 +00:00
Ying Wang
f42c5b532c am 90e2de4a: am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '90e2de4a0548413d2ea6f8c108a3299d06248f4d':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:36:45 +00:00
Mindy Pereira
048a3f6659 am 68a68949: am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '68a6894950c210e9ad9300a16acb5870b13c124f':
  Make distance count when dismissing swipedismisslayout
 2014-05-08 18:36:41 +00:00
Selim Gurun
57cee39d76 Cleanup a unused setting 
The old webview is not used anymore. Removing this setting.

Change-Id: I3f783eec195a2f11534bcff8243ce4d2c556a416
 2014-05-08 11:35:25 -07:00
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:31:18 +00:00
Mindy Pereira
a3ef079aaf am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '101e379318a3869f64ea897a3f95a89243408c94':
  Make distance count when dismissing swipedismisslayout
 2014-05-08 18:30:57 +00:00
ztenghui
f563ef8102 am 3225a6b5: Further cleaning on animated part of VectorDrawable. 
* commit '3225a6b5b09c8ec78071186bfb20289600812c21':
  Further cleaning on animated part of VectorDrawable.
 2014-05-08 17:40:09 +00:00
ztenghui
ddbbb8ae85 Further cleaning on animated part of VectorDrawable. 
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.

Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
 2014-05-08 10:16:34 -07:00
George Mount
0b73f3f9b1 am ec33d3be: Merge "Fix mismatch in Transition ID/instances" 
* commit 'ec33d3bed626da72f98b00bc7f927c58072f030d':
  Fix mismatch in Transition ID/instances
 2014-05-08 17:03:29 +00:00
George Mount
764af2958b Merge "Fix mismatch in Transition ID/instances" 2014-05-08 16:58:18 +00:00
Derek Sollenberger
2714bdfdc1 am a5e12a42: Merge "Avoid caching shadow properties in Java & HWUI." 
* commit 'a5e12a4227d6ef1efd4f17697f407d165a992a72':
  Avoid caching shadow properties in Java & HWUI.
 2014-05-08 14:47:34 +00:00
Derek Sollenberger
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
Baligh Uddin
cf501a60b8 Merge "Import translations. DO NOT MERGE" 2014-05-08 14:37:44 +00:00
Sander Alewijnse
12fa1fe307 am 7d5cd652: Merge "Add API to disable account management for certain types of accounts." 
* commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14':
  Add API to disable account management for certain types of accounts.
 2014-05-08 12:52:50 +00:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Dan Sandler
fea08f22de am 20d80a4a: Merge "Quantum notification improvements." 
* commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0':
  Quantum notification improvements.
 2014-05-08 11:34:31 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be Add API to disable account management for certain types 
of accounts.

The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.

Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
 2014-05-08 12:28:07 +01:00
Vinit Deshapnde
558322e093 am 26e8778f: Merge "Remove reference to WifiScanner till the API is made public" 
* commit '26e8778f58a8ccf8c73ae16cd30e05515438496e':
  Remove reference to WifiScanner till the API is made public
 2014-05-08 10:10:00 +00:00
Vinit Deshapnde
e2679f09b1 Merge "Remove reference to WifiScanner till the API is made public" 2014-05-08 10:05:45 +00:00
Vinit Deshapnde
256daf0093 Remove reference to WifiScanner till the API is made public 
Change-Id: I0cb2be4338ce59e1d12f83a94edc5de39810b18a
 2014-05-08 02:45:12 -07:00
Jessica Hummel
71094f0aee am 28866e1d: Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps" 
* commit '28866e1d82626075829de5740481d445a836bcd2':
  Disallow the INTERACT_ACROSS_USERS permission for system apps
 2014-05-08 09:44:21 +00:00
Jessica Hummel
fbf53d042d Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps" 2014-05-08 09:40:13 +00:00
Vinit Deshapnde
6f5494c749 am c5fe3c17: Merge "Initial implementation of WifiScanner" 
* commit 'c5fe3c179c9f82cacaf0ac082f49de9f9c31708c':
  Initial implementation of WifiScanner
 2014-05-08 08:45:04 +00:00
Vinit Deshapnde
b788d4eb01 Merge "Initial implementation of WifiScanner" 2014-05-08 08:22:59 +00:00
Dan Sandler
327f0add84 am cea92759: Merge "L: WIP." 
* commit 'cea92759f0c6e174b57883f9586f2868f2c9a7f3':
  L: WIP.
 2014-05-08 06:49:30 +00:00
Dan Sandler
26e81cf14b Quantum notification improvements. 
New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.

Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.

Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
 2014-05-08 01:21:55 -04:00
Dan Sandler
d30195a613 Merge "L: WIP." 2014-05-08 05:20:23 +00:00
Dan Sandler
c89deae0a7 L: WIP. 
Change-Id: I9e2656c9df95a2e0ed236291419bbc4635ec97d7
 2014-05-08 01:14:17 -04:00
Vinit Deshapnde
011e1b35a6 Initial implementation of WifiScanner 
This change implements basic functionality of WifiScanner. Following
functionality is enabled

1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist

Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
 2014-05-07 21:14:24 -07:00
vandwalle
ce311f62ca am 16170143: Merge "initial Best Network Selection implementation" 
* commit '16170143a30e9e45f3fbdd8f27037fcbd8f403e8':
  initial Best Network Selection implementation
 2014-05-08 03:08:01 +00:00
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
Jason Monk
cb20502fb4 am a7cb6e54: Merge "Fix Docs breakage" 
* commit 'a7cb6e5419c68bf950b1babbf7ba5c951ddf8086':
  Fix Docs breakage
 2014-05-08 01:05:02 +00:00
Craig Mautner
749d065a9b am aa79c9d7: Merge "Use new doccentric flags and attributes in Sharing" 
* commit 'aa79c9d7d4c4adc24f7f0ffa2c01c46241430b71':
  Use new doccentric flags and attributes in Sharing
 2014-05-08 01:04:59 +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
Russ Schnapp
d4a2c8ca7d am f975bc6a: Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras" 
* commit 'f975bc6a682cc5b5a5c764a8cc9acedf0288ee43':
  Fix erroneous javadoc example SyncRequest.Builder.setExtras
 2014-05-08 00:31:31 +00:00
Ying Wang
db55bb0622 am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:27:09 +00:00
Russ Schnapp
7359b0b885 Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras" 2014-05-08 00:24:10 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +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
Alan Viverette
e80e2fc71e am 91c091cf: Merge "State based animators for Views" 
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
  State based animators for Views
 2014-05-08 00:01:07 +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