Fyodor Kupolov
e3904c4f09
am e8e7b9b3: Added a check if a custom activity can be started
...
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
Added a check if a custom activity can be started
2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3
am f11f9f47: Added a check if a custom activity can be started
...
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
Added a check if a custom activity can be started
2015-01-29 17:55:47 +00:00
Fyodor Kupolov
290e137456
Merge "Use primaryUserOnly attribute to disable CryptKeeper"
2015-01-28 22:52:46 +00:00
Pavel Zhamaitsiak
dd8aa9d3d2
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
...
automerge: d67ad20
2015-01-28 21:28:39 +00:00
Pavel Zhamaitsiak
d67ad203db
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
2015-01-28 13:07:57 -08:00
Pavel Zhamaitsiak
236828098c
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
...
automerge: 882000f
2015-01-28 19:04:58 +00:00
Pavel Zhamaitsiak
882000f39b
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
2015-01-28 18:59:18 +00:00
Geoff Mendal
ab4068c387
am 318a0601: (-s ours) am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
...
* commit '318a0601909b77ac68607cddc6d87eea5e32c3b6':
Import translations. DO NOT MERGE
2015-01-28 15:47:45 +00:00
Geoff Mendal
318a060190
am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
...
* commit '41d5cb0cb32198dabd3a381074a68bcd0bb089a8':
Import translations. DO NOT MERGE
2015-01-28 15:41:01 +00:00
Geoff Mendal
ff41a846a4
am 34f67e45: (-s ours) am fcfec915: (-s ours) Import translations. DO NOT MERGE
...
* commit '34f67e45319f398fb27e05d56918f951e6d44607':
Import translations. DO NOT MERGE
2015-01-28 15:39:55 +00:00
Geoff Mendal
41d5cb0cb3
am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b5ad15ae2476eaf53694c3c87df45df7f7773198':
Import translations. DO NOT MERGE
2015-01-28 15:33:32 +00:00
Geoff Mendal
34f67e4531
am fcfec915: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fcfec9157119b28aa3daa8a9e2ce4476f18b4646':
Import translations. DO NOT MERGE
2015-01-28 15:32:39 +00:00
Geoff Mendal
89b056c10f
Import translations. DO NOT MERGE
...
Change-Id: I225eeaac939f0e70352a6cef37001ba67640a776
Auto-generated-cl: translation import
2015-01-28 07:16:18 -08:00
Geoff Mendal
fcfec91571
Import translations. DO NOT MERGE
...
Change-Id: Iec49e91adb1c662c0c59081415a2bd563b2e1d96
Auto-generated-cl: translation import
2015-01-28 06:59:36 -08:00
Geoff Mendal
b5ad15ae24
Import translations. DO NOT MERGE
...
Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import
2015-01-28 06:47:47 -08:00
Fyodor Kupolov
f11f9f47d3
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 07ab95c43e
2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381
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
2015-01-28 05:23:07 -05:00
Mick Lin
005f972b14
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
2015-01-27 23:33:04 +00:00
Mike Lockwood
72ce6f68ed
Add MIDI to USB configuration developer setting
...
Change-Id: I8b2beee25d58c2afb749d4328da6a653e3947aba
2015-01-27 15:31:05 -08:00
Fyodor Kupolov
19280af592
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
2015-01-27 12:07:16 -08:00
Mick Lin
c0570dc455
am 271aa608: am 09c9e5eb: [DS] Correct the access method for telephony system property
...
* commit '271aa6081c16fe27d4d96f91c9530c7ec7f8b052':
[DS] Correct the access method for telephony system property
2015-01-27 17:22:33 +00:00
Mick Lin
271aa6081c
am 09c9e5eb: [DS] Correct the access method for telephony system property
...
* commit '09c9e5eb5d8d223b3b3faa29ce8b03f8873d0553':
[DS] Correct the access method for telephony system property
2015-01-27 17:17:18 +00:00
Mick Lin
09c9e5eb5d
[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
2015-01-27 05:30:47 +00:00
Jeff Sharkey
971dd3bd97
am 78ab1669: am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.
...
* commit '78ab16692baf21d1832e5376e79894c991abe85a':
Fix secondary data usage color regression.
2015-01-26 23:49:33 +00:00
Jeff Sharkey
78ab16692b
am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.
...
* commit '4ec2b9e6160b386b70abb43ef2211ff0c6036345':
Fix secondary data usage color regression.
2015-01-26 23:43:41 +00:00
Jeff Sharkey
4ec2b9e616
am 9c167e92: Fix secondary data usage color regression.
...
* commit '9c167e92df8b42c5ff5955c1186cacd4dc44914d':
Fix secondary data usage color regression.
2015-01-26 23:38:44 +00:00
Jeff Sharkey
9c167e92df
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
2015-01-26 14:18:19 -08:00
Geoff Mendal
5d7e784108
am 849673ed: (-s ours) am 26a3e949: (-s ours) Import translations. DO NOT MERGE automerge: 808ac6c -s ours
...
* commit '849673eddda7924d33b18b25bf81758ffab7eebe':
Import translations. DO NOT MERGE
2015-01-26 15:29:13 +00:00
Geoff Mendal
637186e12b
am 956fb8ca: (-s ours) Import translations. DO NOT MERGE automerge: f916950 -s ours
...
* commit '956fb8caf1af11d09e7370d236c70766114f95c1':
Import translations. DO NOT MERGE
2015-01-26 15:29:12 +00:00
Geoff Mendal
849673eddd
am 26a3e949: (-s ours) Import translations. DO NOT MERGE
...
automerge: 808ac6c
2015-01-26 15:20:04 +00:00
Geoff Mendal
956fb8caf1
Import translations. DO NOT MERGE
...
automerge: f916950
2015-01-26 15:19:55 +00:00
Geoff Mendal
808ac6cd14
am 26a3e949: (-s ours) Import translations. DO NOT MERGE
...
* commit '26a3e949c591fe2a51a84833fa1e835ea805efcb':
Import translations. DO NOT MERGE
2015-01-26 15:16:31 +00:00
Geoff Mendal
854e632aad
Import translations. DO NOT MERGE
...
Change-Id: Ia7585d948d9ae85fa8345af5266a1c7744fddd83
Auto-generated-cl: translation import
2015-01-26 07:12:02 -08:00
Geoff Mendal
f916950094
Import translations. DO NOT MERGE
...
Change-Id: I4b0c7abc349b040b61fa2a08fc20c7ef7dcb4aca
Auto-generated-cl: translation import
2015-01-26 06:55:29 -08:00
Geoff Mendal
26a3e949c5
Import translations. DO NOT MERGE
...
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
2015-01-26 06:43:26 -08:00
Sanket Padawe
a901b3d383
am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9
...
automerge: d0f3755
2015-01-24 00:20:34 +00:00
Sanket Padawe
d0f3755197
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=""
2015-01-24 00:06:37 +00:00
Sanket Padawe
2b6ab796f1
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
...
automerge: a8b78f9
2015-01-24 00:02:33 +00:00
Sanket Padawe
a8b78f96ae
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
2015-01-23 23:55:13 +00:00
Sanket Padawe
a7f21a3100
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
2015-01-23 09:53:48 -08:00
Maurice Lam
21f6db9184
Merge "[LockScreen] Don't extract UI in ChooseLockPassword"
2015-01-23 17:44:05 +00:00
Zoltan Szatmary-Ban
dee761df86
am 400b8016: am 387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
...
automerge: 489d03c
2015-01-23 11:10:57 +00:00
Zoltan Szatmary-Ban
489d03c0c3
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
2015-01-23 11:07:57 +00:00
Zoltan Szatmary-Ban
400b801664
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
2015-01-23 11:01:09 +00:00
Zoltan Szatmary-Ban
387597a256
Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev
2015-01-23 10:57:14 +00:00
Pavel Zhamaitsiak
cb267a6f8c
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
2015-01-22 02:57:37 +00:00
Maurice Lam
c7f8cac5c9
Merge "[WifiSetup] Don't show menu during setup"
2015-01-21 21:26:10 +00:00
Fyodor Kupolov
b992adebd3
Merge "Reset RunningState on user related changes"
2015-01-21 20:52:23 +00:00
Fyodor Kupolov
5c22ab9781
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
2015-01-21 10:43:03 -08:00
Maurice Lam
8e8a371454
[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
2015-01-21 09:57:40 -08:00
