Commit Graph

159057 Commits

Author SHA1 Message Date
Amit Mahajan
2a65688d40 Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
2014-12-17 15:42:56 -08:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Paul Jensen
ee8feae5d4 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 2014-12-17 18:34:57 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter.
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
2014-12-17 17:55:08 +00:00
Geoff Mendal
296aa92517 Import translations. DO NOT MERGE
automerge: 43741a8  -s ours

* commit '43741a8c8371e3a473794cc2d2a81dda777e8724':
  Import translations. DO NOT MERGE
2014-12-17 17:45:09 +00:00
Christoph Studer
e326af3cdb am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
automerge: 4328588

* commit '4328588cb532571c3b11867048d0972ff2e4d969':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 17:43:33 +00:00
Joe Fernandez
e8ce10dac8 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
automerge: ca27fb9

* commit 'ca27fb9711f24df8b88a41c8a360f57c7252ba79':
  docs: studio revision 21 update
2014-12-17 17:42:19 +00:00
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
2014-12-17 17:39:45 +00:00
Sungsoo Lim
47aafcd66c am 31d592dc: am cd45de8b: Missing Javadoc update while API review
automerge: d0b09b0

* commit 'd0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
  Missing Javadoc update while API review
2014-12-17 17:37:53 +00:00
Christopher Tate
52ab8613ea am 5c3e277f: Fix bad alarm delivery
automerge: be3206e

* commit 'be3206ecdce7aead184e8939a29ac7dd5f91931e':
  Fix bad alarm delivery
2014-12-17 17:36:46 +00:00
Geoff Mendal
43741a8c83 Import translations. DO NOT MERGE
Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2
Auto-generated-cl: translation import
2014-12-17 07:43:53 -08:00
Geoff Mendal
0de823704d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-17 15:22:30 +00:00
Geoff Mendal
e333ef546e Import translations. DO NOT MERGE
Change-Id: I52f334af6fd23d7e74c142dafe7bb431604602e5
Auto-generated-cl: translation import
2014-12-17 07:18:42 -08:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Geoff Mendal
8f0d3694f6 Import translations. DO NOT MERGE
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
2014-12-17 06:44:29 -08:00
Paul Jensen
b0575a24df Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 2014-12-17 12:54:16 +00:00
Christoph Studer
4328588cb5 am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 12:28:14 +00:00
Christoph Studer
3eff1e1f0e am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 12:22:33 +00:00
Christoph Studer
92c411b24e Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 2014-12-17 12:16:48 +00:00
Joe Fernandez
ca27fb9711 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit '6ff265cc882cd7512efcf4736b014ac27e77e5fe':
  docs: studio revision 21 update
2014-12-17 02:58:28 +00:00
Joe Fernandez
e479dc219f am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit 'f9ea93cdc9791c71f39caeda71d9abc9a91e89d5':
  docs: studio tools help monkey update
2014-12-17 02:58:25 +00:00
Joe Fernandez
93813012c0 am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit 'b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194':
  docs: help-adt link updates
2014-12-17 02:58:20 +00:00
Sungsoo Lim
d0b09b04b8 am 31d592dc: am cd45de8b: Missing Javadoc update while API review
* commit '31d592dc1cd9825c06c55562884be37f523350b3':
  Missing Javadoc update while API review
2014-12-17 02:40:50 +00:00
Joe Fernandez
6ff265cc88 am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit 'df916a89feba37f8d16bd61101d43be7d1667bf8':
  docs: studio revision 21 update
2014-12-17 02:28:18 +00:00
Joe Fernandez
f9ea93cdc9 am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit '80287e768fd40b61dc4e7b8a0394e1f732805dc9':
  docs: studio tools help monkey update
2014-12-17 02:28:13 +00:00
Joe Fernandez
df916a89fe Merge "docs: studio revision 21 update" into lmp-docs 2014-12-17 02:21:50 +00:00
Joe Fernandez
80287e768f Merge "docs: studio tools help monkey update" into lmp-docs 2014-12-17 02:20:15 +00:00
Joe Fernandez
b8e29d01fb am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit '740436b6767aac4c5409b3c9f42ca2606d5ed124':
  docs: help-adt link updates
2014-12-17 01:55:29 +00:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
Sungsoo Lim
31d592dc1c am cd45de8b: Missing Javadoc update while API review
* commit 'cd45de8ba336d689500c7a65a6a21611cc73d537':
  Missing Javadoc update while API review
2014-12-17 01:43:16 +00:00
Yorke Lee
d3836e9df4 Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 2014-12-17 00:17:02 +00:00
Sungsoo Lim
cd45de8ba3 Missing Javadoc update while API review
Bug: 18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
(cherry picked from commit 4e389e557e)
2014-12-16 23:20:04 +00:00
Nancy Chen
ab4f36c0df Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 2014-12-16 23:06:29 +00:00
Tim Murray
6c02facd83 Merge "Fix typo with register native allocation." into lmp-mr1-dev 2014-12-16 21:33:03 +00:00
Christopher Tate
be3206ecdc am 5c3e277f: Fix bad alarm delivery
* commit '5c3e277fb42bd799287936c5aee0d30fbcc7e65c':
  Fix bad alarm delivery
2014-12-16 21:04:56 +00:00
Christopher Tate
0dab4dc03d Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5a.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5a
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb4 from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
2014-12-16 12:54:49 -08:00
Nancy Chen
27d1c2d148 Pass onPostDialChar call back from Telephony to Telecom.
Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).

Bug: 18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803
2014-12-16 12:53:04 -08:00
Christopher Tate
5c3e277fb4 Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5a.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5a
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

Change-Id: I54c763775877de5b6eeb5617544aa6100bb17526
2014-12-16 12:48:47 -08:00
Pavel Zhamaitsiak
ec3f46a5ec Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 2014-12-16 19:27:37 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00
Tim Murray
c13160a5c1 Fix typo with register native allocation.
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
2014-12-16 10:13:05 -08:00
Adam Powell
67af29f6d6 Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 2014-12-16 18:01:04 +00:00
Adam Lesinski
f1f179a765 Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 2014-12-16 17:50:04 +00:00
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
2014-12-16 09:48:27 -08:00
ztenghui
d8ce65c9b5 Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 2014-12-16 17:45:02 +00:00
Andre Eisenbach
cd460538a4 Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev 2014-12-16 17:16:55 +00:00
Adam Lesinski
54de298c01 AAPT: Copy android:revisionCode to Splits
Bug:18706179
Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
2014-12-16 09:16:26 -08:00