OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Securit...
Zach Jang [Mon, 21 Sep 2015 19:05:36 +0000 (19:05 +0000)]
am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level...
Zach Jang [Mon, 21 Sep 2015 18:58:12 +0000 (18:58 +0000)]
am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings...
Zach Jang [Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)]
am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoDO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
Zach Jang [Mon, 14 Sep 2015 21:03:12 +0000 (14:03 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c

8 years agoam 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check...
Sanket Padawe [Wed, 29 Jul 2015 20:03:32 +0000 (20:03 +0000)]
am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '19336da3f729fcde00782ae60124b1219bd4bf2b':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special...
Sanket Padawe [Wed, 29 Jul 2015 19:49:53 +0000 (19:49 +0000)]
am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renam...
Sanket Padawe [Wed, 29 Jul 2015 19:25:06 +0000 (19:25 +0000)]
am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device...
Sanket Padawe [Wed, 29 Jul 2015 17:08:45 +0000 (17:08 +0000)]
am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:44:58 +0000 (16:44 +0000)]
am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:15:17 +0000 (16:15 +0000)]
am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoCheck for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]
Check for special char when renaming device for Wi-Fi direct.

Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef348c17a985eb51ef74469a32c3c938d)

9 years agoam 53eec9fa: Fix sim notifications.
Stuart Scott [Fri, 27 Mar 2015 00:34:46 +0000 (00:34 +0000)]
am 53eec9fa: Fix sim notifications.

* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
  Fix sim notifications.

9 years agoFix sim notifications.
Stuart Scott [Mon, 16 Mar 2015 19:17:56 +0000 (12:17 -0700)]
Fix sim notifications.

bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:56:44 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:44:27 +0000 (05:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:40:13 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 12:41:43 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:41:50 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:15 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import

9 years agoam 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI....
Sanket Padawe [Thu, 26 Feb 2015 22:04:34 +0000 (22:04 +0000)]
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.

9 years agoMerge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
Sanket Padawe [Thu, 26 Feb 2015 21:57:50 +0000 (21:57 +0000)]
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

9 years agoam 1bbd8814: Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:43:20 +0000 (19:43 +0000)]
am 1bbd8814: Removed extra "your" from device only subtext

* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
  Removed extra "your" from device only subtext

9 years agoRemoved extra "your" from device only subtext
Lifu Tang [Tue, 24 Feb 2015 23:25:27 +0000 (15:25 -0800)]
Removed extra "your" from device only subtext

Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2

9 years agoUse TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Tue, 24 Feb 2015 21:30:33 +0000 (13:30 -0800)]
Use TelephonyManager api to get SPN of sim to display in UI.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:56:15 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE

Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:14:52 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import

9 years agoam 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi...
Sanket Padawe [Thu, 12 Feb 2015 23:47:52 +0000 (23:47 +0000)]
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.

9 years agoData Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 20:39:34 +0000 (12:39 -0800)]
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.

Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 14:50:09 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import

9 years agoMerge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Sanket Padawe [Tue, 3 Feb 2015 18:14:03 +0000 (18:14 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge: 4decadb

* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
  Remove SimDialogActivity from recents app list.

9 years agoMerge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev

9 years agoam 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 15:53:17 +0000 (15:53 +0000)]
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter

* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
  Use getDefaultAdapter instead of getNfcAdapter

9 years agoRemove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.

Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b

9 years agoUse getDefaultAdapter instead of getNfcAdapter
Andres Morales [Mon, 2 Feb 2015 17:35:14 +0000 (09:35 -0800)]
Use getDefaultAdapter instead of getNfcAdapter

getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 14:52:47 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import

9 years agoam 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
Robin Lee [Mon, 2 Feb 2015 11:28:42 +0000 (11:28 +0000)]
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev

* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
  Repair broken keychain wifi_uid logic

9 years agoMerge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
Robin Lee [Mon, 2 Feb 2015 11:22:01 +0000 (11:22 +0000)]
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev

9 years agoChange to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:50:33 +0000 (19:50 +0000)]
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.

9 years agoChange to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:23:22 +0000 (11:23 -0800)]
Change to fit color name text on color selection spinner in settings.

Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51

9 years agoRepair broken keychain wifi_uid logic
Robin Lee [Fri, 30 Jan 2015 14:57:25 +0000 (14:57 +0000)]
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

9 years agoam ab845180: Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 02:41:47 +0000 (02:41 +0000)]
am ab845180: Remove sim status and imei for secondary user.

* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
  Remove sim status and imei for secondary user.

9 years agoRemove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 01:19:26 +0000 (17:19 -0800)]
Remove sim status and imei for secondary user.

Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8

9 years agoam c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s...
Fyodor Kupolov [Thu, 29 Jan 2015 20:51:32 +0000 (20:51 +0000)]
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':

