Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,369 Commits 3 Branches 0 Tags
f4a4a4c8443c857005aa4c3cb367ffd0cc5f44be
Commit Graph

4696 Commits

Author SHA1 Message Date
Adam Powell
f4a4a4c844 am bf7cccdc: am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'bf7cccdca1dfe43a9e1956c707615dad2271e6fd':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:48:26 +00:00
Adam Powell
bf7cccdca1 am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'a5e4db2e9025254b80f6c0c380d355e5e0f8234a':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:31:37 +00:00
Adam Powell
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
Adam Powell
c412be6824 Fix ChooserActivity check for still-alive ChooserTargets 
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.

Bug 21953672

Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
 2015-06-24 13:54:10 -07:00
Makoto Onuki
2b40e7076d am 9e2d1ed8: am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit '9e2d1ed898b8e4a4971ddb511e221e3406bf797a':
  Actually wait for installd
 2015-06-24 20:02:07 +00:00
Makoto Onuki
9e2d1ed898 am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit 'b96bc804169e13701fa249e0a3b3c08d3f2e9808':
  Actually wait for installd
 2015-06-24 19:48:19 +00:00
Makoto Onuki
0633ae7481 Merge "Actually wait for installd" into mnc-dev 2015-06-24 19:25:28 +00:00
Adam Lesinski
53b5f3e68d am fe91754e: am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit 'fe91754edd4b899cf238aae11fb186647fdd4ea2':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:22:52 +00:00
Adam Lesinski
fe91754edd am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit '098204fca02c2f55ae374915f8bca48701601a29':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:10:58 +00:00
Adam Lesinski
67f170993f Merge "Fix unit issue in Slog.wtf output" into mnc-dev 2015-06-24 18:45:54 +00:00
Adam Lesinski
7b3c7529c7 Fix unit issue in Slog.wtf output 
Bug:22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
 2015-06-24 11:42:49 -07:00
Makoto Onuki
c8a2cfed01 Actually wait for installd 
Bug 19337445

Change-Id: I70bdaa0ac3695ac9d03ba34fe9d35fe775a5300d
 2015-06-24 09:52:58 -07:00
Doris Liu
fd17d70100 am 99a7abb1: am 5d0dedd1: am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev 
* commit '99a7abb1c3843b453883d52494952ce74799b4ac':
  Add enter/exit animation for window provided CAB
 2015-06-23 23:59:47 +00:00
Doris Liu
99a7abb1c3 am 5d0dedd1: am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev 
* commit '5d0dedd1c3cddb39140c1136fce5c9ec78bed1a1':
  Add enter/exit animation for window provided CAB
 2015-06-23 23:46:15 +00:00
Doris Liu
0ab731340b Merge "Add enter/exit animation for window provided CAB" into mnc-dev 2015-06-23 23:20:02 +00:00
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB 
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
 2015-06-23 16:11:07 -07:00
Jason Monk
7b9a1b45b6 am fd183561: am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit 'fd183561e0f5d6fa2df8d13eda34cfc11f931ae3':
  Add metrics to brightness slider
 2015-06-23 21:31:16 +00:00
Jason Monk
fd183561e0 am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit '78b964c26ca3e5b1601773a762c8c6989069a8cf':
  Add metrics to brightness slider
 2015-06-23 21:07:14 +00:00
Jason Monk
97b87a9929 Add metrics to brightness slider 
Had to add a way for BrightnessController to know when its the end
of a touch, so that we don't spam the event logs with intermediate
values.

Added visibility to BrightnessDialog as this is what settings
launches.

Bug: 21528168
Change-Id: Ie214b4ddb0c9f9bbe8c4f182f9c59f229963ebc7
 2015-06-23 15:54:13 -04:00
Chris Wren
960bf082a4 am 8471e833: am 2ebdeeca: am ca7febf4: Merge "add rank to notification visibility log" into mnc-dev 
* commit '8471e833f61cfc9d373b957d97a9eeec2b779e78':
  add rank to notification visibility log
 2015-06-23 13:20:27 +00:00
Chris Wren
8471e833f6 am 2ebdeeca: am ca7febf4: Merge "add rank to notification visibility log" into mnc-dev 
* commit '2ebdeeca242212707eb4a691ca9d18a0fa60fec6':
  add rank to notification visibility log
 2015-06-23 13:05:43 +00:00
Chris Wren
ca7febf4b8 Merge "add rank to notification visibility log" into mnc-dev 2015-06-23 12:43:09 +00:00
Adam Powell
8baaf220e4 am 04333109: am f66c97b5: am 9f49dcda: Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 
* commit '04333109ce6ea332a9136fbdd69ca83b8f8e56e5':
  Add voice interaction support to ResolverActivity/ChooserActivity
 2015-06-23 05:38:28 +00:00
Christopher Tate
af6052f546 am 309499e0: am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit '309499e0cd138d30d340460d6c99ecb8292717d1':
  Back up / restore default app and intent filter verification state
 2015-06-23 05:38:23 +00:00
Adam Powell
04333109ce am f66c97b5: am 9f49dcda: Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 
* commit 'f66c97b5cc88181a2979734a56746aa62a84fdb6':
  Add voice interaction support to ResolverActivity/ChooserActivity
 2015-06-23 03:20:40 +00:00
