Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,201 Commits 3 Branches 0 Tags
f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975
Commit Graph

59509 Commits

Author SHA1 Message Date
Amit Mahajan
6aed028e8a am 1ab5ba1b: am 9abf8a29: am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '1ab5ba1b7d1ef926d72013cb2b7795284d70f101':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-20 00:06:49 +00:00
Amit Mahajan
af1fc47cd4 am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '57f632624cb36e86fa92ab072ee56796862237ed':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-19 23:36:53 +00:00
Amit Mahajan
94c554ccdf am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '04ac796c6191dbeb7d393664ef1ca27624f934b8':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-19 23:27:03 +00:00
Alan Viverette
4828d7afed am a59a64e7: am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'a59a64e7b890e0683592479ec4d985f383792c54':
  Update theme colors for better contrast and de-blueing
 2014-09-19 23:18:55 +00:00
Elliott Hughes
69eb21074f am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '4fec1b488759a89732af151e21a89aa6693ba9bf':
  Use constants instead of resources for ellipsis.
 2014-09-19 23:16:52 +00:00
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
 2014-09-19 16:13:49 -07:00
Amit Mahajan
c2492e19ea Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 2014-09-19 23:12:58 +00:00
Hui Wang
4b57b991ac Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable 
Bug: 17567651, 16308209
Change-Id: Ie164b16b70429d5815e9bef5f8c5489f6e49de36
 2014-09-19 23:11:58 +00:00
Alan Viverette
0e3b5a7986 am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
  Correctly apply max width/height to preference icons
 2014-09-19 23:03:56 +00:00
Alan Viverette
3a0caadbf9 am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit '38321d617c25ccc7fe5e9da611d2bc7259016d8c':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:51:28 +00:00
Alan Viverette
4d5e9fc39d am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '13527b41ba5613cf2861782aafa3b2fd3299bcf2':
  Correctly apply max width/height to preference icons
 2014-09-19 22:38:34 +00:00
Alan Viverette
9ad4d87a53 am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:38:26 +00:00
Alan Viverette
edcb2d0e89 Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 2014-09-19 22:28:08 +00:00
Ian Rogers
e9b6cb8058 am ad64befd: am 296a712e: Merge "Make a field final." 
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.
 2014-09-19 22:27:36 +00:00
Alan Viverette
2300412761 am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons
 2014-09-19 22:27:16 +00:00
Svetoslav
86d07089e6 am b38e8d02: am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit 'b38e8d02bc75eb13f9cb78bea6ae6102f594b587':
  Keep existing API behavior that regressed.
 2014-09-19 22:26:25 +00:00
Alan Viverette
daf8588275 Merge "Correctly apply max width/height to preference icons" into lmp-dev 2014-09-19 22:19:02 +00:00
Alan Viverette
0fa3c1c656 Update theme colors for better contrast and de-blueing 
BUG: 17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
 2014-09-19 22:17:45 +00:00
Elliott Hughes
4fec1b4887 am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
  Use constants instead of resources for ellipsis.
 2014-09-19 22:14:48 +00:00
Dan Albert
1a4527ce94 am 799812cd: Merge "Clean up makefile cruft." 
* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
  Clean up makefile cruft.
 2014-09-19 22:14:42 +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
479ab3b575 am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '61052dec7d76a6ab0a39d2471cea8d9205062a0e':
  Keep existing API behavior that regressed.
 2014-09-19 22:05:06 +00:00
Elliott Hughes
600ca140e2 Merge "Use constants instead of resources for ellipsis." 2014-09-19 22:02:45 +00:00
Igor Viarheichyk
ed0daa93e4 Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2014-09-19 22:02:08 +00:00
Svetoslav
129ffeb37c am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
  Keep existing API behavior that regressed.
 2014-09-19 21:49:31 +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
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +00:00
Alan Viverette
f2a6e1fa57 am 80b7068b: am 8f7fb2e6: am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 
* commit '80b7068b16d0be1e345e21915632fba88532dd57':
  Fix action bar title size consistency
 2014-09-19 21:34:36 +00:00
George Mount
02c1728c8e am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '0e24bcbb60a1dd8f7820496635e340b5c6b319eb':
  Target only shared elements with shared element Transition
 2014-09-19 21:22:39 +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
Alan Viverette
db583545ac am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 
* commit '7fd5ca87ac8fb2abdc7e5d6916a567e638c0f332':
  Fix action bar title size consistency
 2014-09-19 21:11:23 +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
Alan Viverette
00bdf65922 am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 
* commit 'bac2a4be9a4a408fb6adbd59b0632e2b87bf3872':
  Fix action bar title size consistency
 2014-09-19 20:57:43 +00:00
Adam Powell
91fb866395 am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '0a296ef3cfa34775c1e3c7d0753c377d5029ac6b':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:52:34 +00:00
Alan Viverette
e14566eeb1 Merge "Fix action bar title size consistency" into lmp-dev 2014-09-19 20:51:14 +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
Alan Viverette
ecd7c96aa4 Correctly apply max width/height to preference icons 
BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
 2014-09-19 13:36:29 -07: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
e546540a90 am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit '2b5563f1bf52724b1158d895dffa8fcbd643e3c8':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:19:59 +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
1e3d6bf397 am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit 'cf5ba66c86eeb91d930d809d0a40731093b950a6':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:40:39 +00:00
Paul Soulos
cafea23c28 am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation 
* commit '1f2de4f530a930005060ffc575d124a86b345e74':
  Fixes typo in Intent documentation
 2014-09-19 19:40:35 +00:00