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

171593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
097e3830cd am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:49:37 +00:00
Jason Monk
89b75bdbf6 am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'f8dd5f6a19791fdb6fbe1fc40863c1e8dcf785e6':
  Handle config changes in NetworkController
 2014-12-12 18:49:32 +00:00
Jason Monk
19b6ae0fe8 am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit '106806270c6808c94978ce39e11b7ea73a2cfcf1':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:49:26 +00:00
Adam Powell
746079e2ee am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:43:38 +00:00
Jason Monk
f8dd5f6a19 am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController
 2014-12-12 18:43:33 +00:00
Jason Monk
106806270c am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit 'a68697005137c2b5c5feb43b8cac078f7b75ec18':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:43:28 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Jason Monk
a47f968d7e Merge "Handle config changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:40 +00:00
Jason Monk
a686970051 Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:26 +00:00
John Reck
5e999acf53 Merge "Fix style" into lmp-mr1-dev-plus-aosp 2014-12-12 17:55:47 +00:00
John Reck
f088c349df Fix style 
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
 2014-12-12 09:49:29 -08:00
Esteban Talavera
0b7b87a4c8 am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c 
* commit '4f40fb471265a164a0bdfd060d90375ce706b1dd':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:17:32 +00:00
Esteban Talavera
4f40fb4712 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 
automerge: c28fa2c

* commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:08:46 +00:00
Esteban Talavera
c28fa2cdd4 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 2014-12-12 16:59:31 +00:00
Jason Monk
3aaabd7124 Handle config changes in NetworkController 
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.

Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
 2014-12-12 11:56:11 -05:00
Jorim Jaggi
0b12c6cd89 am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
* commit 'e741a3e9fe1d710f5531d134ae317d2b73c57292':
  Limit item count in QS detail
 2014-12-12 15:46:37 +00:00
Jorim Jaggi
4ec83a764d am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
* commit '19131b49f62e6a6b21013be1f9f25b3874728a9b':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:46:30 +00:00
Jorim Jaggi
8514333283 am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
* commit '569a113a1957fee2a9ef2131f3334e68b30f30f4':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:46:24 +00:00
Jorim Jaggi
e741a3e9fe am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
* commit '8934e67051a7c2598ad94699037701c4c6bf83ca':
  Limit item count in QS detail
 2014-12-12 15:39:27 +00:00
Jorim Jaggi
19131b49f6 am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
* commit 'd3cccec08361effa5d0f47143ea8c521f49bad79':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:39:22 +00:00
Jorim Jaggi
569a113a19 am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
* commit 'ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:39:16 +00:00
Jorim Jaggi
8934e67051 Merge "Limit item count in QS detail" into lmp-mr1-dev 2014-12-12 15:32:57 +00:00
Jorim Jaggi
d3cccec083 Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:30 +00:00
Jorim Jaggi
ab60f2855b Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:18 +00:00
Jason Monk
d8e4bf4e43 Fix tests after inet changes in NetworkController 
Bug: 17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
 2014-12-12 10:26:43 -05:00
John Reck
a7c24b439e Fix build breakage 
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
 2014-12-12 07:22:19 -08:00
Esteban Talavera
6de72663fa Take into account other profiles when deciding whether to show ResolverActivity 
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.

BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
 2014-12-12 14:34:29 +00:00
Olawale Ogunwale
7fc885b0bf am 0e954dcc: am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 
* commit '0e954dccabc4b3d7247c6469864bf20d059e02b9':
  [ActivityManager] Fix NPE when start activity
 2014-12-12 14:04:24 +00:00
Olawale Ogunwale
0e954dccab am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
  [ActivityManager] Fix NPE when start activity
 2014-12-12 13:57:06 +00:00
Christopher Tate
effe70d450 am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d 
automerge: 0703c09

* commit '0703c09b9a0568b4c96316c206f9a5e8675cd951':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:54:33 +00:00
Olawale Ogunwale
bfb30244fb Merge "[ActivityManager] Fix NPE when start activity" 2014-12-12 13:49:51 +00:00
Christopher Tate
0703c09b9a am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d 
* commit 'eb9d4fdf4623fe23f0f224b5ae2d68cd4c714c7f':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:33:53 +00:00
Christopher Tate
eb9d4fdf46 am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d 
* commit 'a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:24:06 +00:00
Christopher Tate
a91ef1ec04 Properly recognize repeating wakeup alarms 
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:14:30 +00:00
Wink Saville
05e2ada58a am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:38 +00:00
Wink Saville
6cc44cce0e am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:40 +00:00
Iliyan Malchev
1656870585 am 45838de9: fix Uss accounting in getPssPid() 
automerge: 72468d2

* commit '72468d2d146f737b2b5d0223687b8fbc52723c76':
  fix Uss accounting in getPssPid()
 2014-12-12 04:30:52 +00:00
Jim Miller
69935f9a05 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
automerge: 0ca6b7f

* commit '0ca6b7f98085c079ccfb4b799fba5f570380a827':
  Attempt to fix keyguard missing bug
 2014-12-12 04:29:11 +00:00
John Reck
ec9b598c7b am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
automerge: b21a7ad

* commit 'b21a7ad02e43900ea5480e796cb1518bd5829e3f':
  Force-flush state sync on texid change
 2014-12-12 04:27:14 +00:00
Chris Craik
3f454e7d1c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
automerge: 00905a9

* commit '00905a984c07ffc9960ce83548631c59aae37ec6':
  Correct layer size formatting in trace
 2014-12-12 04:25:43 +00:00
Craig Mautner
2d6627a9f2 am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
 2014-12-12 04:24:34 +00:00
David Friedman
99385aa992 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
  Adds link to related video.
 2014-12-12 04:23:07 +00:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Alan Viverette
3ead4127ae am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
  Improve time picker accessibility
 2014-12-12 04:21:42 +00:00
Winson Chung
51fafe26a8 am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 
automerge: 8c8c99c

* commit '8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:20:19 +00:00
Joe Fernandez
6ea9db4b64 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
  docs: studio basics haxm updates
 2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93 am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
automerge: 575c8c9

* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
  docs: Fixes to watch faces docs.
 2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66 am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
automerge: 51f1c26

* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
  docs: studio bundle update
 2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21
 2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
  docs: sdk tools 24.0.1 revisions
 2014-12-12 04:13:20 +00:00