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

63021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fb300fb2f0 am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
  docs: add G+ page announcement to homepage
 2012-01-30 10:05:59 -08:00
Scott Main
73790a53b5 Merge "docs: add G+ page announcement to homepage" into ics-mr1 2012-01-30 10:03:21 -08:00
Scott Main
b1560f2085 docs: add G+ page announcement to homepage 
Change-Id: I400334fc1465b67ec34af2071a6cca5b6eda116f
 2012-01-30 09:59:42 -08:00
Jean-Baptiste Queru
27d2ab8b27 am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation
 2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
dc8668c8a7 am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation
 2012-01-27 13:55:56 -08:00
Jean-Baptiste Queru
9781870491 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Vishal Mahaveer
21bd79f51c Wi-Fi: Handle disconnect in middle of DHCP operation 
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-01-27 14:51:23 -06:00
Roman Nurik
5525a43a9c am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links
 2012-01-26 16:35:06 -08:00
Roman Nurik
639b25ea28 Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Roman Nurik
bb9bffb6b9 docs: add NOTICE to action bar icon pack and sprinkle download links 
Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
 2012-01-26 15:57:34 -08:00
Roman Nurik
9d9c718925 am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design
 2012-01-26 15:35:46 -08:00
Roman Nurik
00b3ceb48b Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Roman Nurik
3ba792c7f4 docs: Update designing-navigation training class to link to Android Design 
Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
 2012-01-26 13:12:22 -08:00
Daniel Sandler
70828a1d40 am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
 2012-01-26 13:04:17 -08:00
Daniel Sandler
5b08738a62 Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Daniel Sandler
62a1eb8972 Suppress mobile-out-of-service label if wifi connected. 
Carrier name is shown if
 - in service and connected to mobile data
 - in service and connected to wifi

Carrier name is blanked if out of service and connected to
wifi.

"No internet connection" is shown if out of service without
any other route.

Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
 2012-01-26 15:35:03 -05:00
Scott Main
2de74f5fa9 am 6c055bbd: docs: add action bar icons ZIP 
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
 2012-01-26 11:44:58 -08:00
Scott Main
6c055bbdf4 docs: add action bar icons ZIP 
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
 2012-01-26 11:35:20 -08:00
Scott Main
e7ffc5a633 am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1 
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack
 2012-01-25 18:00:42 -08:00
Scott Main
9ac4dd8280 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
3fe452906d docs: remove the 1.0 icon template pack 
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
 2012-01-25 17:54:28 -08:00
Scott Main
1f9026caf1 am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
  docs: remove ADL presentation PDFs to conserve site space
 2012-01-25 17:52:08 -08:00
Scott Main
f466db14ec Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e docs: remove ADL presentation PDFs to conserve site space 
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
 2012-01-25 17:47:46 -08:00
Joe Malin
ba8dd79f4e am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:30:13 -08:00
Joe Malin
9f426604e6 am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:27:46 -08:00
Robert Greenwalt
1095335191 am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
 2012-01-25 11:30:39 -08:00
Robert Greenwalt
44f64c9657 Merge "Filter our v6 address from tethering dns." into ics-mr1 2012-01-25 11:28:30 -08:00
Jean-Baptiste Queru
95306d8500 am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
64085d03ef am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:27:41 -08:00
Jean-Baptiste Queru
12045502c4 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Roman Nurik
92aaf2431c am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
  docs: Android Design typo and grammar fixes
 2012-01-24 18:11:12 -08:00
Roman Nurik
cf077fdd79 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Roman Nurik
5d3b0c7a7a docs: Android Design typo and grammar fixes 
Change-Id: Ice0eb216c985183e2f41c287ea5d1cc7af1f31f2
 2012-01-24 17:51:17 -08:00
Robert Greenwalt
03d58bc656 Filter our v6 address from tethering dns. 
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
 2012-01-24 16:44:50 -08:00
Jean-Baptiste Queru
e2594b8509 am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:15:36 -08:00
Jean-Baptiste Queru
a39461047e am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:15:33 -08:00
Jean-Baptiste Queru
4cd2b34327 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
fc2ea24b02 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:13:42 -08:00
Jean-Baptiste Queru
98539a4eba Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Daniel Sandler
416a1c1ada am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
  Stop showing "No internet connection" when there is one.
 2012-01-24 12:57:14 -08:00
Daniel Sandler
185c0ef7e4 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Eric Laurent
535b0264a4 am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
  AudioFlinger: refine mixer sleep time logic
 2012-01-24 11:51:50 -08:00
Eric Laurent
dd347d515d am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-24 11:51:47 -08:00
Eric Laurent
7eeaf3f07a Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 2012-01-24 11:49:39 -08:00
Eric Laurent
41773d4655 Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 2012-01-24 11:49:16 -08:00
Daniel Sandler
2e481b9146 Stop showing "No internet connection" when there is one. 
In particular, even though the mobile data network isn't
routing packets (and therefore is not an internet
connection), we want to show the PLMN anyway:

  [MOBILE RSSI] Carrier  [WIFI RSSI] WiFi SSID

This change also improves the following cases:

 - Combines "No internet connection" from wifi and mobile
   into one single string in airplane mode:

     [AIRPLANE] No internet connection.

 - Removes "No internet connection" from the mobile string
   when wifi is on in airplane mode, making a nice compact
   display in this case:

     [AIRPLANE] [WIFI RSSI] WiFi SSID

Bug: 5903914
Change-Id: I477821d2c5e9922252dd6bcb3ed494c8c57d99b0
 2012-01-24 14:45:40 -05:00
Robert Greenwalt
67cda1a0ec am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
  Use the carrier-given dns addrs for tethering.
 2012-01-24 11:42:21 -08:00
Robert Greenwalt
f449ea9e96 Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 2012-01-24 11:40:19 -08:00
Dianne Hackborn
a585359516 am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
 2012-01-24 11:37:02 -08:00