Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,680 Commits 3 Branches 0 Tags
68247b03037df7782397750f2801b11cfb5f8d85
Commit Graph

41065 Commits

Author SHA1 Message Date
Ian Rogers
c058fbb5a0 am ad64befd: am 296a712e: Merge "Make a field final." 
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.
 2014-09-19 22:27:18 +00:00
Ian Rogers
ad64befd25 am 296a712e: Merge "Make a field final." 
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
  Make a field final.
 2014-09-19 22:14:33 +00:00
Svetoslav
dacb58d6f6 am 5b119d7d: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '5b119d7db1ccce7aef5230020ddc00fee858d573':
  Keep existing API behavior that regressed.
 2014-09-19 22:02:13 +00:00
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +00:00
George Mount
0ca952b197 am 9367ab11: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '9367ab119e73bbc8d1568b42818ccd248f56cc40':
  Target only shared elements with shared element Transition
 2014-09-19 21:24:05 +00:00
George Mount
615a2c1605 Merge "Target only shared elements with shared element Transition" into lmp-dev 2014-09-19 21:01:15 +00:00
Svetoslav
b624244325 Keep existing API behavior that regressed. 
If RemoteViews get a null package in the constructor we are
using the context in which they are applied to obtain resources
during inflation. In such a case if we call the getPackage()
method we were getting null, i.e. the package passed in the
contructor, but now we are returning the package if the app
that created the remote views.

bug:17513823
Change-Id: I0c4a8953c8320469a9160dbaae46ce31465b313b
 2014-09-19 13:59:10 -07:00
Adam Powell
dca6740355 am 8040e47d: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '8040e47d83e3fe2c1d28c2dcbfbd80fd5cc0b26f':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:53:01 +00:00
Adam Powell
17f48457d2 Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 2014-09-19 20:31:14 +00:00
Michael Wright
296519e8ca am c3c44743: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit 'c3c44743bca36ba72ccaa581eb3f15fff8b23a0a':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:20:01 +00:00
George Mount
2deeaa3314 Target only shared elements with shared element Transition 
Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
 2014-09-19 12:55:20 -07:00
Michael Wright
4bc92b064b Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 2014-09-19 19:52:54 +00:00
Adam Powell
c6c744da75 Add colorEdgeEffect to themes, default it to colorPrimary 
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
 2014-09-19 12:50:31 -07:00
Alan Viverette
7c7e3ba312 am c17a38b1: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit 'c17a38b12d936885a9867e92e40d6e740f2d98f4':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:36:07 +00:00
Paul Soulos
ba82711e96 am 18b86cc6: am b5586e00: Fixes typo in Intent documentation 
* commit '18b86cc685658142fd20e88baa52817100ea0daf':
  Fixes typo in Intent documentation
 2014-09-19 19:36:02 +00:00
Alan Viverette
840855c021 Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 2014-09-19 19:11:47 +00:00
Paul Soulos
628cb74d8a Fixes typo in Intent documentation 
bug: 17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
 2014-09-19 19:10:04 +00:00
Alan Viverette
bb696dcca9 Fix radial time picker inner circle (1-12) selections 
Result of a poorly collapsed set of if block conditionals.

BUG: 17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
 2014-09-19 10:20:45 -07:00
Amith Yamasani
bd59ae2597 am d2484f81: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'd2484f8198e11d20eca624b1192cb63d9b78d9ec':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:09:17 +00:00
George Mount
4e049e59f2 am 156e8dd2: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit '156e8dd238af85224df15a80bc43c47bdff3f2ba':
  Fix exception when fragment container has no View.
 2014-09-19 16:03:20 +00:00
George Mount
392251f06e am aeebb25c: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit 'aeebb25c9d29e1768effff0d90df4ec1426554f3':
  Fix NPE when shared element listener is null.
 2014-09-19 16:03:15 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +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
Kenny Guy
1167e5b85a am 2481b7f3: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '2481b7f34226e11754b933d4d93e101365e859cb':
  Remove suggested key names as its confusing.
 2014-09-19 10:06:34 +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
f4b5dae23a am e7f77f64: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit 'e7f77f641821b150173080d02336764e0e82629a':
  Speculative fix of IMMS crash
 2014-09-19 05:41:12 +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
529696d109 am 59fc5ab8: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '59fc5ab829f2357281bcc39ec88a3af34b3e0d29':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 04:24:33 +00:00
Dianne Hackborn
0b09f0fcb0 am 63cd1cec: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '63cd1cec2dd3a59c14d96394eba4891ccf00371d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 03:56:26 +00:00
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
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
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
Michael Wright
8ebac23196 Respect intent-filter priority for system keyboard layouts. 
Bug: 17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
 2014-09-18 18:48:19 -07:00
Yigit Boyar
91803838c8 Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 2014-09-19 00:59:53 +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
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
George Mount
7343ba2f80 Merge "Fix broken logic in isValidTarget" into lmp-dev 2014-09-18 22:51:23 +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
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
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
Craig Mautner
bc3126f859 Merge "Remove activity icon bitmaps from system process." into lmp-dev 2014-09-18 21:25:24 +00:00
Alan Viverette
b0560839e8 am c216a2df: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit 'c216a2df8a92add1b04dbcf17ec8fb198409fe04':
  Fix parsing of old-style intent URIs
 2014-09-18 21:23:49 +00:00
Craig Mautner
648f69b95c Remove activity icon bitmaps from system process. 
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
 2014-09-18 14:16:26 -07:00
Alan Viverette
194206c4d7 am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit 'c5073a812a82928ae681c9fcd328a3b1323b4edc':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 20:57:26 +00:00
Jon Miranda
c5e711eeb2 am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit '1ae494deb79793c126e244c09ab9fd12a68df370':
  Adds support for Theme dumping via DDM.
 2014-09-18 20:57:19 +00:00
John Reck
7c48077877 am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'a0f5d726fc8a5610e41c40e289fd107704202327':
  Revert "Make starting window hw-accelerated"
 2014-09-18 20:57:13 +00:00