10628 Commits

Author SHA1 Message Date
Dan Sandler
d23fa0f650 am 97a7fbfb: am 621fa30c: am 9eef8749: am 2200f86f: All (er, L) is finally revealed.
* commit '97a7fbfbe401b471903ba0d07f3701aed5e3ab4a':
  All (er, L) is finally revealed.
2014-10-08 18:50:22 +00:00
Dan Sandler
621fa30c54 am 9eef8749: am 2200f86f: All (er, L) is finally revealed.
* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
  All (er, L) is finally revealed.
2014-10-08 18:25:57 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed.
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
2014-10-08 18:16:01 +00:00
Geoff Mendal
e95638f5ec Import translations. DO NOT MERGE
Change-Id: I2d79cf76ea811b54f906bf6d76d9887b804dcd4e
Auto-generated-cl: translation import
2014-10-08 08:56:53 -07:00
Geoff Mendal
639890256d Import translations. DO NOT MERGE
Change-Id: Ifd63055fca79d18a2d44d914d0bccfbf8d81ebac
Auto-generated-cl: translation import
2014-10-08 08:40:03 -07:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed.
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
2014-10-08 04:01:01 +00:00
Amit Mahajan
ec20fc9273 am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3
* commit '190202f7e586e02e098b330ac84eb441a56005d3':
  Sms7BitEncodingTranslator
2014-10-07 05:23:20 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
2014-10-06 21:57:42 -07:00
Amit Mahajan
69555fc2c8 Merge "Sms7BitEncodingTranslator" into lmp-dev 2014-10-07 01:20:27 +00:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
2014-10-07 01:02:04 +00:00
Amit Mahajan
97221b97ee am 40f43c7a: am 384ff9ef: am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '40f43c7aea1bf96846c47ee8fb6766763110d2fc':
  ATT: Call does not establish to  '*1'
2014-10-06 19:44:29 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
2014-10-06 19:39:50 +00:00
Amit Mahajan
384ff9ef5d am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
  ATT: Call does not establish to  '*1'
2014-10-06 19:28:53 +00:00
Amit Mahajan
15c581fa4c am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '17d7c79650664c7a112ab175cb2329d2062f4d1e':
  ATT: Call does not establish to  '*1'
2014-10-06 19:23:20 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
2014-10-06 19:22:53 +00:00
Geoff Mendal
ce2b1e8cfa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 19:21:53 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
Amit Mahajan
17d7c79650 Merge "ATT: Call does not establish to '*1'" into lmp-dev 2014-10-06 19:17:06 +00:00
Geoff Mendal
7123638898 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 19:10:25 +00:00
Geoff Mendal
2c54b25580 Import translations. DO NOT MERGE
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
2014-10-06 12:08:45 -07:00
Bing Gao
1c9bc00870 ATT: Call does not establish to '*1'
Bug: 17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
2014-10-06 19:00:44 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
419c63bf0e Import translations. DO NOT MERGE
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
2014-10-06 11:46:22 -07:00
Geoff Mendal
74a72f723a Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
2014-10-06 11:34:20 -07:00
Baligh Uddin
2c5d702cbd Import translations. DO NOT MERGE
Change-Id: I0a797e49214f1d398dca7889f22cff58825a2e53
Auto-generated-cl: translation import
2014-10-04 12:02:13 -07:00
Baligh Uddin
828c0a6616 Import translations. DO NOT MERGE
Change-Id: Ic1a4092997c1593345815556c9a1d6126769e4b5
Auto-generated-cl: translation import
2014-10-04 11:45:08 -07:00
Baligh Uddin
3613b5bfec Import translations. DO NOT MERGE
Change-Id: Id8ff929363bf25f7a8971563db3fc39225016faa
Auto-generated-cl: translation import
2014-10-04 11:36:29 -07:00
Vinod Krishnan
bb6f69b262 am 29378992: am f2ab6612: am 4ff457e0: System dialog looked weird on LMP
* commit '29378992013a05984ad36b7d8f2ac8d59a9a8a3c':
  System dialog looked weird on LMP
