OSDN Git Service
Sanket Padawe [Fri, 30 Jan 2015 02:59:09 +0000 (02:59 +0000)]
am
b33c8ad5: am
ef72625b: am
ab845180: Remove sim status and imei for secondary user.
* commit '
b33c8ad518796e7931cff157b06f791384d575d8':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 02:52:06 +0000 (02:52 +0000)]
am
ef72625b: am
ab845180: Remove sim status and imei for secondary user.
* commit '
ef72625b5243f2afc6b63553ce57f439801d6977':
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.
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 21:02:14 +0000 (21:02 +0000)]
am
922e602b: am
b749c336: 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 '
922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02':
Fyodor Kupolov [Thu, 29 Jan 2015 20:56:45 +0000 (20:56 +0000)]
am
b749c336: 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 '
b749c3368c0bd40a84026b44189e9119a0a27d15':
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':
Mike Lockwood [Thu, 29 Jan 2015 20:26:29 +0000 (20:26 +0000)]
Merge "Add MIDI to USB configuration developer setting"
Fyodor Kupolov [Thu, 29 Jan 2015 20:03:26 +0000 (20:03 +0000)]
am
d5363a1e: am
32f0525c: 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 '
d5363a1e3ca129fceed8a8b36de66611e4219819':
Fyodor Kupolov [Thu, 29 Jan 2015 19:56:48 +0000 (19:56 +0000)]
am
32f0525c: 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 '
32f0525c78a0777f4811d564b8990214fb157c0c':
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:36 +0000 (19:35 +0000)]
am
3c7ccfe4: am
c7e94b04: 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 '
3c7ccfe42ef03e82f912d3d871893436fc9d8102':
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:28:07 +0000 (19:28 +0000)]
am
c7e94b04: 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 '
c7e94b04360a130153fbe4212399b7a31858d316':
Added a check if a custom activity can be started
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:56:22 +0000 (18:56 +0000)]
am
5cf685fa: am
d5fcd896: am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
5cf685fa0072a391685defa0cb1585e91b465d44':
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:44:50 +0000 (18:44 +0000)]
am
d5fcd896: am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
d5fcd8965f894196578fae18613b3ab0f55c45bf':
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
Fyodor Kupolov [Wed, 28 Jan 2015 22:52:42 +0000 (22:52 +0000)]
Merge "Use primaryUserOnly attribute to disable CryptKeeper"
Pavel Zhamaitsiak [Wed, 28 Jan 2015 21:28:39 +0000 (21:28 +0000)]
resolved conflicts for merge of
23682809 to lmp-mr1-dev-plus-aosp
automerge:
d67ad20
* commit '
d67ad203db73eb986f105cf65c85467ad610b221':
Add button in "hidden" settings to flip "VoLTE Provisioned" flag
Pavel Zhamaitsiak [Wed, 28 Jan 2015 21:07:57 +0000 (13:07 -0800)]
resolved conflicts for merge of
23682809 to lmp-mr1-dev-plus-aosp
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
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:47:45 +0000 (15:47 +0000)]
am
318a0601: (-s ours) am
41d5cb0c: (-s ours) am
b5ad15ae: (-s ours) Import translations. DO NOT MERGE
* commit '
318a0601909b77ac68607cddc6d87eea5e32c3b6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:41:01 +0000 (15:41 +0000)]
am
41d5cb0c: (-s ours) am
b5ad15ae: (-s ours) Import translations. DO NOT MERGE
* commit '
41d5cb0cb32198dabd3a381074a68bcd0bb089a8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:39:55 +0000 (15:39 +0000)]
am
34f67e45: (-s ours) am
fcfec915: (-s ours) Import translations. DO NOT MERGE
* commit '
34f67e45319f398fb27e05d56918f951e6d44607':
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
Geoff Mendal [Wed, 28 Jan 2015 15:32:39 +0000 (15:32 +0000)]
am
fcfec915: (-s ours) Import translations. DO NOT MERGE
* commit '
fcfec9157119b28aa3daa8a9e2ce4476f18b4646':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:16:18 +0000 (07:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I225eeaac939f0e70352a6cef37001ba67640a776
Auto-generated-cl: translation import
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 23:33:04 +0000 (23:33 +0000)]
am
c0570dc4: am
271aa608: am
09c9e5eb: [DS] Correct the access method for telephony system property
* commit '
c0570dc45529ab5fa3cbfcf33454a57b5eb16a23':
[DS] Correct the access method for telephony system property
Mike Lockwood [Wed, 14 Jan 2015 18:51:50 +0000 (10:51 -0800)]
Add MIDI to USB configuration developer setting
Change-Id: I8b2beee25d58c2afb749d4328da6a653e3947aba
Fyodor Kupolov [Tue, 27 Jan 2015 19:59:00 +0000 (11:59 -0800)]
Use primaryUserOnly attribute to disable CryptKeeper
CryptKeeper activity is now disabled by using primaryUserOnly, instead of
broadcast receiver. This allows to avoid bringing up the process, when it
is not necessary.
Change-Id: I5d1f979b96093c6769f6c920b18517971835a7ad
Mick Lin [Tue, 27 Jan 2015 17:22:33 +0000 (17:22 +0000)]
am
271aa608: am
09c9e5eb: [DS] Correct the access method for telephony system property
* commit '
271aa6081c16fe27d4d96f91c9530c7ec7f8b052':
[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
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:49:33 +0000 (23:49 +0000)]
am
78ab1669: am
4ec2b9e6: am
9c167e92: Fix secondary data usage color regression.
* commit '
78ab16692baf21d1832e5376e79894c991abe85a':
Fix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 23:43:41 +0000 (23:43 +0000)]
am
4ec2b9e6: am
9c167e92: Fix secondary data usage color regression.
* commit '
4ec2b9e6160b386b70abb43ef2211ff0c6036345':
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.
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:29:13 +0000 (15:29 +0000)]
am
849673ed: (-s ours) am
26a3e949: (-s ours) Import translations. DO NOT MERGE automerge:
808ac6c -s ours
* commit '
849673eddda7924d33b18b25bf81758ffab7eebe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:29:12 +0000 (15:29 +0000)]
am
956fb8ca: (-s ours) Import translations. DO NOT MERGE automerge:
f916950 -s ours
* commit '
956fb8caf1af11d09e7370d236c70766114f95c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:20:04 +0000 (15:20 +0000)]
am
26a3e949: (-s ours) Import translations. DO NOT MERGE
automerge:
808ac6c -s ours
* commit '
808ac6cd14ee4061adc49d78f218a0f4142c153d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:19:55 +0000 (15:19 +0000)]
Import translations. DO NOT MERGE
automerge:
f916950 -s ours
* commit '
f916950094bca209768b71b63e260439614aa2eb':
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
Geoff Mendal [Mon, 26 Jan 2015 15:12:02 +0000 (07:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia7585d948d9ae85fa8345af5266a1c7744fddd83
Auto-generated-cl: translation import
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:20:34 +0000 (00:20 +0000)]
am
2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge:
a8b78f9
automerge:
d0f3755
* commit '
d0f3755197eef1a1c9a3b59765b1fc55c9115202':
Hide APNs with type="ia" and apn=""
Sanket Padawe [Sat, 24 Jan 2015 00:06:37 +0000 (00:06 +0000)]
am
2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge:
a8b78f9
* commit '
2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9':
Hide APNs with type="ia" and apn=""
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
Maurice Lam [Fri, 23 Jan 2015 17:44:05 +0000 (17:44 +0000)]
Merge "[LockScreen] Don't extract UI in ChooseLockPassword"
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:10:57 +0000 (11:10 +0000)]
am
400b8016: am
387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
automerge:
489d03c
* commit '
489d03c0c3f7e360e89100ed05d03d347eff1538':
Show removed user's data usage under its correct item
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:07:57 +0000 (11:07 +0000)]
am
400b8016: am
387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
* commit '
400b801664e59ef68072e231849a0e762edcd3c8':
Show removed user's data usage under its correct item
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
Maurice Lam [Wed, 21 Jan 2015 21:26:10 +0000 (21:26 +0000)]
Merge "[WifiSetup] Don't show menu during setup"
Fyodor Kupolov [Wed, 21 Jan 2015 20:52:23 +0000 (20:52 +0000)]
Merge "Reset RunningState on user related changes"
Fyodor Kupolov [Wed, 21 Jan 2015 18:33:52 +0000 (10:33 -0800)]
Reset RunningState on user related changes
RunningState now listens to user-related broadcasts and resets its state if
necessary.
Previously, user entry was visible even after the user had been removed.
Bug:
18696308
Change-Id: I499956c434d0d05bfa2a99b5e3e71ac73fe83297
Maurice Lam [Wed, 21 Jan 2015 00:05:35 +0000 (16:05 -0800)]
[LockScreen] Don't extract UI in ChooseLockPassword
Added flagnoextractui to the EditText in ChooseLockPasswordActivity
so that the instruction text is still visible on phone landscape.
Also wrapped it in a ScrollView because for smaller screen devices
the buttons may be squeezed to fit onto the screen if the ScrollView
is not there.
Bug:
18644582
Change-Id: Ib81aadb5377aacc8d85fdeee7e1809ad3ff71213
Maurice Lam [Thu, 18 Dec 2014 19:36:16 +0000 (11:36 -0800)]
[WifiSetup] Don't show menu during setup
Hides the menu during Wi-Fi setup -- we removed the menu button from
the UI but the menu can still be started with a hardware menu button.
This change removes that ability as well (during setup).
If you want to test on a device without a hardware menu button, you
can use the command
adb shell input keyevent 82
Change-Id: Ibe3cc679353a83c995e24680c3e7dc1575d32fe0
Sanket Padawe [Wed, 21 Jan 2015 17:23:18 +0000 (17:23 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge:
5f1eb2d automerge:
49c85c4
automerge:
e3acb02
* commit '
e3acb02bb55d69fc7f1a6351927cf9b2ade058f8':
Fixed data connection toggle crash in Settings.
Sanket Padawe [Wed, 21 Jan 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge:
5f1eb2d
automerge:
49c85c4
* commit '
49c85c4356ccfcb622e501b57d2893fc7e40bce0':
Fixed data connection toggle crash in Settings.
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 15:13:36 +0000 (15:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 21 Jan 2015 15:12:37 +0000 (07:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Jan 2015 15:08:37 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge:
2898f37 -s ours
automerge:
ea7411b -s ours
* commit '
ea7411bde612a87a5fddf5084110c84211dee34d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:08:30 +0000 (15:08 +0000)]
Import translations. DO NOT MERGE automerge:
75c5298 -s ours automerge:
9f62273 -s ours
automerge:
e272db9 -s ours
* commit '
e272db9505dbfc02dd1d4af208dc18536961443b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:03:37 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
2898f37 -s ours
* commit '
2898f37b65b956fb92a0dc67ea5c8afb2c959c6b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:03:29 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE automerge:
75c5298 -s ours
automerge:
9f62273 -s ours
* commit '
9f622737ecdc7a6a1ffba1ff76b8f9688d6b4198':
Import translations. DO NOT MERGE
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
OSDN Git Service
