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

114657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2bd9b2cd6e Import translations. DO NOT MERGE 
Change-Id: Id35c7a7d478d301f9def5215ef593e02c0ca91e2
Auto-generated-cl: translation import
 2013-09-23 10:07:51 -07:00
John Spurlock
af56853020 Keep PhoneStatusBar default constructor around. 
By keeping the entire class safe.

Change-Id: I0851ae5556243af2deb76f38500271059ffa4480
 2013-09-23 11:15:11 -04:00
Dianne Hackborn
bf00b1a5f8 am eafa9c2b: am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 
* commit 'eafa9c2b893a9c98d4bf8086b32aabc05181791a':
  Debug issue #10876433 java.lang.IllegalStateException...
 2013-09-22 16:53:10 -07:00
Dianne Hackborn
eafa9c2b89 am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 
* commit 'f9b70ab87e8f26b57ac3d8dc3b77052e747cb888':
  Debug issue #10876433 java.lang.IllegalStateException...
 2013-09-22 16:50:38 -07:00
Dianne Hackborn
f9b70ab87e Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 2013-09-22 23:48:29 +00:00
Dianne Hackborn
2be0093316 Debug issue #10876433 java.lang.IllegalStateException... 
...in ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Add more debug output to help track down what is going on.

Also fix a little problem where, when a service ANRs, if you ask to
wait and it still wasn't responding, the ANR dialog wouldn't be
shown again.

Change-Id: I5be2b1705a0a39ca2992624ae683945c5f38065d
 2013-09-22 16:46:00 -07:00
Jeff Sharkey
eb5c28993e am a817e49e: am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev 
* commit 'a817e49e0cbe773accb60fd0b3a37660695b6c0a':
  Latest UX asset drop, grid padding.
 2013-09-22 12:59:43 -07:00
Jeff Sharkey
a440a0dd64 am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev 
* commit 'b8a48da2a707720a105584f1b8dc087a6dd9c887':
  Create unique files, root ordering, UI bugs.
 2013-09-22 12:59:40 -07:00
Jeff Sharkey
a817e49e0c am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev 
* commit 'dbfceb7ea0f2925fa2e9cce4a5eece0b72d9c093':
  Latest UX asset drop, grid padding.
 2013-09-22 12:57:24 -07:00
Jeff Sharkey
b8a48da2a7 am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev 
* commit '5e1a5e5bad475696e842addceb7dd6a519879f98':
  Create unique files, root ordering, UI bugs.
 2013-09-22 12:57:20 -07:00
Jeff Sharkey
dbfceb7ea0 Merge "Latest UX asset drop, grid padding." into klp-dev 2013-09-22 19:55:34 +00:00
Jeff Sharkey
5e1a5e5bad Merge "Create unique files, root ordering, UI bugs." into klp-dev 2013-09-22 19:55:19 +00:00
Igor Murashkin
f17285c465 am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 
* commit '8c87117588a1158823d94dec365897d33cec59bf':
  camera2: Rename CameraProperties to CameraCharacteristics
 2013-09-22 09:57:40 -07:00
Igor Murashkin
8c87117588 am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 
* commit '3ba21e979524367631de70dfc82075693d9c616d':
  camera2: Rename CameraProperties to CameraCharacteristics
 2013-09-22 09:55:52 -07:00
Igor Murashkin
3ba21e9795 Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 2013-09-22 16:54:11 +00:00
Robert Greenwalt
7dadd1ed2f am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev 
* commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a':
  Fix BatchScan request coalesing
 2013-09-22 09:03:20 -07:00
Robert Greenwalt
1e690b693c am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev 
* commit '0983eadff23bfc3ab7812be455d4a66edc3dcc7b':
  Fix BatchScan request coalesing
 2013-09-22 09:01:43 -07:00
Robert Greenwalt
0983eadff2 Merge "Fix BatchScan request coalesing" into klp-dev 2013-09-22 15:59:01 +00:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics 
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
 2013-09-21 21:01:32 -07:00
Igor Murashkin
b960357438 am 78d5286e: am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev 
* commit '78d5286e0711092d1ec919c4524bfba9230d11d0':
  camera2: Add capture sequences and capture failures
 2013-09-21 19:54:14 -07:00
Igor Murashkin
78d5286e07 am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev 
* commit 'ca833c389b3cc2f95f27fe7782d0bebb8b36d660':
  camera2: Add capture sequences and capture failures
 2013-09-21 19:49:34 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Jeff Sharkey
1feeddf518 Latest UX asset drop, grid padding. 
Bring in latest asset drop.  Apply grid padding programmatically
instead of waiting for asset.  Remove alpha from directory animation.

Update save footer background to match spec.

Bug: 10700025
Change-Id: I8eef08f36d04767b78e91b23f72bdbebfbb02f58
 2013-09-21 15:26:37 -07:00
Wink Saville
4d154af68f am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict 
* commit '86ad8e6871e778e1ee47d4f723bbd1d5f8fc00bf':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 14:39:42 -07:00
Wink Saville
86ad8e6871 am 56065891: Merge commit \'53221120\' into fix-merge-conflict 
* commit '56065891abf383b0409ae595437dcb0ea132e32b':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 14:36:13 -07:00
Jeff Sharkey
5545f56f75 Create unique files, root ordering, UI bugs. 
When a file already exists on disk, try adding a counter suffix to
make a unique name.  Move services near top of roots list, just below
recents.  Remove "Documents" root.

Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.