2014-10-04 15:45:15 +00:00
Vinod Krishnan
2937899201 am f2ab6612: am 4ff457e0: System dialog looked weird on LMP
* commit 'f2ab6612c95254c24f29a7fbc3109ecbbbe3f310':
  System dialog looked weird on LMP
2014-10-04 00:04:31 +00:00
Vinod Krishnan
f2ab6612c9 am 4ff457e0: System dialog looked weird on LMP
* commit '4ff457e07ed1b719250a10f807294fb1cc2d7431':
  System dialog looked weird on LMP
2014-10-03 23:57:26 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
Vinod Krishnan
4ff457e07e System dialog looked weird on LMP
Bug: 17785416, 17473800
Change-Id: I28dff1c0f3263571ef00786b2b6935f2dd216ddf
2014-10-03 15:15:19 -07:00
John Spurlock
8005c38e17 am e02d4b0e: am 0dbc6f32: am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'e02d4b0ef382415c976f7aa1a398c8d61fcd5216':
  Update framework icons for media & alarm streams.
2014-10-03 14:18:39 +00:00
John Spurlock
e02d4b0ef3 am 0dbc6f32: am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit '0dbc6f328e252a12a72ade677e9dcb11ef0982e5':
  Update framework icons for media & alarm streams.
2014-10-03 14:10:32 +00:00
John Spurlock
0dbc6f328e am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit '7da91cc21f0f77277d76001af9133de3923ba686':
  Update framework icons for media & alarm streams.
2014-10-03 14:05:47 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:29 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
2014-10-02 20:11:37 -04:00
Etan Cohen
8e897c5262 am 6e5f114f: am 6062a09d: Enable VoLTE on VZW 311/480
* commit '6e5f114f524324eb3a94c7912948164576d148f0':
  Enable VoLTE on VZW 311/480
2014-10-02 19:44:49 +00:00
Paul West
746bf3b9b4 am 98bb023a: am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
* commit '98bb023a8971d4744fbfc504118b09b04e181e38':
  [DS] DSDS support for widget view
2014-10-02 19:42:36 +00:00
Etan Cohen
6e5f114f52 am 6062a09d: Enable VoLTE on VZW 311/480
* commit '6062a09dbc1c26cacb6fa2dac7467ae826b70229':
  Enable VoLTE on VZW 311/480
2014-10-02 19:23:15 +00:00
Etan Cohen
6062a09dbc Enable VoLTE on VZW 311/480
Change-Id: I81188c2a7dfe4657d35048f7b4e76fe01803f9a1
2014-10-02 19:13:19 +00:00
Paul West
98bb023a89 am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
* commit 'c55a2547a1462a1bf9e1b3c4e102d4d61877d7fe':
  [DS] DSDS support for widget view
2014-10-02 15:34:09 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
Benson Huang
cea4f7acb4 am 19766ff9: am 398de894: am 981258e5: [FM] Add FM permission to support FM radio app
* commit '19766ff9381a37a55727edbeafa6613777d9bdb2':
  [FM] Add FM permission to support FM radio app
2014-10-02 13:38:43 +00:00
Alan Viverette
f5c178bdd3 am 6cb68b46: am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev
* commit '6cb68b4637db7cf59e0278d532a1160ff6adc71e':
  Remove Holo fast scroll preview from Material overlay themes
2014-10-02 13:38:32 +00:00
ztenghui
79ef48239d am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
* commit '3fb458653e50e350e9e377d071cb79573d531748':
  + correcting shadow visual appearance (b/17610926)
2014-10-02 13:37:47 +00:00
Benson Huang
19766ff938 am 398de894: am 981258e5: [FM] Add FM permission to support FM radio app
* commit '398de8943b59b50d79ca75d4e811756a97d180f1':
  [FM] Add FM permission to support FM radio app
2014-10-02 02:22:30 +00:00
Benson Huang
398de8943b am 981258e5: [FM] Add FM permission to support FM radio app
* commit '981258e5f957899b034a98ebebade1f0366f506a':
  [FM] Add FM permission to support FM radio app
2014-10-02 02:14:14 +00:00