Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,133 Commits 3 Branches 0 Tags
3d1ec9675462f187896427fe4323626e1d573a4a
Commit Graph

42209 Commits

Author SHA1 Message Date
George Mount
3d1ec96754 am 32c4f093: am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '32c4f093d8088fd283147217c06ccf3d5843e4db':
  Target only shared elements with shared element Transition
 2014-09-19 23:29:53 +00:00
Adam Powell
1a37af077c am 64cacb6c: am b501fb2d: am 6caa43be: am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '64cacb6c70721065e8472075e1bb714b690f24cd':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 23:29:31 +00:00
Michael Wright
eb26917a02 am 9d110311: am ff49e280: am 249e6220: am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit '9d110311fbb07968ad3459a2894e5618af87d2c2':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 23:29:24 +00:00
Alan Viverette
edc4781cde am 49e308c8: am 609378ca: am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit '49e308c841c35ac385d3b5a5908d1540d7851ced':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 23:29:04 +00:00
Paul Soulos
aced265e4c am 31f5ef5f: am 834bbcb6: am ca191524: am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation 
* commit '31f5ef5f6c5d32df4f7e3f40c96fe97b1a1d1d8a':
  Fixes typo in Intent documentation
 2014-09-19 23:28:59 +00:00
George Mount
02c377e139 am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '6ba1531e66ca6c483ef762339513e1086cbdf76d':
  Target only shared elements with shared element Transition
 2014-09-19 21:47:50 +00:00
Adam Powell
764b994d61 am b501fb2d: am 6caa43be: am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit 'b501fb2d8277e4317b3ccbe9dca6c9b7553b8715':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 21:18:02 +00:00
George Mount
6826e9bd3e am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit 'a86f10158a690b30e31216f628942562c3f2e2f2':
  Target only shared elements with shared element Transition
 2014-09-19 21:14:43 +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
Adam Powell
45acf7286f am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:43:48 +00:00
Michael Wright
b2be25dde2 am ff49e280: am 249e6220: am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit 'ff49e280f46a698e9cb564f1aecb70cf2765e037':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:41:59 +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
Alan Viverette
8acb6abed6 am 609378ca: am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit '609378ca3574b0dab360ac8759997aee7963afbe':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 20:10:07 +00:00
Paul Soulos
23450c2369 am 834bbcb6: am ca191524: am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation 
* commit '834bbcb625cffc44a70af570aa2cc8c918d4b356':
  Fixes typo in Intent documentation
 2014-09-19 20:10:03 +00:00
Michael Wright
299947f502 am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit '66bbf591050bf2969ebebc15e2550d45eeea3ab0':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:05:27 +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
9af20470b2 am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit '40994e66f278da83e2e4e581c85d5092ee1fb1c0':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:32:40 +00:00
Paul Soulos
f9390f56c6 am b5586e00: Fixes typo in Intent documentation 
* commit 'b5586e00ed5eb4b18b58371a54449f9cc8eedca8':
  Fixes typo in Intent documentation
 2014-09-19 19:32:36 +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
15b6dde72f am 2bfae686: am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit '2bfae68607041ec8ec02e7c77471f22202b9ce8d':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:55:03 +00:00
Amith Yamasani
d587057246 am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit '4ad6b3ef184424e36915bc046e04706f2dded0e2':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:40:50 +00:00
George Mount
f028e103f1 am d5da500e: am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'd5da500e170fe3e2b430f27ac250b5b61dc90bcc':
  Fix exception when fragment container has no View.
 2014-09-19 16:40:39 +00:00
George Mount
e06fa37930 am ad022964: am 4785cb7f: am 46df1eee: am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit 'ad0229649dd7f9487dd0f4ecc4f777b738baee25':
  Fix NPE when shared element listener is null.
 2014-09-19 16:40:35 +00:00
George Mount
1a780826c2 am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'fbb670d9ddd16c174369cdd4575860dee6ffe8c4':
  Fix exception when fragment container has no View.
 2014-09-19 16:30:33 +00:00
George Mount
74b01d84af am 4785cb7f: am 46df1eee: am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '4785cb7f541951cf3e31a84acf0767c7393fbe92':
  Fix NPE when shared element listener is null.
 2014-09-19 16:30:28 +00:00
Amith Yamasani
70a2afd10e am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:02:59 +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
6ac3f38143 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:50:48 +00:00
George Mount
a667d5dc5e 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:50:44 +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
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
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