125397 Commits

Author SHA1 Message Date
Dianne Hackborn
01de243263 am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native
2014-02-13 17:50:53 -08:00
Wink Saville
ea56c795b0 am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit 'bbba8211f9eca938d5d482583fd6e047615b4334':
  Telephony: Handle DATA_CALL_LIST in DCC.
2014-02-13 17:50:51 -08:00
Alan Viverette
23160f4fb9 Merge "Refactor AbsListView position scrollers for better abstraction" 2014-02-14 01:48:59 +00:00
Alan Viverette
d22db216fe Refactor AbsListView position scrollers for better abstraction
The AbsListView sub-scroller knows nothing about layout. That's now
handled by ListView and GridView, with subclasses of AbsListView using
the default PositionScroller. Removes unnecessary (unreleased) APIs.

Also fixes a bounds check that was using the item position rather than
the child view position.

BUG: 13006641
Change-Id: I2adb0f15623e32295facf81f5ada974083ba03ce
2014-02-13 17:47:38 -08:00
Fabrice Di Meglio
98f5a7a963 am 73f3a33b: Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
* commit '73f3a33b46691deb9ce7f3ce54feef8c973686ff':
  Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog
2014-02-13 17:45:48 -08:00
Dianne Hackborn
24d8fa739b Merge "frameworks/base: move idmap from frameworks/native" 2014-02-14 01:45:12 +00:00
Fabrice Di Meglio
73f3a33b46 Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 2014-02-14 01:42:36 +00:00
Alan Viverette
787f6f0e97 am 7d57765d: Merge "Add selection properties to CollectionInfo, CollectionItemInfo"
* commit '7d57765db927d8803bd8898463cc6f9979b6bf35':
  Add selection properties to CollectionInfo, CollectionItemInfo
2014-02-13 17:17:54 -08:00
Alan Viverette
7d57765db9 Merge "Add selection properties to CollectionInfo, CollectionItemInfo" 2014-02-14 01:15:04 +00:00
ztenghui
ef94c6f88f Separate spot and ambient shadow strength setting
Change-Id: I4530e618b09a7f44b5382f8a40646c0ebf5f214c
2014-02-13 17:09:45 -08:00
Fabrice Di Meglio
08189afdb0 Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog
- do not make inactive the fragment when its transition animation is ending.

Long explanation:

Context: you need to have a first fragment pushed and then a second one replacing
the first one, and then create a DialogFragment on top of it. The FragmentManager
has then three "active" Fragments.

The mActive ArrayList of the FragmentManager is then containing:

