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

136703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
ef6aae62f6 Merge "Fixes to WearableActionExtensions" into klp-modular-dev 2014-05-21 02:41:02 +00:00
Jeff Brown
df3bad37d2 am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 
* commit '8f120dd6d631ac632d3356b81403a53f958021f0':
  Allow display timeouts to be set in config.xml.
 2014-05-21 02:41:00 +00:00
Jeff Brown
ccf51bef28 am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev 
* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
  I'm feeling the good vibrations.
 2014-05-21 02:38:11 +00:00
Jeff Brown
8f120dd6d6 am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
  Allow display timeouts to be set in config.xml.
 2014-05-21 02:38:07 +00:00
Jeff Brown
2d9b513dab Merge "I'm feeling the good vibrations." into klp-modular-dev 2014-05-21 02:35:09 +00:00
Dirk Dougherty
42bff1ce2e am 3dc330af: am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit '3dc330af6b590ebd3c6529e8b123f51cebb134e2':
  Remove monetization image in edu guidelines.
 2014-05-21 02:34:43 +00:00
Jeff Brown
0702786d81 Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 2014-05-21 02:34:25 +00:00
Jeff Brown
969579bb9d I'm feeling the good vibrations. 
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution.  However if
the system is performing haptic feedback then we want to allow
it to run to completion.

Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
 2014-05-20 19:29:29 -07:00
Dirk Dougherty
3dc330af6b am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'f7963fab0decb70b72b848fe3d7a14c5ed54ff95':
  Remove monetization image in edu guidelines.
 2014-05-21 02:29:04 +00:00
Dirk Dougherty
f7963fab0d am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'c1bb79d966c5fee256a349d8902c7abd362ddc39':
  Remove monetization image in edu guidelines.
 2014-05-21 02:25:09 +00:00
Dirk Dougherty
c1bb79d966 am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
  Remove monetization image in edu guidelines.
 2014-05-21 02:20:16 +00:00
Dirk Dougherty
bb0b8449f8 Remove monetization image in edu guidelines. 
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
 2014-05-20 19:10:26 -07:00
Jason Sams
b69c791b79 Validate RenderScript context creation flags 
Sync the IDs to that of the native interface.

Change-Id: I7516c1ea4f4a93844ddb8397b2fc1e79ff8d6b68
 2014-05-20 18:48:35 -07: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
Winson Chung
656c7b32ff Merge "Removing unnecessary proguard flag for removed info view." 2014-05-21 00:32:16 +00:00
Winson Chung
c637482a80 Removing unnecessary proguard flag for removed info view. 2014-05-21 00:31:43 +00:00
Lorenzo Colitti
6ec371cbdd Merge "Fix build." 2014-05-21 00:20:33 +00:00
Lorenzo Colitti
247675e5d9 Fix build. 
Change-Id: I5c09a406b6c43318cea600171b8dd25eeeffa673
 2014-05-20 17:17:21 -07:00
Jeff Brown
27736f5c0a Allow display timeouts to be set in config.xml. 
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
 2014-05-20 17:17:10 -07: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
Winson Chung
7bb188521c Merge "Wrapping console logs." 2014-05-20 23:25:42 +00:00
Winson Chung
10f8139d3b Wrapping console logs. 2014-05-20 16:21:31 -07: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
Maurice Lam
92dfff4bc8 Merge "Disable swipe-to-reveal nav bar / status bar during setup" 2014-05-20 23:15:42 +00:00
Jim Miller
90b6b63d1d Merge "Fix Keyguard PIN error message for N < 4." 2014-05-20 23:12:07 +00:00
Yuncheol Heo
cd47ecb690 Merge "Fix the wrong conversion of byte to int." 2014-05-20 22:53:13 +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
Yuhao Zheng
0c62e8eb30 Merge "Fix a boot failure due to Wifi / Wifi Passpoint" 2014-05-20 22:08:32 +00:00
Alan Viverette
3dfd5bae84 Merge "Various API review fixes to resources and drawables" 2014-05-20 22:06:12 +00:00
Winson Chung
7bf91cc12b Should not be closing system dialogs when Recents is hidden. (Bug 15109551) 
Change-Id: Ia73753074ce620ede136cd4b156d6bfeadb900cf
 2014-05-20 15:03:51 -07: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
Vinit Deshpande
43cfdfd9c5 Fix a runtime break caused by merge conflict 
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
 2014-05-20 14:59:32 -07:00
Adrian Roos
401b3ebfa9 Fix typo causing immersive mode transition flickering. 
Bug: 15095056
Change-Id: Ibc75bb4f61070f4cf00756ab1a216255e38932af
 2014-05-20 14:59:32 -07:00