drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,669 Commits 1 Branch 0 Tags
Commit Graph

10830 Commits

Author SHA1 Message Date
Adam Powell
209c334152 am e3215536: am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'e321553613a71178fd5fce1e27e0b9693650d10a':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 15:27:46 +00:00
Adam Powell
da3b0d3f3f am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'd2906536f40e584ff4b4c348a95ce71958aaffb6':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 04:31:00 +00:00
Adam Powell
4967a73816 am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 00:16:26 +00:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity 
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
 2014-09-25 16:54:41 -07:00
Sukanya Rajkhowa
36bf8f5898 am 5a911205: am 57674c99: am 518db096: am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '5a911205eac93323981855fb82004ae555a0d331':
  Add config to control phone switch
 2014-09-25 17:18:54 +00:00
Vinit Deshpande
501a593540 am 6c77445b: am 574e57da: am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '6c77445b5d025f34a744b9ffcf3df26592f9e480':
  Introduce config setting for scanning mac OUI
 2014-09-25 17:18:41 +00:00
Sukanya Rajkhowa
705b41ea16 am 57674c99: am 518db096: am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '57674c99243b51b13cbea48766e30e67cd9448d6':
  Add config to control phone switch
 2014-09-25 17:06:09 +00:00
Vinit Deshpande
14abc8744c am 574e57da: am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '574e57da1851f1375c5526b6b0b35fe56dc16fb6':
  Introduce config setting for scanning mac OUI
 2014-09-25 17:05:55 +00:00
Sukanya Rajkhowa
7d695dd8d8 am 14cb7b8a: Add config to control phone switch 
* commit '14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
  Add config to control phone switch
 2014-09-25 16:23:11 +00:00
Vinit Deshpande
76d2183725 am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:22:40 +00:00
Sukanya Rajkhowa
db96682537 Add config to control phone switch 
When UNSOL_RADIO_TECH_CHANGED is received, PhoneProxy
calls updatePhoneObject to decide whether to do a phone
switch. This config determines whether to also do a
phone switch when VOICE_REGISTRATION_STATE changes. Default
value is true

Bug: 17394282
Change-Id: Iae6c35992b932923d74c405d443b1e7e98f750c8
 2014-09-25 00:20:52 +00:00
Vinit Deshpande
7486328d6c Merge "Introduce config setting for scanning mac OUI" into lmp-dev 2014-09-24 23:50:05 +00:00
Mike Lockwood
0561030490 Fix broken merge of "handle bssid blacklist in case of dhcp failures" 
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6

Conflicts:
	wifi/java/android/net/wifi/ScanResult.java
 2014-09-24 14:27:06 -07:00
Dianne Hackborn
7bceac9290 am 159ee30b: am 8d084fa2: am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '159ee30bcf39f53e03a8dacd1a1d8cb5d14cbb05':
  Fix issue #17632804: Add resource padding
 2014-09-24 18:09:05 +00:00
Dianne Hackborn
ae2682690e am 8d084fa2: am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '8d084fa29e95c5d5f15322e2931948cfddc3dd29':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:58:21 +00:00
Dianne Hackborn
f31f1d5b79 am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '9727cd7f20fdb0f5037857b2567609e33b040897':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:46:00 +00:00
Baligh Uddin
59c8cee55f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-24 17:44:04 +00:00
Baligh Uddin
91a32a05ff Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-24 17:44:02 +00:00
Baligh Uddin
1d51b534b0 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-24 17:43:58 +00:00
Baligh Uddin
d6b43337b4 Merge "Import translations. DO NOT MERGE" 2014-09-24 17:43:56 +00:00
Dianne Hackborn
e3185cba6d am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit 'c0e5eb2b4310b14bbf1829ce4516084462e9cf8b':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:30:02 +00:00
Tsuwei Chen
e734693bf8 am 615f5d47: am 8f5d6a00: am bc8f28a1: am 035a986b: am a7fd1016: Merge "Use the right format to specify SUPL_MODE value." into lmp-dev 
* commit '615f5d47720c4b4d41135fb7b0104b68413195ff':
  Use the right format to specify SUPL_MODE value.
 2014-09-24 17:18:10 +00:00
Alan Viverette
3b19cfa89b am 8bd2255a: am c9aa291f: am 6afc2eec: am 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev 
* commit '8bd2255a49e87587988de8274ba462f49844e2da':
  Explicitly set Settings background to white
 2014-09-24 17:17:46 +00:00
Dianne Hackborn
b1aed18d9b Merge "Fix issue #17632804: Add resource padding" into lmp-dev 2014-09-24 17:17:40 +00:00
Tsuwei Chen
dd577eab9e am 8f5d6a00: am bc8f28a1: am 035a986b: am a7fd1016: Merge "Use the right format to specify SUPL_MODE value." into lmp-dev 
* commit '8f5d6a0053e0847a5159001e6e3f819eb71bf92d':
  Use the right format to specify SUPL_MODE value.
 2014-09-24 04:14:08 +00:00
Alan Viverette
7580812bb9 am c9aa291f: am 6afc2eec: am 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev 
* commit 'c9aa291fb96c490ded4ba2990e430e0f754a83fb':
  Explicitly set Settings background to white
 2014-09-24 04:13:46 +00:00