9 years agoam b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4...
Fyodor Kupolov [Thu, 29 Jan 2015 20:46:13 +0000 (20:46 +0000)]
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':

9 years agoam 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b...
Fyodor Kupolov [Thu, 29 Jan 2015 20:39:11 +0000 (20:39 +0000)]
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':

9 years agoam a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
Fyodor Kupolov [Thu, 29 Jan 2015 20:34:29 +0000 (20:34 +0000)]
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':

9 years agoam ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if...
Fyodor Kupolov [Thu, 29 Jan 2015 19:51:01 +0000 (19:51 +0000)]
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':

9 years agoam f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activit...
Fyodor Kupolov [Thu, 29 Jan 2015 19:42:06 +0000 (19:42 +0000)]
am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae

* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':

9 years agoam a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
Fyodor Kupolov [Thu, 29 Jan 2015 19:39:59 +0000 (19:39 +0000)]
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

9 years agoam 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be...
Fyodor Kupolov [Thu, 29 Jan 2015 19:35:11 +0000 (19:35 +0000)]
am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae

* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':

9 years agoam d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge...
Fyodor Kupolov [Thu, 29 Jan 2015 19:29:20 +0000 (19:29 +0000)]
am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':

9 years agoam 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am...
Fyodor Kupolov [Thu, 29 Jan 2015 19:22:33 +0000 (19:22 +0000)]
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

9 years agoam 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s...
Fyodor Kupolov [Thu, 29 Jan 2015 19:16:10 +0000 (19:16 +0000)]
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

9 years agoam 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4...
Fyodor Kupolov [Thu, 29 Jan 2015 19:09:23 +0000 (19:09 +0000)]
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

9 years agoam 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b...
Fyodor Kupolov [Thu, 29 Jan 2015 19:03:01 +0000 (19:03 +0000)]
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

9 years agoam a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
Fyodor Kupolov [Thu, 29 Jan 2015 18:57:22 +0000 (18:57 +0000)]
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

9 years agoam d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a...
Fyodor Kupolov [Thu, 29 Jan 2015 18:50:43 +0000 (18:50 +0000)]
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

9 years agoam 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity...
Fyodor Kupolov [Thu, 29 Jan 2015 18:45:51 +0000 (18:45 +0000)]
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

9 years agoam 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added...
Fyodor Kupolov [Thu, 29 Jan 2015 18:31:45 +0000 (18:31 +0000)]
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

9 years agoam bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if...
Fyodor Kupolov [Thu, 29 Jan 2015 18:24:21 +0000 (18:24 +0000)]
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

9 years agoam 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activit...
Fyodor Kupolov [Thu, 29 Jan 2015 18:19:06 +0000 (18:19 +0000)]
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

9 years agoam d7e93570: am f11f9f47: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:42 +0000 (18:12 +0000)]
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

9 years agoam e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:04 +0000 (18:12 +0000)]
am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started

* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
  Added a check if a custom activity can be started

9 years agoam 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be...
Fyodor Kupolov [Thu, 29 Jan 2015 18:09:29 +0000 (18:09 +0000)]
am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started

* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started

9 years agoam d7e93570: am f11f9f47: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:02:40 +0000 (18:02 +0000)]
am d7e93570: am f11f9f47: Added a check if a custom activity can be started

* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started

9 years agoam e8e7b9b3: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:01:00 +0000 (18:01 +0000)]
am e8e7b9b3: Added a check if a custom activity can be started

* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
  Added a check if a custom activity can be started

9 years agoam f11f9f47: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 17:55:47 +0000 (17:55 +0000)]
am f11f9f47: Added a check if a custom activity can be started

* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
  Added a check if a custom activity can be started

9 years agoMerge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp...
Pavel Zhamaitsiak [Wed, 28 Jan 2015 19:04:58 +0000 (19:04 +0000)]
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
automerge: 882000f

* commit '882000f39b91d908cc5e83cec47e7ce630d68e1a':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag

9 years agoMerge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp...
Pavel Zhamaitsiak [Wed, 28 Jan 2015 18:59:18 +0000 (18:59 +0000)]
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev

9 years agoam b5ad15ae: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:33:32 +0000 (15:33 +0000)]
am b5ad15ae: (-s ours) Import translations. DO NOT MERGE

* commit 'b5ad15ae2476eaf53694c3c87df45df7f7773198':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 14:59:36 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iec49e91adb1c662c0c59081415a2bd563b2e1d96
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 14:47:47 +0000 (06:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import

9 years agoAdded a check if a custom activity can be started
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
Added a check if a custom activity can be started

AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e49facb0fc4dd11d68645b4fe8d4c88)

9 years agoAdded a check if a custom activity can be started
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
Added a check if a custom activity can be started

AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2

9 years agoam 09c9e5eb: [DS] Correct the access method for telephony system property
Mick Lin [Tue, 27 Jan 2015 17:17:18 +0000 (17:17 +0000)]
am 09c9e5eb:     [DS] Correct the access method for telephony system property

