Commit Graph

16458 Commits

Author SHA1 Message Date
Geoff Mendal
01492de48d Import translations. DO NOT MERGE
Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import
2015-03-16 05:44:27 -07:00
Geoff Mendal
dd07a86251 Import translations. DO NOT MERGE
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
2015-03-11 05:40:13 -07:00
Geoff Mendal
0d8c3df4d9 Import translations. DO NOT MERGE
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
2015-03-09 05:41:43 -07:00
Geoff Mendal
ba5c9ed183 Import translations. DO NOT MERGE
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
2015-03-04 05:41:50 -08:00
Geoff Mendal
130fc5caf8 Import translations. DO NOT MERGE
Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import
2015-03-02 05:55:15 -08:00
Sanket Padawe
49d660ac01 am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '4e838ca96ec1ebf1df3d75e729facf1fc012b431':
  Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 22:04:34 +00:00
Sanket Padawe
4e838ca96e Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev 2015-02-26 21:57:50 +00:00
Lifu Tang
6ff1a66c3c am 1bbd8814: Removed extra "your" from device only subtext
* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
  Removed extra "your" from device only subtext
2015-02-25 19:43:20 +00:00
Lifu Tang
1bbd8814c6 Removed extra "your" from device only subtext
Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
2015-02-24 15:25:27 -08:00
Sanket Padawe
8f77f435d8 Use TelephonyManager api to get SPN of sim to display in UI.
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:30:33 -08:00
Geoff Mendal
e991b5461f Import translations. DO NOT MERGE
Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import
2015-02-18 05:56:15 -08:00
Geoff Mendal
ae87c9075e Import translations. DO NOT MERGE
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
2015-02-16 06:14:52 -08:00
Sanket Padawe
0362e870b2 am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:47:52 +00:00
Sanket Padawe
7e21fa5ab4 Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Geoff Mendal
60d2ee8788 Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
2015-02-11 06:50:09 -08:00
Geoff Mendal
713e794dac Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
2015-02-09 06:31:43 -08:00
Geoff Mendal
40e66bce6c Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
2015-02-04 06:50:08 -08:00
Sanket Padawe
c1af278c9d Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge: 4decadb

* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
  Remove SimDialogActivity from recents app list.
2015-02-03 18:14:03 +00:00
Sanket Padawe
4decadbc44 Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev 2015-02-03 18:10:47 +00:00
Andres Morales
98d8a490d5 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
  Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 15:53:17 +00:00
Sanket Padawe
ffd96559e7 Remove SimDialogActivity from recents app list.
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Andres Morales
2e75203a6e Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Geoff Mendal
0bb8ba322e Import translations. DO NOT MERGE
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
2015-02-02 06:52:47 -08:00
Robin Lee
d16231de24 am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
  Repair broken keychain wifi_uid logic
2015-02-02 11:28:42 +00:00
Robin Lee
528c64e205 Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev 2015-02-02 11:22:02 +00:00
Sanket Padawe
f99df057ac Change to fit color name text on color selection spinner in settings.
automerge: a46c723

* commit 'a46c7236b6d71c861b49d20dd7515a9031764909':
  Change to fit color name text on color selection spinner in settings.
2015-01-30 19:50:33 +00:00
Sanket Padawe
a46c7236b6 Change to fit color name text on color selection spinner in settings.
Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
2015-01-30 11:23:22 -08:00
Robin Lee
635426b0a7 Repair broken keychain wifi_uid logic
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.

Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00
Sanket Padawe
ef72625b52 am ab845180: Remove sim status and imei for secondary user.
* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
  Remove sim status and imei for secondary user.
2015-01-30 02:41:47 +00:00
Sanket Padawe
ab84518009 Remove sim status and imei for secondary user.
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
Fyodor Kupolov
b749c3368c am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit 'c4dba4513b22a59911bfee358c6537f53bbb89a7':
2015-01-29 20:51:32 +00:00
Fyodor Kupolov
c4dba4513b am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
2015-01-29 20:46:13 +00:00
Fyodor Kupolov
b26bec1a6f am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1

* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
32f0525c78 am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit 'ac840cd91b77c0a37723723a9d6101beec53bcd1':
2015-01-29 19:51:01 +00:00
Fyodor Kupolov
ac840cd91b am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':
2015-01-29 19:42:06 +00:00
Fyodor Kupolov
5b2b7e1897 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
automerge: 3a3ff59

* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
2015-01-29 19:35:11 +00:00
Fyodor Kupolov
9e432a698b am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':
2015-01-29 19:29:20 +00:00
Fyodor Kupolov
c7e94b0436 am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '037c811844cb29a16e940e6fbeae721c12715684':
  Added a check if a custom activity can be started
2015-01-29 19:22:33 +00:00
Fyodor Kupolov
037c811844 am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '6355e1152ab29735721c40cfab6431a65341218b':
  Added a check if a custom activity can be started
2015-01-29 19:16:10 +00:00
Fyodor Kupolov
6355e1152a am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '77a2e3d62574be9cf0aae17231fd423a7a399984':
  Added a check if a custom activity can be started
2015-01-29 19:09:23 +00:00
Fyodor Kupolov
77a2e3d625 am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
  Added a check if a custom activity can be started
2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
  Added a check if a custom activity can be started
2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
  Added a check if a custom activity can be started
2015-01-29 18:45:51 +00:00
Fyodor Kupolov
d5fcd8965f am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '9fce9185513ebaf551ded3937c2767f9ed7bea0f':
  Added a check if a custom activity can be started
2015-01-29 18:31:45 +00:00
Fyodor Kupolov
9fce918551 am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit 'bd89b7b45ef9572c5e8523f0c8bd723958847df5':
  Added a check if a custom activity can be started
2015-01-29 18:24:21 +00:00
Fyodor Kupolov
bd89b7b45e am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
  Added a check if a custom activity can be started
2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0738bae916 am d7e93570: am f11f9f47: Added a check if a custom activity can be started
automerge: 57641a8

* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
2015-01-29 18:12:42 +00:00