Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,764 Commits 3 Branches 0 Tags
00a3441b259451befaa3282be6d3db215be57d22
Commit Graph

57639 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +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
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
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
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
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
Adam Powell
10ed4988bd am b057639f: am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev 
* commit 'b057639fd2b03a54902ab2c1f863216adff0d78a':
  Make panel menu windows respect elevation
 2014-09-19 17:51:53 +00:00
Amit Mahajan
c72ca78ff3 am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev 
* commit 'b8055865552508d2c5c17ddaf753f731ee4435dc':
  Handling service number convert while roaming.
 2014-09-19 17:39:52 +00:00
Adam Powell
7d507a9a17 am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev 
* commit 'e58c95786dba4bd356742a0127b7aacb78184440':
  Make panel menu windows respect elevation
 2014-09-19 17:38:16 +00:00
Amit Mahajan
d422df7928 am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev 
* commit '9391ee9e8b9f0daab2fd7a42189e3deac96c0e48':
  Handling service number convert while roaming.
 2014-09-19 17:26:41 +00:00
Adam Powell
2b2f6729b8 Merge "Make panel menu windows respect elevation" into lmp-dev 2014-09-19 17:25:34 +00:00
Alan Viverette
0158b82262 Fix action bar title size consistency 
BUG: 17582193
Change-Id: I7dfe9229361dcd52893fd96e1e8f9a006d7ffad3
 2014-09-19 10:23:34 -07: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
Amit Mahajan
df22548d3a Merge "Handling service number convert while roaming." into lmp-dev 2014-09-19 17:12:33 +00:00
Alan Viverette
26eac73cf1 am 09b87b5b: am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev 
* commit '09b87b5b53ddb4fb314f8415318543ee62214933':
  Delete file containing removed attributes and styles
 2014-09-19 16:41:05 +00:00
Alan Viverette
c973202559 am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev 
* commit '9cfe1e3c2785b78da86f450b9240b743842e65c2':
  Delete file containing removed attributes and styles
 2014-09-19 16:27:27 +00:00
Alan Viverette
e68bc7ab73 Merge "Delete file containing removed attributes and styles" into lmp-dev 2014-09-19 16:21:01 +00:00
Amith Yamasani
8fd6557a0b am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'e1206a349fd9ddc5868451c8a6b864af0a1dc11e':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:18:49 +00:00
George Mount
30531c8345 am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit '00877d68937f3f17cceff222b052d2b16f9b7d87':
  Fix exception when fragment container has no View.
 2014-09-19 16:05:50 +00:00
George Mount
73a92d2633 am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit 'af2f8cda5f950b7685892398e38f0ef270faf831':
  Fix NPE when shared element listener is null.
 2014-09-19 16:05:46 +00:00