* commit '09c9e5eb5d8d223b3b3faa29ce8b03f8873d0553':
  [DS] Correct the access method for telephony system property

9 years ago [DS] Correct the access method for telephony system property
Mick Lin [Thu, 22 Jan 2015 09:28:43 +0000 (17:28 +0800)]
[DS] Correct the access method for telephony system property

    Bug: 18675498

    Review: https://partner-android-review.git.corp.google.com/#/c/198822

Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7

9 years agoam 9c167e92: Fix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 23:38:44 +0000 (23:38 +0000)]
am 9c167e92: Fix secondary data usage color regression.

* commit '9c167e92df8b42c5ff5955c1186cacd4dc44914d':
  Fix secondary data usage color regression.

9 years agoFix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 22:15:59 +0000 (15:15 -0700)]
Fix secondary data usage color regression.

Show overall usage with a 50% transparency when looking at a
specific app details page.  (Otherwise you can't tell them apart.)

Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3

9 years agoam 26a3e949: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:16:31 +0000 (15:16 +0000)]
am 26a3e949: (-s ours) Import translations. DO NOT MERGE

* commit '26a3e949c591fe2a51a84833fa1e835ea805efcb':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:55:29 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4b0c7abc349b040b61fa2a08fc20c7ef7dcb4aca
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:43:26 +0000 (06:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import

9 years agoMerge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
Sanket Padawe [Sat, 24 Jan 2015 00:02:33 +0000 (00:02 +0000)]
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
automerge: a8b78f9

* commit 'a8b78f96ae9e06759a38c19fa625cb980d578c35':
  Hide APNs with type="ia" and apn=""

9 years agoMerge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
Sanket Padawe [Fri, 23 Jan 2015 23:55:12 +0000 (23:55 +0000)]
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev

9 years agoHide APNs with type="ia" and apn=""
Sanket Padawe [Fri, 23 Jan 2015 17:53:48 +0000 (09:53 -0800)]
Hide APNs with type="ia" and apn=""

APNs with type="ia" and no APN address (apn="") are used to
prevent an initial attach APN from being sent to the modem. This
in turn prevents the LTE ESM information procedure from being
used during the LTE attach. These APNs are meaningless and confusing to end users - so this
change hides them from the APN list.

Bug: 19101183
Change-Id: I9aacf787f8c175a301ad546f972f8972aad2a6b3

9 years agoam 387597a2: Merge "Show removed user\'s data usage under its correct item" into...
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:01:09 +0000 (11:01 +0000)]
am 387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev

* commit '387597a2560826a22dc18cc78ffaed75f9672ff2':
  Show removed user's data usage under its correct item

9 years agoMerge "Show removed user's data usage under its correct item" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 10:57:13 +0000 (10:57 +0000)]
Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev

9 years agoAdd button in "hidden" settings to flip "VoLTE Provisioned" flag
Pavel Zhamaitsiak [Thu, 22 Jan 2015 02:25:14 +0000 (18:25 -0800)]
Add button in "hidden" settings to flip "VoLTE Provisioned" flag

VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e

9 years agoMerge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 21 Jan 2015 17:13:05 +0000 (17:13 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
automerge: 5f1eb2d

* commit '5f1eb2d72a1a7dfb42398176c24445a906cd380c':
  Fixed data connection toggle crash in Settings.

9 years agoMerge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 21 Jan 2015 17:08:45 +0000 (17:08 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 21 Jan 2015 14:59:26 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:58:59 +0000 (14:58 +0000)]
Import translations. DO NOT MERGE
automerge: 75c5298  -s ours

* commit '75c5298e06eb54dbc96ccc17696ba8e1c8316ee7':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:55:59 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7b3a724e783b9e279200e43f876d3a30ee813fc0
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:44:20 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import

9 years agoMerge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
Maurice Lam [Tue, 20 Jan 2015 21:26:38 +0000 (21:26 +0000)]
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
automerge: ff649c6

* commit 'ff649c601d0e2caa5d939f09c7183a8a4d8db60b':
  [WifiSetup] Don't pan the window for IME

9 years agoMerge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev
Maurice Lam [Tue, 20 Jan 2015 21:21:40 +0000 (21:21 +0000)]
Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev

9 years agoFixed data connection toggle crash in Settings.
Sanket Padawe [Tue, 20 Jan 2015 18:36:15 +0000 (10:36 -0800)]
Fixed data connection toggle crash in Settings.

Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 19 Jan 2015 15:18:14 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoam 69b87f79: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:14:52 +0000 (15:14 +0000)]
am 69b87f79: (-s ours) Import translations. DO NOT MERGE

* commit '69b87f79256a5edacb90ab7ccce069737ca59b3d':
  Import translations. DO NOT MERGE