Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,830 Commits 3 Branches 0 Tags
edfda6a1c8eed3be77b506ca84f045ae22ea465c
Commit Graph

4813 Commits

Author SHA1 Message Date
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
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
Adrian Roos
f65f06fe91 am cefeeb7c: am 4f43dc04: Assist disclosure 
* commit 'cefeeb7c13653f5ba43b61205b22c8f70c843e71':
  Assist disclosure
 2015-06-19 20:29:40 +00:00
Adam Powell
98b7f89430 Fix regression in viewing app info from ChooserActivity targets 
Also add metrics logging to ChooserActivity

Bug 21953567
Bug 21953720

Change-Id: I6bba2cfe9b9e551e6fe6f2d4f92fc040eebf355c
 2015-06-19 12:38:45 -07:00
Abodunrinwa Toki
f2c89ee507 am 1767b1fe: am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev 
* commit '1767b1fed44dd524f999b0b18bddbf889550a8ab':
  Better FloatingToolbar positioning.
 2015-06-19 18:56:28 +00:00
Abodunrinwa Toki
1767b1fed4 am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev 
* commit 'e497455f637540507a923954cec5bbfad1213a8e':
  Better FloatingToolbar positioning.
 2015-06-19 18:41:34 +00:00
Adrian Roos
4f43dc042b Assist disclosure 
Add an animation that discloses delivery
of contextual data to the assist component.

Also fixes a bug where contextual data was
delivered to legacy assist activities even
though the user explicitly disabled context.

Bug: 21568059
Change-Id: I27dfaa36e2f677b0d73acfa4730f0f4ea3486919
 2015-06-19 11:33:05 -07:00
Abodunrinwa Toki
6983752a10 Merge "Better FloatingToolbar positioning." into mnc-dev 2015-06-19 18:28:20 +00:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Abodunrinwa Toki
9ae95dff1d Better FloatingToolbar positioning. 
-The toolbar is now rendered over the IME.
-The toolbar respects the presence of the IME and tries as much as
 possible not to obstruct it.
-The toolbar may obstruct the IME if there is limited space and we
 can't find a position that won't obstruct the IME.

*A side effect of the toolbar over the IME is that TextView handles
 will also always be rendered over the IME where necessary. This was
 the previous behavior before the regression.

Bug: 17510971
Change-Id: I26a49565bf025d7c007ba6bb80468c4988fcc051
 2015-06-19 19:15:50 +01:00
Abodunrinwa Toki
32e4e77b8d am 54103b79: am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev 
* commit '54103b7968f0817c77a8d7a054adda1673d4b044':
  Fix FloatingToolbar flickers.
 2015-06-19 16:26:05 +00:00
Andrei Stingaceanu
6031441a13 am 2bf8d561: am b91c7a76: am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev 
* commit '2bf8d56122fd8dbfb73f20bd9fa7ec90896a4515':
  Cannot select text after rotation in extract mode
 2015-06-19 16:25:54 +00:00
Sudheer Shanka
eb6195c7a2 am eaa25779: am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 
* commit 'eaa2577953eeff27754f6707ac0efa11b77ed947':
  Use the intent filter icon in ResolveInfo for managed profile.
 2015-06-19 16:25:48 +00:00
Abodunrinwa Toki
54103b7968 am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev 
* commit '2508c6dfafaa71c190b4d0a7346f6a579985bde7':
  Fix FloatingToolbar flickers.
 2015-06-19 16:14:54 +00:00
Andrei Stingaceanu
2bf8d56122 am b91c7a76: am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev 
* commit 'b91c7a76d525cec54df86fc3558a1c88532ee7a4':
  Cannot select text after rotation in extract mode
 2015-06-19 16:14:38 +00:00
Sudheer Shanka
eaa2577953 am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 
* commit 'a0fa30dc24cfc838deb8919cf6ff7bdea5736b57':
  Use the intent filter icon in ResolveInfo for managed profile.
 2015-06-19 16:14:33 +00:00
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Adam Lesinski
15cafc8d92 am 8542a49d: am 024d8e2f: am 8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev 
* commit '8542a49d06b6bfbe80190bc86c76269d4c085b17':
  BatteryStats: Update external stats individually.
 2015-06-19 14:18:23 +00:00
Dianne Hackborn
6c32b58bf1 am 50bf0203: am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 14:17:59 +00:00
Adam Lesinski
6c2a8e0da8 am 9f0179cc: am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit '9f0179cc5f6f74a6b9957f60526353898f02ac0b':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 14:17:52 +00:00
Alan Viverette
87fc22c976 am 7da029d5: am ed113f18: am b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev 
* commit '7da029d5d0631425f63ea944c52f58fbf2976475':
  Ensure ResolverDrawerLayout is visible to accessibility services
 2015-06-19 14:16:36 +00:00
Adam Lesinski
8542a49d06 am 024d8e2f: am 8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev 
* commit '024d8e2f49522c661e9fc0afdfa3bf435dc337d0':
  BatteryStats: Update external stats individually.
 2015-06-19 13:58:47 +00:00
Dianne Hackborn
50bf0203b9 am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 13:58:09 +00:00
Alan Viverette
7da029d5d0 am ed113f18: am b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev 
* commit 'ed113f1848191bf6baf63d00efe2620e7e7d1a35':
  Ensure ResolverDrawerLayout is visible to accessibility services
 2015-06-19 13:55:57 +00:00