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

142858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Egberts
fc4322f965 am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit 'a66d298ea27d7cb7d5927869eda196e2fa56da78':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 18:09:38 +00:00
Nancy Chen
f7179cb3ba am 4a9b99f5: API changes to enable account selection for a call 
* commit '4a9b99f5d8a4a9a3ce6f4a45d577a8a92cfcf511':
  API changes to enable account selection for a call
 2014-07-17 18:09:28 +00:00
Craig Mautner
dea2119f33 am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 
* commit 'b1c0b0082d535a48d3e916f1a0b70219c84e83c2':
  Wait for all windows to draw before turning screen on
 2014-07-17 18:09:25 +00:00
Martin Kosiba
85bccb55b5 am 92486999: Allow for appending of resources to an AssetManager. 
* commit '92486999f4f34e73df8e31f97b378f8dd66b5aa9':
  Allow for appending of resources to an AssetManager.
 2014-07-17 18:09:21 +00:00
Alexandra Gherghina
2d4b928d63 am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit 'dbfd074444b47f13cfc655142fdc3738bb8136e8':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 18:09:17 +00:00
Amith Yamasani
1457a7626b am 467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 
* commit '467bc0efa37b977abda6349eb75208bf103422e3':
  Keep track of user_setup_complete in DPMS
 2014-07-17 18:09:14 +00:00
Jae Seo
6fce036bed am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 
* commit 'f977db2e87fdc9ba383c3ba808d2ad686a9c26ac':
  TIF: Add TvInputInfo.getParentId
 2014-07-17 18:09:10 +00:00
Kenny Guy
a5824dd5d7 am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev 
* commit '41482465da91ec79cf56d18fc25ebd7533a27489':
  Allow app restrictions for uninstalled packages.
 2014-07-17 18:09:04 +00:00
Chris Craik
4015ed3ee1 am ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev 
* commit 'ec9c58c15d19809827f2cb48df9715433bfa9ed5':
  Initializing variables - generally a good practice
 2014-07-17 18:09:01 +00:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call 
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
 2014-07-17 10:19:20 -07:00
Martin Kosiba
7df3625d5b Allow for appending of resources to an AssetManager. 
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
 2014-07-17 18:10:02 +01:00
Alexandra Gherghina
999d394ade Ads per-user APIs to manage accounts through the AccountManager 
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
 2014-07-17 17:08:49 +00:00
Jeff Davidson
65f2b87c79 am 14648e40: Merge "Restrict SCORE_NETWORKS permission to signature|system." into lmp-dev 
* commit '14648e403c20a6a6c78c9b26e2f45bf99248c882':
  Restrict SCORE_NETWORKS permission to signature|system.
 2014-07-17 16:41:38 +00:00
Julia Reynolds
4a396c257e am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev 
* commit '9c9cb566810a3763532606b5a4b3596814668fba':
  Update message on DISALLOW_REMOVE_USERS constant.
 2014-07-17 16:37:39 +00:00
Torne (Richard Coles)
d92b06119e am 07119f4a: Use the WebView\'s loader library to load the real library. 
* commit '07119f4ad995fa768492889e6644b4da72d26dd7':
  Use the WebView's loader library to load the real library.
 2014-07-17 16:20:48 +00:00
Torne (Richard Coles)
a8cf78c51f am 62cb4390: Remove WebView library preloading mechanism. 
* commit '62cb4390dd67f7bd9da25e225a4503bc8dc11fdf':
  Remove WebView library preloading mechanism.
 2014-07-17 16:20:44 +00:00
John Spurlock
2ea85672b3 am 1ae06eb3: Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 
* commit '1ae06eb35037256cf4d03c6b4e4f50f26b6b2e0f':
  Zen: Maintain selection throughout rocker session.
 2014-07-17 16:20:41 +00:00
Torne (Richard Coles)
08cfaf6726 Use the WebView's loader library to load the real library. 
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.

Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
 2014-07-17 09:18:43 -07:00
Torne (Richard Coles)
b5de924fad Remove WebView library preloading mechanism. 
We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.

Bug: 13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2
 2014-07-17 09:18:43 -07:00
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev 
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
 2014-07-17 10:05:07 -07:00
Amith Yamasani
3f4f2fbcd0 Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 2014-07-17 16:16:48 +00:00
Jae Seo
874f95ca73 Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 2014-07-17 16:16:48 +00:00
John Spurlock
23e85fb6f8 am f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev 
* commit 'f0580c6e818e371b0934d560284f3b8e5606425d':
  Shade: Hide the status icons from the collapsed header.
 2014-07-17 15:59:15 +00:00
Przemyslaw Szczepaniak
8759bd0a96 am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev 
* commit '95546693a23d252855ce62549269348153bdbc97':
  Add AudioAttributes support in the TTS.
 2014-07-17 15:55:19 +00:00
John Spurlock
3fc3ffd736 am 791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev 
* commit '791c827c22c8d0179500f0df201a58bce62ad68e':
  Zen: Return of the alarm warning.
 2014-07-17 15:51:21 +00:00
Kenny Guy
9a671b1e2e am 6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev 
* commit '6ec1e21d4f9a5e76ff23b791c350890ae4b784a1':
  Check for exported and category before starting activity.
 2014-07-17 15:20:21 +00:00