mActive[0] = first fragment
mActive[1] = second fragment (parent of the dialog fragment)
mActive[2[ = dialog fragment

Then suppose you are changing the orientation.

During the restoration of the FragmentManager states, you will see that the
first Fragment is marked "inactive" and the mActive ArrayList is looking like:

mActive[0] = dialog fragment
mActive[1] = second fragment

which leads first to have a call to onCreateDialog() for the DialogFragment and
before it can be able to restore its state thru the calls to onCreate() and
onCreateView() for the parent (the second fragment).

Change-Id: I0268bdf13e4bdd07a783c2c82a13b431d0c5c8e4
2014-02-13 17:02:11 -08:00
Wink Saville
bbba8211f9 Merge "Telephony: Handle DATA_CALL_LIST in DCC." 2014-02-13 23:37:04 +00:00
Derek Tan
ded7d1871d Fix the inconsistent name on @param and the real param.
Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
2014-02-13 14:49:26 -08:00
David Christie
5b1e07514a am d63b4314: Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233"
* commit 'd63b4314b85e982a1d70d4064af59851f476dd36':
  Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233
2014-02-13 12:28:48 -08:00
David Christie
d63b4314b8 Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233" 2014-02-13 20:25:01 +00:00
Craig Mautner
581cd3ccb7 am 6b1a93fc: am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '6b1a93fcb9551730583f1d3ea36dbfd5589859f3':
  Don't null class member before using it.
2014-02-13 11:27:04 -08:00
Craig Mautner
6b1a93fcb9 am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.
2014-02-13 19:24:23 +00:00
Craig Mautner
3816fa8bee am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
2014-02-13 19:21:41 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
2014-02-13 19:18:04 +00:00
Craig Mautner
a07939711d am 3e5ce55f: am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '3e5ce55fdeb67271d6a32042ab14cf523446cc09':
  Update DimLayer sizes on rotation.
2014-02-13 11:16:17 -08:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00
Craig Mautner
3e5ce55fde am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '4dd839756ce032cb6db613f08b9a28e5cd20bbe9':
  Update DimLayer sizes on rotation.
2014-02-13 19:13:02 +00:00
Craig Mautner
991146f8ef Don't null class member before using it.
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.

Fixes bug 12823709.

Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
2014-02-13 11:12:42 -08:00
Craig Mautner
4dd839756c am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit 'd14fa78dc84507fbdee8507205a3aff40296d328':
  Update DimLayer sizes on rotation.
2014-02-13 19:10:15 +00:00
Craig Mautner
d14fa78dc8 am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '0af894d25133890e7765e6c582b3ac4829070de8':
  Update DimLayer sizes on rotation.
2014-02-13 19:05:18 +00:00
Craig Mautner
0af894d251 Merge "Update DimLayer sizes on rotation." into klp-modular-dev 2014-02-13 19:02:02 +00:00
Craig Mautner
b660b9d8cf Update DimLayer sizes on rotation.
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.

Fixes bug 12780687.

Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
2014-02-13 10:59:16 -08:00
Guang Zhu
4f6f993e0f am 831663d8: Merge "reduce error logs from disconnected AccessibilityNodeInfo\'s"
* commit '831663d8fad6b31fb01b626dc2c15623690cbf37':
  reduce error logs from disconnected AccessibilityNodeInfo's
2014-02-13 10:48:23 -08:00
Guang Zhu
831663d8fa Merge "reduce error logs from disconnected AccessibilityNodeInfo's" 2014-02-13 18:45:25 +00:00
Dianne Hackborn
5c2fa68e7a am d39ccd0a: Merge "Start tracking radio up time."
* commit 'd39ccd0ad9cb562b0093eaf78a5273b000c0aa7a':
  Start tracking radio up time.
2014-02-13 09:58:44 -08:00
Dianne Hackborn
d39ccd0ad9 Merge "Start tracking radio up time." 2014-02-13 17:56:12 +00:00
Dianne Hackborn
e13c4c0b66 Start tracking radio up time.
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
2014-02-13 17:55:40 +00:00
Andreas Huber
62bb9cbf69 am d430354c: Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""
* commit 'd430354c6b6b3b39c35e8af90007414c325ccb2d':
  Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
2014-02-13 09:24:45 -08:00
Andreas Huber
d430354c6b Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."" 2014-02-13 17:22:49 +00:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
2014-02-13 17:22:33 +00:00
Andreas Huber
4c963d2319 am 04f0cab7: Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
* commit '04f0cab79d1499a5fe27330bb30dd94151b82880':
  Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
2014-02-13 08:46:18 -08:00
Andreas Huber
04f0cab79d Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 2014-02-13 16:35:03 +00:00
Derek Tan
51c66e72cf Merge "Expose sendEnvelope." into master-nova 2014-02-13 16:04:15 +00:00
Paul Lawrence
8e39736f91 Support default, pattern, pin and password encryption types
Java plumbing to expose methods to get/set encryption type in
IMountService, and hooking up of those methods to the Settings app
so the type is set correctly.

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I70c0ed72d11f5ab6f0958a7f9c101b6822b13baa
2014-02-13 15:46:24 +00:00
John Spurlock
a5bf29873e am f6475c72: Merge "Fix NPE in BaseStatusBar."
* commit 'f6475c7204759a57bc730e2bbaefb3448a77c141':
  Fix NPE in BaseStatusBar.
2014-02-13 06:54:02 -08:00
John Spurlock
f6475c7204 Merge "Fix NPE in BaseStatusBar." 2014-02-13 14:47:53 +00:00
John Spurlock
70cf4c104c Fix NPE in BaseStatusBar.
Bug:12996414
Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2
2014-02-13 09:39:14 -05:00
Narayan Kamath
40f12d9824 am 00515148: resolved conflicts for merge of 396b9e79 to master
* commit '005151484546fb0bf7f83c5a6ee065715230bf26':
  Telephony API extension v2
2014-02-13 03:59:35 -08:00
Narayan Kamath
0051514845 resolved conflicts for merge of 396b9e79 to master
Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
2014-02-13 11:48:48 +00:00
Dirk Dougherty
78d659870f am 5da502a5: am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '5da502a5b2a6eed6cf667c5d609818442a838c8a':
  Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:34:06 -08:00
Dirk Dougherty
5da502a5b2 am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit 'b9378d8108555c920880d7ec7ec4122b04fb2960':
  Doc change: add new samples TOC groups and landing pages.
2014-02-13 11:27:30 +00:00
Jean Chalard
84a3320507 Fix a crash where user data was not validated.
ExtractedText#partialStartOffset and #partialEndOffset are
from the app, that sets it as it sees fit. We need to
validate them so that we don't crash.
Still emit a warning if this is the case, as this is
not expected.

Bug: 9570771
Change-Id: Id9d6babd1620da39bf0e454b14d7ce716bd9d9d3
2014-02-13 19:14:24 +09:00
Wink Saville
396b9e792f am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
  Telephony API extension v2
2014-02-13 08:49:13 +00:00
Wink Saville
27bf55c815 am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
2014-02-13 08:44:55 +00:00
Baligh Uddin
420edea97e am 35fbb9f9: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '35fbb9f9e59795e233fb59cb5a87573e4669aebd':
  Import translations. DO NOT MERGE
2014-02-12 21:19:09 -08:00