Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,924 Commits 3 Branches 0 Tags
d65cb22872b5dbfb5937d66191b60be22b63fd21
Commit Graph

59511 Commits

Author SHA1 Message Date
Dianne Hackborn
d65cb22872 am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '2bbea56d1258f7b55183ddba6364815f17aafe88':
  Final resource IDs.
 2014-11-24 17:59:48 +00:00
Dianne Hackborn
608439df38 am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-24 17:59:43 +00:00
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Jeff Brown
8cac73097e am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b5686d55963e76c801ca0581a1012c5f4aa8d009':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:40:02 +00:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:34:32 +00:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
 2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
 2014-11-24 17:28:09 +00:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
 2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Geoff Mendal
1df8d4c5e0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 16:56:49 +00:00
Geoff Mendal
0d138dd11a Import translations. DO NOT MERGE 
Change-Id: I0faffa6e483c6dd763c39006825281b188b53443
Auto-generated-cl: translation import
 2014-11-24 08:42:25 -08:00
Adrian Roos
520d20c1a8 am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
  Fix DPM.resetPassword("")
 2014-11-24 16:04:13 +00:00
Christoph Studer
30646d87f2 am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '671424951dcd2a0d1059c6d899a8649cbc8b5e26':
  Fix MediaStyle API comments
 2014-11-24 16:04:08 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE 
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
 2014-11-24 07:13:23 -08:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
 2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-22 20:28:10 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Eino-Ville Talvala
e289082a70 am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'dfa99f63677c238453293f48b62b4fffcc101262':
  Camera: Add new capability flags as system features as well
 2014-11-22 05:00:48 +00:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state. 
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
 2014-11-22 03:25:39 +00:00
Dianne Hackborn
b2411f77ca Final resource IDs. 
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
 2014-11-21 17:04:53 -08:00
Sanket Padawe
8e2e6683e3 am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'ab4a940a8ae4a5fb63a84fa51527b7703e7bfc88':
  Make default carrier name string look better.
 2014-11-21 23:37:57 +00:00
John Reck
08372601ab am 418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev 
* commit '418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
  It's super critical to call nStart
 2014-11-21 23:37:52 +00:00
Sanket Padawe
ab4a940a8a Merge "Make default carrier name string look better." into lmp-mr1-dev 2014-11-21 23:33:26 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
Dianne Hackborn
d052a9416a Work on issue #18486438: Reduce size of bugreport output 
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
 2014-11-21 15:23:13 -08:00
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
 2014-11-21 23:00:52 +00:00
John Reck
72d6e4facb It's super critical to call nStart 
Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
 2014-11-21 14:27:21 -08:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc552.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Jeff Sharkey
54c11274b5 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit 'c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4':
  Lightweight checkin output for network stats.
 2014-11-21 22:05:18 +00:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device 
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
 2014-11-21 13:57:48 -08:00
Jeff Brown
1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.
 2014-11-21 21:53:10 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00