OSDN Git Service
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
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
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
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.
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
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
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.
Bug:
19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
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
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
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
Robin Lee [Mon, 2 Feb 2015 11:22:01 +0000 (11:22 +0000)]
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
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.
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
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
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.
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
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':
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':
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':
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':
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':
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':
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
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':
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':
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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)
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
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
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
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.
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
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
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
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
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=""
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
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
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
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
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
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.
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
Geoff Mendal [Wed, 21 Jan 2015 14:59:26 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
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
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
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
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
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
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
Geoff Mendal [Mon, 19 Jan 2015 15:18:14 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
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
Geoff Mendal [Mon, 19 Jan 2015 15:14:45 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 15:07:29 +0000 (07:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Fri, 12 Dec 2014 18:48:03 +0000 (18:48 +0000)]
Show removed user's data usage under its correct item
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.
Bug:
18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
(cherry picked from commit
cd9b1507fbb6d9f443a4fb1bb8d9d58073c7e5d0)
Andre Eisenbach [Fri, 16 Jan 2015 02:33:50 +0000 (02:33 +0000)]
am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
906fc4172466e7ddd0886fa51b308ce4e69c266a':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:01:02 +0000 (02:01 +0000)]
Merge "Do not perform SDP during pairing" into lmp-mr1-dev
Maurice Lam [Thu, 15 Jan 2015 19:43:34 +0000 (11:43 -0800)]
[WifiSetup] Don't pan the window for IME
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.
Bug:
18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
Andre Eisenbach [Fri, 9 Jan 2015 22:52:47 +0000 (14:52 -0800)]
Do not perform SDP during pairing
As a result of commit
7de119c (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.
Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.
With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug
16964116.
Bug:
18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
Svetoslav [Thu, 15 Jan 2015 04:53:20 +0000 (04:53 +0000)]
am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 04:47:53 +0000 (04:47 +0000)]
Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 23:50:44 +0000 (23:50 +0000)]
am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
b57e1f29643e7454192973db738c13583b5c91a5':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Wed, 14 Jan 2015 23:50:43 +0000 (23:50 +0000)]
am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:20:04 +0000 (23:20 +0000)]
Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 23:18:13 +0000 (23:18 +0000)]
Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 22:48:27 +0000 (14:48 -0800)]
Fixed missing sim card lock setup in Security Settings.
Bug:
19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
Sanket Padawe [Wed, 14 Jan 2015 19:03:33 +0000 (11:03 -0800)]
Fixed data connection toggle UI issue due to local cache maintained.
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.
Bug:
18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
Geoff Mendal [Wed, 14 Jan 2015 14:24:51 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 14 Jan 2015 14:23:15 +0000 (14:23 +0000)]
am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
c51cfe3d8131084cebf674b06faa7360307b5425':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 14:23:07 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:16:00 +0000 (06:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
Lucky Zhang [Wed, 14 Jan 2015 11:59:54 +0000 (11:59 +0000)]
am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '
0325a85849ab7d08555e8ce1d95d6d239d41ef27':
[Settings] Wifi Setup responds to other connection state change
Svetoslav [Wed, 14 Jan 2015 02:48:29 +0000 (18:48 -0800)]
Settings not showing print jobs for a managed profile.
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.
bug:
18867406
Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
Lucky Zhang [Wed, 14 Jan 2015 01:36:45 +0000 (01:36 +0000)]
Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
Lucky Zhang [Tue, 13 Jan 2015 18:22:28 +0000 (10:22 -0800)]
[Settings] Wifi Setup responds to other connection state change
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).
Added logic to update the next ("skip") button state accordingly:
(1) "Skip" button should be enabled if
- wifi is not required and network is not required
- or wifi is not required, but network is required, and we have a
valid network connection
(2) "Skip" button should be disabled if
- wifi is required
- or wifi is not required, but network is required, and we have
no valid network connection
Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.
This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.
Bug:
18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
Wink Saville [Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Wink Saville [Tue, 13 Jan 2015 19:09:54 +0000 (19:09 +0000)]
Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
718c4d9
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:51 +0000 (19:09 +0000)]
am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 00:50:58 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Geoff Mendal [Mon, 12 Jan 2015 16:14:28 +0000 (16:14 +0000)]
am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
26310772872b327029cad560fa7b3e797b7980e9':
Import translations. DO NOT MERGE
OSDN Git Service
