Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,309 Commits 3 Branches 0 Tags
754e3802cd75c8583cf5d6174bed1232c276fe53
Commit Graph

35523 Commits

Author SHA1 Message Date
Jeff Davidson
754e3802cd am 4c37b79c: Merge "Class for managing the active scorer application." 
* commit '4c37b79cc9c3af57be4ca7f9ff40bceaad948d95':
  Class for managing the active scorer application.
 2014-04-16 21:34:26 +00:00
Jeff Davidson
4c37b79cc9 Merge "Class for managing the active scorer application." 2014-04-16 21:32:06 +00:00
Jeff Brown
367687a8b1 am 047f3c71: resolved conflicts for merge of 3ee9dc58 to master 
* commit '047f3c71a48d90a2b022bd886bf581add2d68326':
  Declare VersionCodes.KITKAT_WATCH.
 2014-04-16 21:23:03 +00:00
Jeff Brown
047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master 
Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
 2014-04-16 14:18:49 -07:00
Jeff Davidson
dd6fd1e62b Class for managing the active scorer application. 
Allows listing all possible scorer apps, getting the active scorer
app, setting the active scorer app, and determining whether a given
UID is for the active scorer.

Note that setting a default scorer with a system image will be handled
separately - the plan here is to add a read-only build property
containing a package name to use as the scorer out of the box.
When NetworkScorerService is initialized, it will check a provisioning
bit; if that bit isn't set, it will set the current scorer to the
package specified in this build property (if any) and set the
provisioning bit to true.

Bug: 13769362
Change-Id: I18c0b2ba2aceccc88b70c3611a49149e0bf17ecf
 2014-04-16 14:17:01 -07:00
Jeff Brown
3ee9dc58e5 am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 
* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.
 2014-04-16 20:52:24 +00:00
Jeff Brown
fa72a9eaae Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 2014-04-16 20:49:15 +00:00
Craig Mautner
4f2f1f3a84 am 934ef057: am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '934ef05799532b75d349338c4300671cec1ab162':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:27:15 +00:00
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH. 
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
 2014-04-16 13:27:00 -07:00
Craig Mautner
934ef05799 am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:13:09 +00:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:10:26 +00:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling. 
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
 2014-04-16 13:03:26 -07:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
Jeff Davidson
eec3c36c09 am 34de7a83: Merge "Stub APIs for network scoring." 
* commit '34de7a83033c65f28626aaa9762a91a1646d2486':
  Stub APIs for network scoring.
 2014-04-16 19:10:07 +00:00
Jeff Davidson
b51e0a6c4b Stub APIs for network scoring. 
NetworkScoreManager defines all interactions between the framework and
the scorer app. An ACTION_SCORE_NETWORKS broadcast is sent to the
default scorer with any unscored networks, which responds by calling
updateScores() with scores for those networks. An app may also check
whether they are currently the default scorer with
getDefaultScorerPackage() and request to become the default via the
ACTION_CHANGE_DEFAULT broadcast.

Bug: 13786258
Change-Id: Id3dc0f7c1109f0e3afd73356e2475b7f34167419
 2014-04-16 11:55:14 -07:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:55 +00:00
Deepanshu Gupta
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:39:25 +00:00
Deepanshu Gupta
863848808d am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:37:10 +00:00
Deepanshu Gupta
d023360aa0 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '484c88c3655991759dc64276404d0cf7e33b455f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:36:46 +00:00
Jeff Davidson
ed119096eb am 6a4a9462: Merge "Data structures for communication with network scorer apps." 
* commit '6a4a946223f4b415a174071aa23af8078a4079e3':
  Data structures for communication with network scorer apps.
 2014-04-16 18:36:15 +00:00
Deepanshu Gupta
484c88c365 am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:33:00 +00:00
Jeff Davidson
6a4a946223 Merge "Data structures for communication with network scorer apps." 2014-04-16 18:29:23 +00:00
Jeff Davidson
dc960e21ef Data structures for communication with network scorer apps. 
NetworkKey represents the necessary information to identify a network
to be scored. ScoredNetwork contains the key to identify a network as
well as a score to be used when evaluating that network (as a curve
based on RSSI).

Bug: 13767776
Change-Id: I6bfebd105c9381e615513167b4332b767b43a23a
 2014-04-16 11:28:51 -07:00
Christoph Studer
a709ee5721 am d67d073b: Merge "Rename basePkg to opPkg" 
* commit 'd67d073b9fd110e6b9dfa6af11e8655dcc69f6ef':
  Rename basePkg to opPkg
 2014-04-16 17:45:21 +00:00
Christoph Studer
8fd7f1ed7c Rename basePkg to opPkg 
...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
 2014-04-16 18:51:25 +02:00
Ben Murdoch
1b0f04fb06 am 6f51cd7e: Merge "Revert "Revert "Define new general permission APIs for webview.""" 
* commit '6f51cd7ede3abd1bc076a4aa24f6fd78ac3ad0fc':
  Revert "Revert "Define new general permission APIs for webview.""
 2014-04-16 12:49:17 +00:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
 2014-04-15 20:03:19 -07:00