Nicolas Prevot
62e5655df9 am 9a4cf569: DO NOT MERGE 
* commit '9a4cf569e9b4e4bcea5b20c954120aa890df9e2b':
  DO NOT MERGE
 2014-07-17 14:19:28 +00:00
Filip Gruszczynski
bd734c73e5 am e26a2536: am 95198b91: am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev 
* commit 'e26a25361d9ae649f0855f69afc1cce1b7d3116a':
  Using outset bottom from theme as bottom inset on circular screens.
 2014-07-17 14:19:25 +00:00
Adrian Roos
5cb7dde7ac am 3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev 
* commit '3e7b4279abee870d5094f505a9bbdcd42c9a7256':
  Update QS user switcher colors to spec
 2014-07-17 14:19:21 +00:00
Adrian Roos
f7bcc1c25f am 221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev 
* commit '221433ab83c1d6719b563f07314c474743ea7416':
  Partially fix the keyguard scrim
 2014-07-17 14:19:17 +00:00
Dianne Hackborn
cee665dd89 am cf3580b0: Merge "Fix build." into lmp-dev 
* commit 'cf3580b0c64a69173bfe1423a023d1dbd56b0ef5':
  Fix build.
 2014-07-17 14:19:09 +00:00
Chulwoo Lee
a5e0562e01 am 62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev 
* commit '62572cabc4083b716d15f85a36eaf4225415b9d8':
  Pass input ID to the setup/settings activity
 2014-07-17 14:19:04 +00:00
Chulwoo Lee
78b3a83616 am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev 
* commit '02023167740b862c0df7541a23f825eb5463c3f8':
  Introduce "input_id" column to the channels table
 2014-07-17 14:19:01 +00:00
Dianne Hackborn
c9f1d2fc5a am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView... 
* commit 'dbec91c09bd8c184e897d36b8150307ad4713c6c':
  Implement issue #16330060: Inform ActivityManager about WebView...
 2014-07-17 14:18:56 +00:00
Sandeep Siddhartha
559d9a1bf1 am 47ecf354: Plumb the database code to read/update sound models 
* commit '47ecf354c7d43bd6f6df5f6a6de78fb9201b3805':
  Plumb the database code to read/update sound models
 2014-07-17 14:18:49 +00:00
Sandeep Siddhartha
3ff0850a07 am aecd5383: Add recognition modes to the enrollment metadata 
* commit 'aecd5383e3647d9428dc3c83c894830ab2efc421':
  Add recognition modes to the enrollment metadata
 2014-07-17 14:18:43 +00:00
Alan Viverette
f7b705afd2 am bbbbb3b2: Add public attributes for TimePicker styling 
* commit 'bbbbb3b25050e624c6e4c75a9c76c043695b92d5':
  Add public attributes for TimePicker styling
 2014-07-17 14:18:38 +00:00
Dan Sandler
9591597f53 am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev 
* commit 'ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
  Album artwork returns triumphantly to the lockscreen.
 2014-07-17 14:17:16 +00:00
John Spurlock
6530a89c8e am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev 
* commit 'efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
  Update data limit notification icon + strings.
 2014-07-17 14:17:12 +00:00
Sandeep Siddhartha
7c7e18a2bd am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues 
* commit '43bc655b3c5ddd70af813280d9125797d076d00e':
  Add code for isKeyphraseActive and some logging to help debug issues
 2014-07-17 14:17:08 +00:00
John Spurlock
42140162ea am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev 
* commit '45aebdf2d2b552914abf9656a69bc92bd6540b54':
  Add a zen-specific event sink, include in dumpstate.
 2014-07-17 14:17:05 +00:00
Amith Yamasani
5d74829cf9 am b31b07c8: Merge "Allow content provider access across users" into lmp-dev 
* commit 'b31b07c8b10937f3071300068da64158d3686513':
  Allow content provider access across users
 2014-07-17 14:17:01 +00:00
Lorenzo Colitti
3acb0871a3 am 1098531c: Disable logging in NetlinkTracker. 
* commit '1098531c19d337b4544c51e446e859d86e7fdab9':
  Disable logging in NetlinkTracker.
 2014-07-17 14:16:57 +00:00
Chris Craik
0dd0ebad92 am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev 
* commit 'b63869a6fb76ede4492f2184ae005687ac70c916':
  Add accessibility text contrast setting
 2014-07-17 14:16:53 +00:00
Santos Cordon
61406a1fce am ec82a805: Add toString & equals helper methods to PhoneAccount.java 
* commit 'ec82a805b55ce61e2049d66d74fbab5610577013':
  Add toString & equals helper methods to PhoneAccount.java
 2014-07-17 14:16:50 +00:00
Baligh Uddin
5676e0668f am 54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '54639300d0ec7424fe6b18ba82f0293c2543c62f':
  Import translations. DO NOT MERGE
 2014-07-17 14:16:47 +00:00
John Spurlock
186f2c40fa am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev 
* commit 'fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
  QS: Deal with null uuids in BT controller.
 2014-07-17 14:16:43 +00:00
Baligh Uddin
8b9d339b33 am 9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '9988df2980dbe0529eca8ba4379b061197166a55':
  Import translations. DO NOT MERGE
 2014-07-17 14:16:40 +00:00
Baligh Uddin
b15d7f3d97 am da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'da616efd015e372c3e02c1b9368fe66badb0341d':
  Import translations. DO NOT MERGE
 2014-07-17 14:16:36 +00:00