Tsuwei Chen
f86afcd2e2 am a7fd1016: Merge "Use the right format to specify SUPL_MODE value." into lmp-dev 
* commit 'a7fd1016b5210d1218d97e6a557c28b3bebedfb0':
  Use the right format to specify SUPL_MODE value.
 2014-09-24 02:01:15 +00:00
Tsuwei Chen
54fee68628 Merge "Use the right format to specify SUPL_MODE value." into lmp-dev 2014-09-24 01:53:31 +00:00
Dianne Hackborn
0c3cc8e883 Fix issue #17632804: Add resource padding 
Change-Id: If09108415fc4f64f4d4ff837a6096713a96aa334
 2014-09-23 18:32:39 -07:00
Tsuwei Chen
cf03b60ce2 Use the right format to specify SUPL_MODE value. 
Bug:17618140
Change-Id: I013219bb8febb4bb5c23d4896f432fd3a01c21f8
 2014-09-23 18:31:48 -07:00
Alan Viverette
7306924cfa am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev 
* commit 'f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
  Explicitly set Settings background to white
 2014-09-24 01:29:30 +00:00
Alan Viverette
ef686b3c44 Merge "Explicitly set Settings background to white" into lmp-dev 2014-09-24 01:17:53 +00:00
Alan Viverette
dfd9376072 Explicitly set Settings background to white 
Fixes a regression where the background was previously the default
color, then changed to #eee even though we still want #fff here.

Removes unnecessary windowBackground re-definition.

BUG: 17520824
Change-Id: I9b3a751ce55fc018a90132078a8e308067f62445
 2014-09-23 18:15:31 -07:00
vandwalle
6933d61f2d am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '9e22f2803c26626851f24db7c54fa68b85ca5e45':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 23:18:18 +00:00
vandwalle
5a94fd7c04 am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 22:41:28 +00:00
vandwalle
ba46bac83a Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 2014-09-23 22:31:34 +00:00
John Spurlock
96d61733d8 am 6cb59e25: am 2c3ead39: am e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit '6cb59e25b21549637a192d076552eb5a43b6bfab':
  Remove redundant wifi-display notification.
 2014-09-23 21:03:13 +00:00
Etan Cohen
7fc93fa944 am e6b9811f: am e08b7cc4: am 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
* commit 'e6b9811fe2ec0be5a60df5fb24d7c06593efe1dc':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
 2014-09-23 20:56:48 +00:00
Alan Viverette
76fcb9718d am c3a7df10: am bd4e3851: am 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev 
* commit 'c3a7df103fe211a5a0a147acf9aeefc6e64c1793':
  Update refresh icon to tinted material vector asset
 2014-09-23 20:56:37 +00:00
John Spurlock
c44c0a52eb am 2c3ead39: am e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit '2c3ead392997928ea30da5014243a09c6591c5b8':
  Remove redundant wifi-display notification.
 2014-09-23 20:49:22 +00:00
John Spurlock
5d3c840a87 am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit 'c107ea7321829d7c4b7f22f9967ffd0250569b56':
  Remove redundant wifi-display notification.
 2014-09-23 20:15:11 +00:00
John Spurlock
03365ccc39 Remove redundant wifi-display notification. 
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.

Bug:17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
 2014-09-23 15:51:11 -04:00
Vinit Deshpande
38aabf9117 Introduce config setting for scanning mac OUI 
This setting will allow an OEMs to override the default Google OUI
for scanning.

Bug: 17468465
Change-Id: I3d9a6cf6451bcc98d0cad158bc52c7b3a52cb0ea
 2014-09-23 12:44:46 -07:00
vandwalle
176a27f3ab handle bssid blacklist in case of dhcp failures 
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
 2014-09-23 12:38:06 -07:00
Etan Cohen
3ec0973db8 am e08b7cc4: am 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
* commit 'e08b7cc4e730a3afdf1b9618b1bcb65664d16ec4':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
 2014-09-23 19:09:20 +00:00
Alan Viverette
c508a1dbab am bd4e3851: am 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev 
* commit 'bd4e3851c7f470ef590c89fb513bd1fa38dcc69b':
  Update refresh icon to tinted material vector asset
 2014-09-23 18:51:24 +00:00
Etan Cohen
164a91ae0d am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
* commit 'dd2b9f0754948f844517b3c82062c02d91762b28':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
 2014-09-23 18:34:17 +00:00
Etan Cohen
5e418a6692 Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
Configuration RAT replacement value will be used in any ambiguous (LTE:14) or
unknown (UNKNOWN:0) scenario.

Bug: 16962905
Change-Id: Ica1cc809521df5836143d8a94849541f28342a89
 2014-09-23 18:28:11 +00:00
Alan Viverette
4d2b60d136 am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev 
* commit '043fc017b713c88122f8d7b6b9cba606e254805a':
  Update refresh icon to tinted material vector asset
 2014-09-23 18:16:43 +00:00
Amit Mahajan
b4fdee8e50 am 6f53e425: am 02f897a9: am 316c7729: am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '6f53e42569eec472aabfe6d91284ae55f4473d6d':
  Don't disconnect data for some carrier
 2014-09-23 16:21:36 +00:00