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

156755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yigit Boyar
4a40485725 am de86d9c2: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit 'de86d9c24f89642289012d865cdd604bbe056bda':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 03:52:57 +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
Michael Wright
8ebac23196 Respect intent-filter priority for system keyboard layouts. 
Bug: 17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
 2014-09-18 18:48:19 -07:00
w19976
6f006cce75 Handling service number convert while roaming. 
When roaming, change *611 to +19085594899.

Bug: 17202092
Change-Id: Ibd130911131e9ed245cca7130853176f831e361e
 2014-09-19 01:36:15 +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
Adam Powell
594558d7e9 Make panel menu windows respect elevation 
Bug 17430536

Change-Id: I962dfa10d3cb4f735dcaa68f17e7ff278d1580a2
 2014-09-18 18:22:29 -07: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
530fc3c2ce am 043809de: am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit '043809de97782650de6fe10346901034920ada93':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 00:16:10 +00:00
Winson Chung
1d3051a960 am cc819d8c: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit 'cc819d8c305fdce030cda6a7c093a439d5a64ae2':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 00:16:05 +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
a1aece6711 am 97f81c16: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '97f81c16ca1b2dcbf14ac1971ef364ca1bad6080':
  Don't count finishing activities as effective activities.
 2014-09-18 23:28:50 +00: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
George Mount
b73087455b am 41fd9f8a: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '41fd9f8af6b93daec54dc3945f7c2809f67a5c79':
  Fix broken logic in isValidTarget
 2014-09-18 23:10:50 +00:00
Winson Chung
a3d53fcfc9 am e2ed547f: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit 'e2ed547f4cb9a3067cea3e23b9d9c3fe363d4448':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-18 23:10:39 +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
Alan Viverette
0a0072b2ab am 67f0c2d8: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit '67f0c2d847baa6f0b20013d420d365b2c0caf254':
  Fix the underlined spinner asset to match text field
 2014-09-18 22:51:56 +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
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions 
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
 2014-09-18 15:14:26 -07:00
Adrian Roos
54d5195236 am b74c9043: am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev 
* commit 'b74c904364339f61eeee1a6b903e2cffa39dc715':
  Additional check to determine insets for recents animation
 2014-09-18 21:52:40 +00:00
Adrian Roos
50c076af5f am 717e144d: am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev 
* commit '717e144df74b6134fa3e1e131936a911f7ef451d':
  Disable QS user switcher when not supported
 2014-09-18 21:52:35 +00:00
Craig Mautner
bf11570614 am d28e4019: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit 'd28e40196d3bd5b697be4ed937978ce55f775772':
  Remove activity icon bitmaps from system process.
 2014-09-18 21:52:30 +00: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
Adrian Roos
560d261c36 am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev 
* commit '30defcc4e1cfdb9792840577cfc7fa3708d2a521':
  Disable QS user switcher when not supported
 2014-09-18 21:36:08 +00:00
Craig Mautner
fd9417d69e am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '43ce550039eb45dd0b6ff6d4abd7833cba2d06e0':
  Remove activity icon bitmaps from system process.
 2014-09-18 21:36:02 +00:00