When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.

Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.

Fix UI bug around trailing breadcrumbs.  Fix bug that dropped Recents
from roots list.  Add up action to Settings activity.  Give our
activity a default icon while waiting for async roots to load.

Bug: 10818683, 10819461, 10819461, 10819196, 10860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831
 2013-09-21 14:07:16 -07:00
Wink Saville
56065891ab Merge commit '53221120' into fix-merge-conflict 
* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
 2013-09-21 11:52:42 -07:00
Wink Saville
5322112004 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) 
* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 11:33:53 -07:00
Wink Saville
ab8cabf1d3 am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) 
* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 11:30:33 -07:00
Jonathan Dixon
90102e2ccc resolved conflicts for merge of 1421827b to master 
Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
 2013-09-21 10:48:28 -07:00
Wink Saville
1e4f461839 Do not always call setIsConnectedToProvisioningNetwork(false) 
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
 2013-09-21 09:01:19 -07:00
Jonathan Dixon
1421827bae am 6c025eaf: Merge "WebView: add an API method to control web contents debugging" into klp-dev 
* commit '6c025eaf29634d248bf067c2d9967e1905863f0c':
  WebView: add an API method to control web contents debugging
 2013-09-20 20:44:26 -07:00
Jonathan Dixon
6c025eaf29 Merge "WebView: add an API method to control web contents debugging" into klp-dev 2013-09-21 03:41:33 +00:00
Svetoslav Ganov
887a192ee1 am 18e3ca0f: am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev 
* commit '18e3ca0f148f2cd0390d417059fc7d5ae8c0c061':
  Update android.print.PrintAttributes documentation
 2013-09-20 19:48:33 -07:00
Svetoslav Ganov
18e3ca0f14 am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev 
* commit '678e907e09388dff8b2955bb524c2706f067a6ef':
  Update android.print.PrintAttributes documentation
 2013-09-20 19:44:03 -07:00
Svetoslav Ganov
678e907e09 Merge "Update android.print.PrintAttributes documentation" into klp-dev 2013-09-21 02:39:59 +00:00
David Friedman
98258449d9 am 7cc82d9f: am ad533927: am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit '7cc82d9f168c03bf91d4860d4600fd3f39f96249':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:16:13 -07:00
David Friedman
7cc82d9f16 am ad533927: am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit 'ad5339274cf5137aa3b28fd8de6fa1d305b58def':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:13:22 -07:00
David Friedman
ad5339274c am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit '224234461cd7752a179ad631d9c8c3cdb3964898':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:11:45 -07:00
David Friedman
224234461c am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit '217683d95d0be42c738b2844b289f2207e36b70f':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:09:17 -07:00
David Friedman
217683d95d am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit 'e12437284fcf94aed4ac5c2e10401b70fb1be086':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:05:55 -07:00
Dianne Hackborn
04cca35b85 resolved conflicts for merge of cc585f86 to master 
Change-Id: I72aa7707edeb48f63fbe5348915a31650bdfd8f5
 2013-09-20 19:04:45 -07:00
David Friedman
e12437284f Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 2013-09-21 02:02:45 +00:00
Igor Murashkin
6bbf9dc5ae camera2: Add capture sequences and capture failures 
- CaptureResult#getRequest is used to tie a result to a request (for convenience)
- Add new CaptureFailure class to describe capture failure
- Results/frame numbers also return frame numbers, sequence ids
- Captures now all return the sequence id
- A sequence id onComplete is available in the CaptureListener

Bug: 10360518
Change-Id: I9ebaa45698c718a1185b5ae920b7975925fe2f60
 2013-09-20 19:00:50 -07:00
Dianne Hackborn
cc585f86bc am 88b6e69b: Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev 
* commit '88b6e69bc7007964f9ae4f30faf1bb59d6a702bb':
  Fix issue #10863270: procstats UI is showing all green
 2013-09-20 18:53:37 -07:00
Dianne Hackborn
88b6e69bc7 Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev 2013-09-21 01:52:04 +00:00
Dianne Hackborn
2610b7cb2a Fix issue #10863270: procstats UI is showing all green 
Gah I messed up when refactoring so it would always be told
RAM is low.

Also slightly tune the low memory parameters to go into low
memory states a bit more aggressively.

Change-Id: I5f970349760ad349d515a85c266ab21b387ee353
 2013-09-20 18:51:03 -07:00
David Friedman
5f1755961b Fixed typo: Added missing word. 
Bug 10617080
Fixed typo:

"Determine if AccountManager for You"
-->
"Determine if AccountManager is for You"

Change-Id: I5b8f1368dad72bbbeb581132f480baf46a029be8
 2013-09-20 18:33:30 -07:00
Dianne Hackborn
05a3413998 am ff7f43eb: am bb6fd7ff: Merge "Shut. Up." into klp-dev 
* commit 'ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168':
  Shut.  Up.
 2013-09-20 18:30:47 -07:00
Dianne Hackborn
c430e0dc76 am 28db9c64: am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 
* commit '28db9c64172c046118eede06a5cc6f8d729c50c8':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
 2013-09-20 18:30:43 -07:00