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

178103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Talavera
c872c7f7d5 am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c 
automerge: 0b7b87a

* commit '0b7b87a4c8fec008ca5bdefcd03d8d0ea70f61a0':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:19:42 +00: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
Jorim Jaggi
b16be0706b am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
automerge: 0b12c6c

* commit '0b12c6cd890272fe7db6c2c3065c7279cb23195b':
  Limit item count in QS detail
 2014-12-12 15:51:34 +00:00
Jorim Jaggi
be7b1d2690 am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
automerge: 4ec83a7

* commit '4ec83a764d159c19005eefc5457a26dfc134245f':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:50:16 +00:00
Jorim Jaggi
b5dc06fcb3 am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
automerge: 8514333

* commit '8514333283c591f4badf823052bc2c1bd1972856':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:48:55 +00: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
John Reck
e9034ee3c6 Fix build breakage 
automerge: a7c24b4

* commit 'a7c24b439e54706566a6eba673d49152b18c654f':
  Fix build breakage
 2014-12-12 15:28:39 +00:00
John Reck
a7c24b439e Fix build breakage 
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
 2014-12-12 07:22:19 -08:00
Narayan Kamath
93bb5419aa Merge "Remove references to apache-http from various documents." 2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents. 
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
 2014-12-12 14:55:18 +00: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
eb8320a2d3 am 0e954dcc: am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 
automerge: 7fc885b

* commit '7fc885b0bfb8a799825531932567a1d472a55087':
  [ActivityManager] Fix NPE when start activity
 2014-12-12 14:06:27 +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
5ae6848075 am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d automerge: 0703c09 
automerge: effe70d

* commit 'effe70d450be1ce5802cf41f487bbe2142797b4b':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:57:01 +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
6cc211669c am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc 
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:45:29 +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
C. Sean Young
28ca1f628c Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-12-12 04:35:32 +00:00
Iliyan Malchev
6f8b9bc9c1 am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2 
* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
  fix Uss accounting in getPssPid()
 2014-12-12 04:35:05 +00:00
Jim Miller
0e0f30eda0 am 69935f9a: am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f 
* commit '69935f9a053a14da8677b5957bf72ad1746ebad8':
  Attempt to fix keyguard missing bug
 2014-12-12 04:35:00 +00:00
John Reck
30839ce439 am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad 
* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
  Force-flush state sync on texid change
 2014-12-12 04:34:55 +00:00
John Reck
d4d19d3714 am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad 
automerge: ec9b598

* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
  Force-flush state sync on texid change
 2014-12-12 04:33:59 +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
Chris Craik
a1c3fdfbc7 am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev automerge: 00905a9 
* commit '3f454e7d1cf7103e312f67f745f01f00fa49df13':
  Correct layer size formatting in trace
 2014-12-12 04:30:44 +00:00
Craig Mautner
10c9c66815 am 2d6627a9: am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev automerge: 922f8e2 
* commit '2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893':
  Don't apply animations to windows that are showing
 2014-12-12 04:30:39 +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
David Friedman
2b7b23e9b4 am 99385aa9: am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs automerge: e90a170 
* commit '99385aa9928b1e860b0baefa73374018809c94ad':
  Adds link to related video.
 2014-12-12 04:26:16 +00:00
Alan Viverette
040b761af9 am 3ead4127: am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev automerge: 4b7f724 
* commit '3ead4127ae493508d064e106ec12f299e7116e8a':
  Improve time picker accessibility
 2014-12-12 04:26:12 +00:00
Winson Chung
d64e38965f am 51fafe26: am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev automerge: 8c8c99c 
* commit '51fafe26a8354404ce6ec94b9c6c2f20ede0d8a9':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:26:06 +00:00
Joe Fernandez
80cfbedbfd am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256 
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
  docs: studio basics haxm updates
 2014-12-12 04:25:59 +00:00
Ricardo Cervera
dd4b92b3fa am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9 
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
  docs: Fixes to watch faces docs.
 2014-12-12 04:25:54 +00:00
Rich Slogar
bde459f33e am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs automerge: 51f1c26 
* commit 'cc46ad8d66d71867ff59bcd73b8e0861ef1744c5':
  docs: studio bundle update
 2014-12-12 04:25:49 +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