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

39816 Commits

Author SHA1 Message Date
George Mount
c84947db56 Merge changes I2da66b54,I8a65428d 
* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.
 2014-05-21 13:51:44 +00:00
Narayan Kamath
d862ebb603 resolved conflicts for merge of fcc4fed3 to master 
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
 2014-05-21 12:07:35 +01:00
Sander Alewijnse
9853e2a8b3 Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." 2014-05-21 10:34:00 +00:00
Jeff Brown
fcc4fed3c1 am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev 
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
  Make power button behavior configurable.
 2014-05-21 08:40:33 +00:00
Jeff Brown
6fb904bfd1 Merge "Make power button behavior configurable." into klp-modular-dev 2014-05-21 04:28:34 +00:00
Jeff Brown
6d8fd27e51 Make power button behavior configurable. 
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
 2014-05-20 21:24:38 -07:00
Yuhao Zheng
26611efc2a Merge "Hotspot 2.0 framework - add implementation" 2014-05-21 04:21:23 +00:00
Wei Wang
ab39cb7f6a Add scan response as an advertising parameter(1/2). 
Change-Id: I75c500dd7b5f2609d3092f50ba284a5ec4a41987
 2014-05-20 20:38:29 -07:00
Griff Hazen
3d6eed9613 am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev 
* commit '08a8c2ca45dc859e79d54990d2ae0392d475aeda':
  Fixes to WearableActionExtensions
 2014-05-21 02:48:24 +00:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev 
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
 2014-05-21 02:44:16 +00:00
Griff Hazen
4ae73202c3 Fixes to WearableActionExtensions 
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN

Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
 2014-05-20 18:46:16 -07:00
Roger Chang
7fee7232ee Hotspot 2.0 framework - add implementation 
Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
 2014-05-20 18:25:56 -07:00
Wonsik Kim
193909da71 Merge "Change visibility of TvInputManager.Session.setSurface()" 2014-05-21 00:44:15 +00:00
Kristian Monsen
7a8e6e59ab Merge "Consider addAction(int action) to possibly be a bit mask" 2014-05-21 00:42:20 +00:00
Griff Hazen
7e14285ff5 Merge "resolved conflicts for merge of cbe69ec1 to master" 2014-05-20 23:59:45 +00:00
Amith Yamasani
48f73ef141 Merge "Pass along the appOp param to broadcastIntent" 2014-05-20 23:58:45 +00:00
Amith Yamasani
0261b9b1cc Pass along the appOp param to broadcastIntent 
Forgot to pass that along in the original CL

Change-Id: I3aaa7de9cf5c73ab5cbff367e5889429e9ac2301
 2014-05-20 16:57:26 -07:00
Griff Hazen
d445fe7e54 resolved conflicts for merge of cbe69ec1 to master 
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
 2014-05-20 16:53:09 -07:00
Kristian Monsen
8d5f3fa645 Consider addAction(int action) to possibly be a bit mask 
bug=15092606

Change-Id: I885808b3f4d2337129d1660300be8e926f8a8425
 2014-05-20 16:44:14 -07:00
Andres Morales
94a17b5f18 Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" 2014-05-20 23:40:37 +00:00
Chris Craik
47a7d61e70 Merge "Clean up Outline API, method on drawable" 2014-05-20 23:27:21 +00:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base. 
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
 2014-05-20 23:21:01 +00:00
Jim Miller
430259a1d8 Merge "Update FingerprintManager API after discussions." 2014-05-20 23:18:48 +00:00
Lorenzo Colitti
00592c2700 Merge "Move IP config from WifiConfiguration to IpConfiguration." 2014-05-20 23:15:50 +00:00
George Mount
8cab50afda Fix for quick "back" in Activity Transitions. 
Bug 14990153

Stops two potential animators working against the background
drawable. Forces the entering views to become visible onResume.

Change-Id: I2da66b54a16c6c69533eebbeff6db7f5a7794a89
 2014-05-20 15:36:31 -07:00
George Mount
a712e8cc2f Enter and exit transitions are inverted in calling Activity. 
Bug 15115028

Also fixes NPE when there is shared element name mismatch.

Change-Id: I8a65428d4b215ada532e98a555649c2e046de5ef
 2014-05-20 15:34:05 -07:00
Jaewan Kim
6346155c5a Move IP config from WifiConfiguration to IpConfiguration. 
This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
 2014-05-20 15:24:10 -07:00
Amith Yamasani
863ddcc7ac Merge "Per-user telephony restrictions" 2014-05-20 22:20:06 +00:00
Julia Reynolds
37f4e44ae6 Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages." 2014-05-20 22:19:02 +00:00
Amith Yamasani
9f6c25f57e Per-user telephony restrictions 
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
 2014-05-20 15:13:28 -07:00
Julia Reynolds
4d40452154 Merge "Allow device/profile owners to update settings." 2014-05-20 22:10:46 +00:00
Alan Viverette
3dfd5bae84 Merge "Various API review fixes to resources and drawables" 2014-05-20 22:06:12 +00:00
Julia Reynolds
966881e895 Add Device/Profile Owner gated apis for setting/getting blocked packages. 
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14945334

Change-Id: I108e2013c67409dca554acf78e3a710745900706
 2014-05-20 17:59:58 -04:00
Julia Reynolds
da55165321 Allow device/profile owners to update settings. 
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.

DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14965414

Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
 2014-05-20 17:49:45 -04:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base. 
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
 2014-05-20 13:50:06 -07:00
Jeff Brown
b86b1027a3 am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit '9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:47:29 +00:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:40:20 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Alan Viverette
3b5c4272db Various API review fixes to resources and drawables 
BUG: 15025565
Change-Id: If00c85816f8288338967f7a85453d21f858f5ca7
 2014-05-20 13:20:42 -07:00
Griff Hazen
51eb4e657c am 7ba69dd8: am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 
* commit '7ba69dd8bd428494c7a2848b5d3325d47cf4afbf':
  Fix sdk docs build for framework from remote input api addition.
 2014-05-20 20:18:11 +00:00
Griff Hazen
b720abeee8 resolved conflicts for merge of 8f1e7ade to master 
Change-Id: Icabc5d274502abf8d40116d373c9f9d0ac062386
 2014-05-20 13:15:30 -07:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
 2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition. 
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
 2014-05-20 12:51:29 -07:00
Robert Greenwalt
eeb11cde21 Merge "Add NetworkFactory names and unregistration." 2014-05-20 19:03:45 +00:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api. 
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
 2014-05-20 18:41:46 +00:00
Mike Lockwood
fa2b3fc6cd USB: Minor cleanup from API council review 
Bug: 15089961
Change-Id: I8a22fad94d2a52d2270c89240b2a47bd1cef17b5
 2014-05-20 11:14:58 -07:00
Ben Murdoch
f564c7fe86 resolved conflicts for merge of ecf09321 to master 
Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
 2014-05-20 19:13:39 +01:00
Chris Craik
7dc5b41e60 Clean up Outline API, method on drawable 
bug:15025466
bug:15089680
Change-Id: I8d3b64a0d9dbdbaf679042c8b384d2050323a8e6
 2014-05-20 10:38:59 -07:00