Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Kenny Guy
580c8675be am e83001aa: am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit 'e83001aaea1a8c63dc86d1c63d243a97441b6a3e':
  Remove suggested key names as its confusing.
 2014-09-19 13:40:47 +00:00
Kenny Guy
4b34d39ebd am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '86d6e75144097fe6be741c2ac0756a82c98d3dc7':
  Remove suggested key names as its confusing.
 2014-09-19 13:26:56 +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
57224fae58 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:37 +00:00
Yohei Yukawa
17d9686873 am 839eb7af: am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '839eb7afa34ccfb46edf1eb6706608f33978b8df':
  Speculative fix of IMMS crash
 2014-09-19 09:44:30 +00:00
Dan Sandler
0cd30f7702 am 881a594d: am 4cd7746c: am b2811608: am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '881a594d342e4250be7dbcc401665f210b34384f':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 09:44:25 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Dianne Hackborn
306654605f am 7b7d23e6: am 186b584e: am 80113a79: am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '7b7d23e611887db220577ded024d5b533fd031cf':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 09:44:21 +00:00
Yigit Boyar
0b62efdf96 am 07617442: am 914d2094: am 4a7c96d4: am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '07617442eb75fada60593860f1ea67a8021764ba':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 09:44:05 +00:00
George Mount
064823b8f8 am 6c4ec74c: am 93b49f02: am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '6c4ec74c8067006442fe1c422d32bf961e4e42fc':
  Fix broken logic in isValidTarget
 2014-09-19 09:43:37 +00:00
Yohei Yukawa
95e6316f93 am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '227fc315686c5d119b5d76ae90148c3c4a9dfbe8':
  Speculative fix of IMMS crash
 2014-09-19 09:30:30 +00:00
Dan Sandler
245e863f47 am 4cd7746c: am b2811608: am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '4cd7746caf62b9c0628dafe8e4a864f9d3c0cc8d':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 09:30:26 +00:00
Dianne Hackborn
1a50ba057d am 186b584e: am 80113a79: am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '186b584e5f9d7dc1d0320e159a4ac51d59fb1eea':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 09:30:13 +00:00
Yigit Boyar
f1a094c9e1 am 914d2094: am 4a7c96d4: am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '914d2094d52804dd80a65f2a07656da7c6108a7c':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 09:29:55 +00:00
George Mount
bf4ba8b31d am 93b49f02: am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '93b49f02105014acfcd769f0ec643c15abc4283e':
  Fix broken logic in isValidTarget
 2014-09-19 09:29:35 +00:00
Craig Mautner
c181a05774 am 0adbb788: am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '0adbb788c4500c9241ab195e674f1cbcb3f1d1f2':
  Remove activity icon bitmaps from system process.
 2014-09-19 08:31:44 +00:00
Alan Viverette
5a11a43881 am c8853331: am 993fb7e9: am 9069fdda: am 8f1ee1d8: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit 'c88533311950880f19bb4726da56af48eec0b7e7':
  Fix parsing of old-style intent URIs
 2014-09-19 08:31:09 +00:00
Wink Saville
40aca89a27 am c501947a: Merge commit \'edd57a98\' into fix-conflict 
* commit 'c501947a3ebed84792c235f29c73194d095906ed':
 2014-09-19 06:44:44 +00:00
Yohei Yukawa
2b6307c894 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 06:21:05 +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
Dan Sandler
103daa0c49 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 05:29:34 +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
f2cf16436b 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 04:17:41 +00:00
Yigit Boyar
6a0c7b1ba8 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 04:08:55 +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
Wink Saville
4b4d685341 am 1ddcdc2d: Merge commit \'e58e59cc\' into fix-merge-conflict 
* commit '1ddcdc2d1cef6387612923ad3f9e73de12727dc1':
  ksd to lmp-sprout-dev
 2014-09-19 03:21:56 +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
d137a27e16 am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
  Fix broken logic in isValidTarget
 2014-09-18 23:01:45 +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
Craig Mautner
7d06c3758d am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '1b314af5a1a4f0d7f4be38b52caa3a2c28a1da4e':
  Remove activity icon bitmaps from system process.
 2014-09-18 22:25:39 +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
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
Alan Viverette
7e9cd14eff am 993fb7e9: am 9069fdda: am 8f1ee1d8: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit '993fb7e906148c7f07cabd33bd22f2a4d707f4ca':
  Fix parsing of old-style intent URIs
 2014-09-18 21:52:12 +00:00
Craig Mautner
1ef73b3903 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:55 +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
Alan Viverette
090537ee29 am 2f9ae13d: am f491d835: am 73d3c81c: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit '2f9ae13d5843d6f25cfaaf2db51b5a78e2a8ba33':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 21:23:38 +00:00
Alan Viverette
bc4bd10a04 am 6bea572d: am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit '6bea572d9d85e4777ba351d574857495d2d7eeb2':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 21:17:37 +00:00
Jon Miranda
10ae043012 am 142b23ef: am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit '142b23ef452c4ce06ce22c80b0e8c69c7c7eca11':
  Adds support for Theme dumping via DDM.
 2014-09-18 21:17:32 +00:00