Christopher Tate
309499e0cd am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit 'a116123fb1125737e0b4bceba418e822397921b0':
  Back up / restore default app and intent filter verification state
 2015-06-23 03:20:35 +00:00
Adam Powell
9f49dcda24 Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 2015-06-23 01:18:28 +00:00
Adam Powell
4c470d641c Add voice interaction support to ResolverActivity/ChooserActivity 
All options are sent to the VoiceInteractor once ChooserTargetServices
have reported in. We don't perform explicit progressive refinement or
filtering, but an explicit option picked will be invoked.

Also fix a lingering bug around being able to nested-fling the
resolver drawer closed.

Bug 21516866

Change-Id: I6b141f5fa87d74dccec9dcb88110630696e9c38e
 2015-06-22 18:11:10 -07:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state 
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
 2015-06-22 17:20:26 -07:00
Chris Wren
d1dbc92d67 add rank to notification visibility log 
Only sysui knows the true rank, since it can (and does) reorder things.
The visibility logs are down in the service because it has other bits of data.

Bug: 21395744
Change-Id: Ibf9479dc2306fb27fb5df3bf21e161478d36d587
 2015-06-22 16:30:17 -04:00
Jason Monk
19998a847c am 32621bea: am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit '32621bea2e4ed27b4737602f06620ec8efbcb084':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:27:35 +00:00
Jason Monk
32621bea2e am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit 'bfaff994af8053f562046c4e07e5c88d0538d250':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:15:08 +00:00
Jeff Brown
e689cca19c am 3a9f86a2: am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '3a9f86a2df00973b10754fa4011b8e8c32928685':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 20:01:41 +00:00
Jason Monk
6283a12579 Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 2015-06-22 19:53:01 +00:00
Jeff Brown
3a9f86a2df am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '6903187a2f3b54ce40239071d6f3a8bafd396ea9':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 19:51:11 +00:00
Jeff Brown
d63c721e71 Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 2015-06-22 19:29:32 +00:00
Jason Monk
5658328d8d ButtonBarLayout: Let allowStacking to be set through code 
Bug: 21997648
Change-Id: I7ac38d39b4aa282f59b7d13f21d06c7c465ebb20
 2015-06-22 14:47:00 -04:00
Yohei Yukawa
c0f1ad2c3e am b00c10eb: am 2e24241e: am 648abe15: Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 
* commit 'b00c10eb29e8db7272c1077649a72389dfed89eb':
  Set DISABLED_UNTIL_USED for the correct user in IMMS.
 2015-06-22 18:28:27 +00:00
Yohei Yukawa
b00c10eb29 am 2e24241e: am 648abe15: Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 
* commit '2e24241ead47aec74df5cbb3ddc5b0d0ed797c0f':
  Set DISABLED_UNTIL_USED for the correct user in IMMS.
 2015-06-22 18:19:58 +00:00
Yohei Yukawa
648abe1565 Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 2015-06-22 17:59:42 +00:00
Yohei Yukawa
094c71fd5c Set DISABLED_UNTIL_USED for the correct user in IMMS. 
This CL makes If8ff1b2b95c36d33148def2ab87bd006aa520cc0
multi-user aware.

It turns out that DISABLED_UNTIL_USED has not been correctly
set to IMEs seen from secondary users because we have used
  IMMS#mContext.getPackageManager(),
which always returns the PackageManager with the primary
users' context, when specifying
COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED.

We should use IPackageManager instead as we have already done
in many places of IMMS since Ib23849d352db33f0747aa9d5a178f00.

Bug: 8148605
Bug: 8365223
Bug: 21953608
Change-Id: I4b9d6510bf965204bb1f68c8b527d1a4df23fac4
 2015-06-20 00:41:31 -07:00
Adam Powell
40a7c2d85e am af49d7db: am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 
* commit 'af49d7db968d188ff132ff1cf8bf59ba09602819':
  Fix regression in viewing app info from ChooserActivity targets
 2015-06-20 05:43:33 +00:00
Adam Powell
af49d7db96 am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 
* commit '96b879c791551b79b6acc703e2a9b80d453bea49':
  Fix regression in viewing app info from ChooserActivity targets
 2015-06-20 01:07:57 +00:00
Adam Powell
b3add4dae2 Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 2015-06-20 00:46:04 +00:00
Jeff Brown
6a8bd7bc13 Repurpose doze wake lock stats for draw wake lock instead. 
The doze wake lock is an internal implementation detail with no
power impact.  However the draw wake lock is much more interesting
to track because it's essentially like a special purpose partial
wake lock which may be acquired while dozing.

Bug: 21949905
Change-Id: Iedd5f366eb010a47a9691374c5cd3d85ea68173d
 2015-06-19 17:27:21 -07:00
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
 2015-06-19 21:48:37 +00:00
Adam Lesinski
52e7f8c76f am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit 'bd9b25efb8cdaa4772f730259418d66ba58beb40':
  BatteryStats: Record doze wake locks
 2015-06-19 21:39:57 +00:00
Adam Lesinski
9425fe21c9 BatteryStats: Record doze wake locks 
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.

Bug:21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
 2015-06-19 14:12:01 -07:00
Adrian Roos
2e0c409806 am f65f06fe: am cefeeb7c: am 4f43dc04: Assist disclosure 
* commit 'f65f06fe914253b046bea085a34bed02e54e19a8':
  Assist disclosure
 2015-06-19 20:43:31 +00:00