Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,844 Commits 3 Branches 0 Tags
1e63f414ea7ecbe712e8b0dc493bb329f93e6031
Commit Graph

161844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
1e63f414ea am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '776164da3cd5f64de009f75f9530953fadd8626a':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:48:48 +00:00
Sanket Padawe
776164da3c Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 2014-12-18 00:44:08 +00:00
Winson Chung
9f48e3160f am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit 'e2ed349cfa838223160e83be7df144e2265cdce4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:18:53 +00:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00
Amit Mahajan
eac6db511b am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 
* commit 'e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
 2014-12-18 00:01:30 +00:00
Amit Mahajan
e69b5d68c2 Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 2014-12-17 23:58:11 +00:00
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
Raph Levien
3ac280c93b am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '078ce5fc820d4744f5b1af384e427cedb7e90643':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:14:13 +00:00
Raph Levien
510042688a am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 
* commit '0b6e78d9971c61877ca312801fd8258aec352231':
  Preserve leading "+" in phone numbers
 2014-12-17 23:09:59 +00:00
Raph Levien
078ce5fc82 Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 2014-12-17 23:08:51 +00:00
Raph Levien
0b6e78d997 Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 2014-12-17 23:04:17 +00:00
Raph Levien
047e816fe2 Revert "Change Linkify leniency to VALID" 
This reverts commit 9dfe86d410.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
 2014-12-17 14:31:39 -08:00
Sanket Padawe
d6d84bb856 Removing unwanted tethering profiles from config.xml 
Bug: 18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
 2014-12-17 14:19:58 -08:00
Chris Craik
93492d1a47 am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit 'c748832f759cd7a390a32890530e854b9711eb7c':
  Revert overdraw avoidance visualization change
 2014-12-17 22:11:19 +00:00
Chris Craik
c748832f75 Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 2014-12-17 22:07:04 +00:00
Jinsuk Kim
08ca1694eb am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
* commit 'fadfe708e6f0c74890fe2b3292a91570f3049215':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:20:08 +00:00
Jinsuk Kim
fadfe708e6 Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 2014-12-17 21:15:20 +00:00
Jeff Davidson
0b3718d6b1 Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 
automerge: cc4f183

* commit 'cc4f18309a2a576b282a399a97a9d64d66713b89':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:52:19 +00:00
Jeff Davidson
cc4f18309a Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 2014-12-17 20:51:12 +00:00
Cheuksan Wang
f1b64b4bb8 am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit 'e8ea164596b3ab2309d7b99fa52aecd056e50e24':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:45:03 +00:00
Cheuksan Wang
e8ea164596 Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 2014-12-17 20:38:09 +00:00
John Spurlock
caba360367 am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'e7f301a05344376f9065ef09e3b3ef360469bcb3':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:18:03 +00:00
John Spurlock
e7f301a053 Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 2014-12-17 20:13:02 +00:00
smain@google.com
2448afdb72 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 
automerge: c6de288

* commit 'c6de288eabfcb6b3623fb6a6c3dba1071d7e0c78':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:00:48 +00:00
smain@google.com
c6de288eab am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 
automerge: 2a53e24

* commit '2a53e24e10654b7f5667899c8a110ef6742c79e3':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 19:57:42 +00:00
Chris Craik
ef8d6f272a Revert overdraw avoidance visualization change 
bug:18787324

Partial revert of 23d307c8d8.

Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
 2014-12-17 11:21:02 -08:00
Winson Chung
7a96f3c917 Removing context ref from AppWidgetHost. (Bug 18769791) 
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
 2014-12-17 11:07:24 -08:00
Jorim Jaggi
4a5129c83b am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit 'c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
  Fix colored icons in doze mode
 2014-12-17 19:04:42 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Nicolas Prevot
47cbcd7740 am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
* commit 'f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 18:58:26 +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
eece333955 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 
automerge: ee8feae

* commit 'ee8feae5d4624e6759e264cc80eac28b0d0af20f':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:36:31 +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
smain@google.com
2a53e24e10 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
automerge: b834c72

* commit 'b834c72e61943fda18153bb42b3c8bd80d604b0b':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 18:03:39 +00:00
smain@google.com
b834c72e61 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
* commit '4842228377a292698b232f18706ce54cb7f7cc32':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 17:59:00 +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
525833bea3 am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours 
* commit '296aa925171b27a87b427575a9a462dc8a8620b2':
  Import translations. DO NOT MERGE
 2014-12-17 17:54:19 +00:00
smain@google.com
4842228377 Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 2014-12-17 17:52:08 +00:00
smain@google.com
58bd02739e make hidden text hidden with negative indent to avoid horizontal scroll 
bug: 18721145

Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
 2014-12-17 09:50:26 -08:00
Christoph Studer
3c0abd4087 am e326af3c: am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge: 4328588 
* commit 'e326af3cdba9f8e2a1a8626dc48524410d84e6fa':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:50:04 +00:00
Joe Fernandez
fa7d86a115 am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'e8ce10dac8db89387d83554a8e3909cec560536a':
  docs: studio revision 21 update
 2014-12-17 17:49:59 +00:00
Joe Fernandez
425663b5a0 am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge: e479dc2 
automerge: c79d5e2

* commit 'c79d5e29de3ba4259e3c87650c77c3e87507cab0':
  docs: studio tools help monkey update
 2014-12-17 17:48:33 +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
Joe Fernandez
a5142ca4d4 am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit '85787187fca274303412a48e1fa91f7e7388ce94':
  docs: help-adt link updates
 2014-12-17 17:44:30 +00:00
Sungsoo Lim
c502394816 am 47aafcd6: am 31d592dc: am cd45de8b: Missing Javadoc update while API review automerge: d0b09b0 
* commit '47aafcd66c9c703fcfd301ec850e433f40e4b190':
  Missing Javadoc update while API review
 2014-12-17 17:44:25 +00:00
Christopher Tate
6f3be11181 am 52ab8613: am 5c3e277f: Fix bad alarm delivery automerge: be3206e 
* commit '52ab8613ea2556ad9dd5c786e0cf43eb5a4e24c9':
  Fix bad alarm delivery
 2014-12-17 17:44:21 +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