Deepanshu Gupta
4ccc4bd54f Action bar rendering in layoutlib [DO NOT MERGE] 
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.

This also relies on some changes to the plugin to pass the correct params.

Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 14bf0cef7e)
 2014-04-15 20:02:48 -07:00
Christopher Tate
30812df59c am 9187e40b: Merge "Don\'t crash if a null key is passed for verification/parsing" 
* commit '9187e40b16b60b7d4ea62b0607b16089161cad09':
  Don't crash if a null key is passed for verification/parsing
 2014-04-16 00:06:31 +00:00
Christopher Tate
9187e40b16 Merge "Don't crash if a null key is passed for verification/parsing" 2014-04-15 23:59:46 +00:00
Todd Poynor
91c8c96734 am fb5c8bab: Merge "Context: fixup wrong Javadoc link for BatteryManager" 
* commit 'fb5c8baba52c041951f6a35545402b14e5bb3e56':
  Context: fixup wrong Javadoc link for BatteryManager
 2014-04-15 23:37:25 +00:00
Todd Poynor
99f7e125b0 Context: fixup wrong Javadoc link for BatteryManager 
Change-Id: I3dec0a359185fd9bfc78d98f8232ff64e6a784dd
 2014-04-15 16:05:49 -07:00
Alan Viverette
f8612cd206 am a17bfe04: Merge "Allow clamped bound position to be INVALID_POSITION" 
* commit 'a17bfe04a777f68d41d17f62e83d52aca4df48cc':
  Allow clamped bound position to be INVALID_POSITION
 2014-04-15 22:19:16 +00:00
Todd Poynor
e56d4275ac am 7a8e3fcd: Merge "BatteryManager: Add API and service for battery property retrieval" 
* commit '7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8':
  BatteryManager: Add API and service for battery property retrieval
 2014-04-15 22:19:11 +00:00
Alan Viverette
a17bfe04a7 Merge "Allow clamped bound position to be INVALID_POSITION" 2014-04-15 22:17:28 +00:00
Alan Viverette
875f4c2918 Allow clamped bound position to be INVALID_POSITION 
Change-Id: Idd392e41cb8df31e2933851fa6abd87fc3e2001b
 2014-04-15 15:16:48 -07:00
Todd Poynor
7a8e3fcd3c Merge "BatteryManager: Add API and service for battery property retrieval" 2014-04-15 22:16:13 +00:00
Youngsang Cho
33a4799598 am 7ec8b21a: Merge "Remove TvInputSession" 
* commit '7ec8b21a06364357976b6b60a12a49b255ac39eb':
  Remove TvInputSession
 2014-04-15 21:37:14 +00:00
Youngsang Cho
7ec8b21a06 Merge "Remove TvInputSession" 2014-04-15 21:32:16 +00:00
Youngsang Cho
674e96216d Remove TvInputSession 
TvInputSession is not used anymore. Instead, TvInputManager.Session
and TvInputService.TvInputSessionImpl are used.

Change-Id: Id252afa76b4ef45f561b1d20095ee235a9fdccf8
 2014-04-15 14:25:36 -07:00
Todd Poynor
e35872da97 BatteryManager: Add API and service for battery property retrieval 
Add service "batterymanager" and method getProperty to retrieve
battery properties.  This is a public API.

Make BatteryProperty public.  Cleanups for public-facing API.

Change-Id: I3637d131aabe4811dff40661728d5353eaf854c4
 2014-04-15 13:54:08 -07:00
Christopher Tate
3014733c8c Don't crash if a null key is passed for verification/parsing 
Change-Id: I77c496d9d86d2831a4166a924afe1493aa0ac0ce
 2014-04-15 12:57:47 -07:00
Tao Bai
4c22b54776 Revert "Revert "Define new general permission APIs for webview."" 
This reverts commit e0a7b08d36.

Change-Id: Ieba5a72524e43eb5e2fccb39647fd11e9d9494c8
 2014-04-15 18:04:49 +00:00
Tao Bai
844b25a527 am 31e052bf: Merge "Revert "Define new general permission APIs for webview."" 
* commit '31e052bfc4c81f0aa682d723a88cd9b716b6cace':
  Revert "Define new general permission APIs for webview."
 2014-04-15 18:04:21 +00:00
Tao Bai
31e052bfc4 Merge "Revert "Define new general permission APIs for webview."" 2014-04-15 18:01:43 +00:00
Tao Bai
e0a7b08d36 Revert "Define new general permission APIs for webview." 
This reverts commit 672b99c8f8.

Change-Id: I486b313b8cd638d5e29e2f022bba99b570a9415f
 2014-04-15 17:58:02 +00:00
Adam Powell
e107092879 am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit '50d7bfd8224f9da170dac668888bcf0831373051':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 17:57:46 +00:00
Tao Bai
f53f2d27ac am e5b7c95b: Merge "Define new general permission APIs for webview." 
* commit 'e5b7c95b8a247e9962710dca127c56a78d4faca5':
  Define new general permission APIs for webview.
 2014-04-15 17:40:33 +00:00