Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,307 Commits 3 Branches 0 Tags
bbb281ca2f8bc6bc69bd5895eede2a9bc203c98d
Commit Graph

53685 Commits

Author SHA1 Message Date
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
Nicolas Prevot
6904260904 am 2e70cf73: am 3ab6f9e6: Merge "Allow cross-profile app linking from work to personal." into mnc-dev 
* commit '2e70cf73b424440b163ce0ee2de1cb0b875cd913':
  Allow cross-profile app linking from work to personal.
 2015-06-23 02:53:41 +00:00
Alan Viverette
7acc4a60ca am 84340ab0: am ed0e11a9: Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 
* commit '84340ab08bd61a48072a63f410631256f823945d':
  Ensure child is attached before performing measure/layout in Spinner
 2015-06-23 02:53:25 +00:00
Alan Viverette
42f9a5a6b7 am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 
* commit '32bc28f4c33e0dc5c33c4bae6ff084b344f90324':
  Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
 2015-06-23 02:53:11 +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
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Alan Viverette
ed0e11a93a Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 2015-06-22 23:07:33 +00:00
Alan Viverette
aeaa396cae Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 2015-06-22 22:38:09 +00:00
Alan Viverette
9554f9fc9e Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" 
Turns out this was actually fine.

This reverts commit 9355533bf6.

Change-Id: I30c66fd423b569958244685098511d4ba08fbf37
 2015-06-22 22:37:58 +00:00
Alan Viverette
25c6cd61d4 Ensure child is attached before performing measure/layout in Spinner 
Bug: 21614663
Change-Id: Id84a720fac7050d312eb2eb6f12621217c4f8d0f
 2015-06-22 15:25:55 -07:00
Matthew Williams
9ac21d4cf8 am 1a9245d5: am 8b1db074: Merge "Cancel Syncs that aren\'t making progress." into mnc-dev 
* commit '1a9245d568640301483bf10618081ddf42b9c0cc':
  Cancel Syncs that aren't making progress.
 2015-06-22 22:09:14 +00:00
Matthew Williams
8b1db0746f Merge "Cancel Syncs that aren't making progress." into mnc-dev 2015-06-22 21:41:49 +00:00
Nicolas Prevot
9edbda18df Allow cross-profile app linking from work to personal. 
If the profile owner sets ALLOW_PARENT_APP_LINKING:

ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.

BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
 2015-06-22 14:39:44 -07:00
Matthew Williams
1967c8ddd5 Cancel Syncs that aren't making progress. 
BUG: 18266674
1) If a sync has up/downloaded less than 10bytes in 60 seconds it is
considered to be making no progress and is summarily cancelled.

2) Apply a 30min hard time-out to initialization syncs.

Note that there is little proof that cancelling a sync has an
impact. All it results in is a Thread.interrupt on the sync
thread, which the adapter must itself implement. To this effect
this CL also updates the javadoc to make this clearer, and adds
some (unimplemented) threats about killing the hosting process.

Change-Id: I83c447648152ccbf76bb1fbd7e9216e01a37952f
 2015-06-22 14:36:36 -07:00
Jeff Sharkey
4edfd64bc1 am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '421daf8590cdbce7e41b7492608a985fe13c2033':
  Forget private partition keys.
 2015-06-22 21:33:44 +00:00
Alan Viverette
7f6da50d43 am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '823f51f3a2dcba1a0d509eab66b7ba330fddecea':
  Match default color packing for captioning settings
 2015-06-22 21:13:38 +00:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys. 
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
 2015-06-22 14:07:10 -07:00
Alan Viverette
696d214946 Merge "Match default color packing for captioning settings" into mnc-dev 2015-06-22 20:55:12 +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
Alan Viverette
7e4019b741 Match default color packing for captioning settings 
"Default" packed colors are indicated by zero alpha and non-zero
red/blue. The cached alpha value used by Settings is stored in green.

Bug: 21602597
Change-Id: I1465210fda854ee979aa3a6b398ae60b41d10711
 2015-06-22 13:06:24 -07: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
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
Selim Gurun
e0d181e331 am ac7b7015: am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'ac7b7015e062dc410f59ed5e6bce6c38fcaeeb95':
  Clarify handling client certificates
 2015-06-22 18:19:53 +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
Selim Gurun
7c78112476 Merge "Clarify handling client certificates" into mnc-dev 2015-06-22 17:55:29 +00:00
Kenny Guy
389146190e am 32327b72: am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '32327b7256cf4ab321ee9906837fb25dd1d39ab4':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 17:08:16 +00:00
Julia Reynolds
8ce3cd3562 am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '6286a6a85bc7a8d959d640191b098c723a427bcd':
  Hide device initializer methods/fields.
 2015-06-22 17:08:12 +00:00
Selim Gurun
a679ac59a1 Clarify handling client certificates 
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ida78bd89aa8867c99b4b9e4433e342767e9bac0d
 2015-06-22 10:04:01 -07:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Derek Sollenberger
87c5a5088e am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit 'f1c031d512fd8596e40b8a5832441869ab831e48':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 15:59:37 +00:00
Derek Sollenberger
b2aea9dcbd Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 2015-06-22 15:38:11 +00:00
Andrei Stingaceanu
4ca5725f95 am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode 
* commit '76d2204d2b4d42f11222eb68f0058b6c3bae6e10':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:24:22 +00:00
Derek Sollenberger
e109940d81 Enable Picture w/ HW Accelerated Canvas. 
Bug: 20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
 2015-06-22 13:18:29 +00:00
Andrei Stingaceanu
b1891b3fc9 Fix selection by double tap in Extracted mode 
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.

Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
 2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
86578bee88 am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '01acdd9feaa1dfe32863b667dd9300240bbc3db7':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:46:30 +00:00
Vladislav Kaznacheev
8228e4247c Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 2015-06-22 09:30:20 +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
Bart Sears
48f94aac65 am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev 
* commit '1b96f013a02409195278be23a19d57289f26c7fe':
  Revert "Clarify handling client certificates"
 2015-06-20 05:46:13 +00:00
Bart Sears
950aa197d4 Merge "Revert "Clarify handling client certificates"" into mnc-dev 2015-06-20 05:22:39 +00:00
Bart Sears
4ead33300f Revert "Clarify handling client certificates" 
CL broke the javadoc build.

This reverts commit 36cf701e1e.

Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
 2015-06-20 05:21:38 +00:00
Paul Jensen
2e2cc43e33 am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 
* commit 'ae6d0354677221fb988a76f2f26c064c167283da':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
 2015-06-20 01:33:24 +00:00