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

179953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Bryce Lee
7e6fbb361b am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
automerge: e036ce2

* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:05:15 +00:00
Adam Powell
1accc9c12b am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
automerge: 57744dd

* commit '57744dd139f3d30ed1031319dd64b289a68ac3ba':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:03:36 +00:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Bryce Lee
e036ce2e70 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:01:24 +00:00
Adam Powell
57744dd139 am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
* commit '69c22e82e9c3e95f4689a57320de3199ffd29262':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:01:19 +00:00
Bryce Lee
9320e9f0a6 Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 2015-01-13 18:59:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Winson Chung
2b59fb902e Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours 
automerge: b1a0a57  -s ours

* commit 'b1a0a57ccab94e479087b620dcea2b39225693bb':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
 2015-01-13 18:25:06 +00:00
Winson Chung
b1a0a57cca Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 
automerge: 7ce662e  -s ours

* commit '7ce662ef870df34cd189b4ce9e487e496ba407dd':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
 2015-01-13 18:19:39 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Nicolas Prévot
6478b4f19a Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd 
automerge: e5d3ee8

* commit 'e5d3ee8e4fae72ef554a0e1084e88aea9ed8f020':
  Clarify docs for user restrictions
 2015-01-13 17:44:21 +00:00
Nicolas Prévot
e5d3ee8e4f Merge "Clarify docs for user restrictions" into lmp-mr1-dev 
automerge: 6ab76bd

* commit '6ab76bd434d587fecefd5801905b09bcd32b1661':
  Clarify docs for user restrictions
 2015-01-13 17:39:34 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Bryce Lee
aa1008cba4 Update javadoc for DEFAULT_FEATURES deprecation. 
Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
 2015-01-13 09:26:46 -08:00
Ricardo Cervera
c2d9505219 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 
automerge: cca3d44

* commit 'cca3d44b700db945e23ad357b031d7f6397e18b9':
  docs: Fix broken link in Common Intents
 2015-01-13 17:01:48 +00:00
Ricardo Cervera
cca3d44b70 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
automerge: 8eb3060

* commit '8eb306077d603baae0d8e00a909f97275f83f3db':
  docs: Fix broken link in Common Intents
 2015-01-13 16:55:00 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
62ceea3156 am f5569413: docs: Fix broken link in Common Intents 
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents
 2015-01-13 16:42:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Ben Wagner
4eec25af42 Merge "Remove dead code from AssetStreamAdapter." 2015-01-13 14:53:34 +00:00
Jason Monk
49accefb6f resolve merge conflicts of afeefb6 to master. 
Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
 2015-01-13 09:15:17 -05:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
1e263d3f14 am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '66b4d48469c74f7dd889f3f685b436fcb957bf16':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:14:01 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Alan Viverette
4ecb5fb288 am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '82bdfcfadc17b8467a0e3c50843997e7957a9452':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:24:11 +00:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Elliott Hughes
1e14722167 am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit 'd6c475dc246b1681f5c9af9e00ac74183812329c':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 01:32:37 +00:00
Elliott Hughes
d6c475dc24 am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit '595ae39f7f484eb5d2d9e21feeff7e97114b744a':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 01:18:48 +00:00
Elliott Hughes
595ae39f7f Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 2015-01-13 01:13:00 +00:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Ben Wagner
c2d39573ca Remove dead code from AssetStreamAdapter. 
After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.

Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
 2015-01-12 18:13:27 -05:00
Elliott Hughes
1bf2481233 Use more intention-revealing tests for S_ISLNK and S_ISSOCK. 
Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
 2015-01-12 14:33:04 -08:00
Ricardo Cervera
5849c0e4c6 am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
automerge: cb09d8d

* commit 'cb09d8d08a3628561a58f19713b9358eafa32738':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:26:58 +00:00
Ricardo Cervera
cb09d8d08a am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit '9a19ed17e1f36894aac8250dcf9649998d9c2603':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:22:59 +00:00
Wale Ogunwale
00c8565614 am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:22:05 +00:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:16:09 +00:00
Wale Ogunwale
42b0d10a83 am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:15:58 +00:00
Wale Ogunwale
1ea6afe123 Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev 2015-01-12 22:03:50 +00:00
Wale Ogunwale
74bf065e43 Don't allow windows with invalid types to be added. 
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
 2015-01-12 14:01:25 -08:00
Ricardo Cervera
eec6dd779c am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:59:33 +00:00
Ricardo Cervera
a87f35555d am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:53:27 +00:00
Joe Fernandez
e3c10bf96c am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
automerge: d3b6d61

* commit 'd3b6d61d1320aca69c22fd597197b8dd6de61799':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:49:30 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
d3b6d61d13 am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit 'd15b54d23fbc2f5582c9491cca46830b84f388ae':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:46:38 +00:00
Joe Fernandez
eabea18ee8 am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
automerge: 56c56f7

* commit '56c56f7d20f7c7621f746955dd275d252ca37732':
  docs: Remove Wear preview reference docs
 2015-01-12 21:39:30 +00:00