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

153790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
edbffaadf9 am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
  Fix exception when fragment container has no View.
 2014-09-19 15:54:11 +00:00
George Mount
5abffd26b3 am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
  Fix NPE when shared element listener is null.
 2014-09-19 15:54:06 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Chris Craik
7f9b493a7f am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '969b5ff492aae38fb89c98b2411e217e9b11638e':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:38:25 +00:00
Chris Craik
651486d018 Merge "Fix garbage showing up beneath dialogs" into lmp-dev 2014-09-19 15:31:18 +00:00
Jessica Hummel
7b6e86f6bc am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'a38239d39e2f71e54352001980863ca81cbbac41':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:31:43 +00:00
Jessica Hummel
ccfa1a9799 Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 2014-09-19 14:22:43 +00:00
Paul Jensen
713a6ab34a am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '2620499ad2dcb2c0891c85ab32f86a5c7823d336':
  Fix to make repeated lingerings work.
 2014-09-19 12:10:42 +00:00
Paul Jensen
7bfa35742a Merge "Fix to make repeated lingerings work." into lmp-dev 2014-09-19 11:59:50 +00:00
Jessica Hummel
dd31a10c7f bug fix: Allow enableSystemApps to be called by profile and device owner. 
We had an additional check for managed profile in there, so it wasn't working for device owners. Also needed to look at uninstalled packages.

Change-Id: I4813f23b00d7905e92ade582ce082a6f295a322d
Bug: 17384318
 2014-09-19 09:56:19 +00:00
Kenny Guy
7fd10053bb am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
  Remove suggested key names as its confusing.
 2014-09-19 09:55:33 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Yohei Yukawa
3ddb821311 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 05:28:56 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash 
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
 2014-09-19 05:02:59 +00:00
Dan Sandler
a7b1259754 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 03:45:03 +00:00
Dan Sandler
20d01ad8a1 Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03 Fix LayoutInflater copy constructor logic. 
Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
 2014-09-18 22:23:32 -04:00
Dianne Hackborn
01793ca79c am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 02:10:14 +00:00
Mike Lockwood
652bf9c9d8 am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 
* commit '52e5e3599151c01a8107f08238ce1c59d8ec2fe1':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 02:10:08 +00:00
Dianne Hackborn
aad42d1204 Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 2014-09-19 02:01:58 +00:00
Dianne Hackborn
ace27915d2 Fix issue #17564607: Apps in the managed profile can send any intent... 
...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
 2014-09-18 19:01:01 -07:00
Mike Lockwood
51938c205f Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 2014-09-19 02:00:26 +00:00
Alan Viverette
b4a7bcc52e am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit 'd03ba30bac5d250cdc7d43102dd06af2f114d7a8':
  Always apply window insets to action modes
 2014-09-19 01:29:15 +00:00
Amit Mahajan
700dee04c7 am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '010bdd3c2f68e01ba244baf036b2e952afb99bbf':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 01:29:11 +00:00
Alan Viverette
3540c462d9 Merge "Always apply window insets to action modes" into lmp-dev 2014-09-19 01:16:22 +00:00
Yigit Boyar
22f0f4a956 am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 01:12:21 +00:00
Amit Mahajan
0297ad884d Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 2014-09-19 01:07:23 +00:00
Yigit Boyar
91803838c8 Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 2014-09-19 00:59:53 +00:00
giseok.seo
b907867f68 Fix voice mail number to modify when insert H3G Denmark sim card. 
1.H3G Denmark SIM Card is set to "not available" in UST(Usim service Table) to
  EF_MBDN file of SIM CARD.
  so do not edit voicemail number.

2.AOSP default voicemail number is empty.
  so if inserted H3G Denmark SIM card, User cann't edit voicemail number and
  do not use voicemail service.

Bug: 14093735
Change-Id: I2469ef8e8bda376adcdc9549bf4227bc4c0ddb2e
 2014-09-19 00:59:12 +00:00
Winson Chung
cbbaf10d44 am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit '767df884f10be4ad3b7a3e5ae8b97e4ef817e792':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 00:06:20 +00:00
Winson Chung
c751284910 am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '5c744b1b01156c37f894619fbe70741435d7ed53':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 00:06:16 +00:00
Winson Chung
56eef1c5c6 Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 2014-09-18 23:50:38 +00:00
Winson Chung
f7dd908171 Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 2014-09-18 23:50:32 +00:00
Yigit Boyar
40c6c555e9 Fix scroll position calculation when clipToPadding is false 
Bug: 17568582
Change-Id: I904450d62c93105db5c61a071c7816278bb441be
 2014-09-18 16:31:52 -07:00
Craig Mautner
2fb474483b am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
  Don't count finishing activities as effective activities.
 2014-09-18 23:19:58 +00:00
Craig Mautner
6920feedb5 Merge "Don't count finishing activities as effective activities." into lmp-dev 2014-09-18 23:08:25 +00:00
Chris Craik
284b243584 Fix garbage showing up beneath dialogs 
bug:17463894

Fixes the setViewport method to immediately affect the return values
of getViewportWidth/Height methods.

Also works around tiling extension issues observed on first frame
after window resize by disabling tiling for that frame.

Change-Id: Ie172d572d20d74a1be9cc58ad389af2cffa0e4b6
 2014-09-18 16:05:35 -07:00
George Mount
ec0ab42a84 am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
  Fix broken logic in isValidTarget
 2014-09-18 23:01:05 +00:00
Winson Chung
1bd765e7b1 am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit '537dde12838358aed704ae1afe0d66e4cb8cb045':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-18 23:00:55 +00:00
George Mount
7343ba2f80 Merge "Fix broken logic in isValidTarget" into lmp-dev 2014-09-18 22:51:23 +00:00
Alan Viverette
24b5f2cf95 Always apply window insets to action modes 
BUG: 17567245
Change-Id: I3c37d228e3a9d3060a4fd1a86abf2ffbf91802e8
 2014-09-18 15:46:42 -07:00
Winson Chung
3133616d92 Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 2014-09-18 22:45:26 +00:00
Alan Viverette
152af6d630 am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit 'ec7467b019dd2c78e270e87cc76248680677cc4f':
  Fix the underlined spinner asset to match text field
 2014-09-18 22:41:11 +00:00
Craig Mautner
4767f4b3a9 Don't count finishing activities as effective activities. 
They were being counted as effectiveRoot even though they were
finishing.

Fixes bug 17550936.

Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
 2014-09-18 22:40:12 +00:00
George Mount
1732f52895 Fix NPE when shared element listener is null. 
Bug 17544867

The shared element listener will be null after the transitions
have been canceled.

Change-Id: Id1182639b44ece27fc267702623641438f9974d5
 2014-09-18 15:32:47 -07:00
Alan Viverette
28c5d8e862 Merge "Fix the underlined spinner asset to match text field" into lmp-dev 2014-09-18 22:26:03 +00:00
George Mount
0b26e4d58a Fix exception when fragment container has no View. 
Bug 17535259

Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
 2014-09-18 15:24:48 -07:00
Adrian Roos
c394dc4140 am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev 
* commit '5e5c78a6a6edeab3bb06a7dafec479c1d92f040e':
  Additional check to determine insets for recents animation
 2014-09-18 21:36:13 +00:00