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
Maurice Lam
d9165c06a4
[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
2015-01-21 09:48:42 -08:00
Sanket Padawe
913ebd7909
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d automerge: 49c85c4
...
automerge: e3acb02
2015-01-21 17:23:18 +00:00
Sanket Padawe
e3acb02bb5
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d
...
automerge: 49c85c4
2015-01-21 17:20:50 +00:00
Sanket Padawe
49c85c4356
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
...
automerge: 5f1eb2d
2015-01-21 17:13:05 +00:00
Sanket Padawe
5f1eb2d72a
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
2015-01-21 17:08:45 +00:00
Geoff Mendal
cf4bb0840e
Merge "Import translations. DO NOT MERGE"
2015-01-21 15:13:37 +00:00
Geoff Mendal
8d15f5b991
Import translations. DO NOT MERGE
...
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
2015-01-21 07:12:37 -08:00
Geoff Mendal
c1d297e2e2
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 2898f37 -s ours
...
automerge: ea7411b
2015-01-21 15:08:37 +00:00
Geoff Mendal
50fc98395e
Import translations. DO NOT MERGE automerge: 75c5298 -s ours automerge: 9f62273 -s ours
...
automerge: e272db9
2015-01-21 15:08:30 +00:00
Geoff Mendal
ea7411bde6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
automerge: 2898f37
2015-01-21 15:03:37 +00:00
Geoff Mendal
e272db9505
Import translations. DO NOT MERGE automerge: 75c5298 -s ours
...
automerge: 9f62273
2015-01-21 15:03:29 +00:00
Geoff Mendal
2898f37b65
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-01-21 14:59:27 +00:00
Geoff Mendal
9f622737ec
Import translations. DO NOT MERGE
...
automerge: 75c5298
2015-01-21 14:58:59 +00:00
Geoff Mendal
1359290622
Import translations. DO NOT MERGE
...
Change-Id: I7b3a724e783b9e279200e43f876d3a30ee813fc0
Auto-generated-cl: translation import
2015-01-21 06:55:59 -08:00
Geoff Mendal
75c5298e06
Import translations. DO NOT MERGE
...
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
2015-01-21 06:44:20 -08:00
Maurice Lam
50f2081f6b
am 1cca45bc: Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6 automerge: a1f6660
...
* commit '1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
[WifiSetup] Don't pan the window for IME
2015-01-20 21:49:49 +00:00
Maurice Lam
1cca45bc6e
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6
...
automerge: a1f6660
2015-01-20 21:44:58 +00:00
Maurice Lam
a1f6660423
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
...
automerge: ff649c6
2015-01-20 21:26:38 +00:00
Maurice Lam
ff649c601d
Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev
2015-01-20 21:21:41 +00:00
Sanket Padawe
766ab606e3
Fixed data connection toggle crash in Settings.
...
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
2015-01-20 10:36:15 -08:00
Geoff Mendal
f3428e435e
Merge "Import translations. DO NOT MERGE"
2015-01-19 15:29:17 +00:00
Geoff Mendal
edc6444af7
am f7282d21: (-s ours) am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'f7282d213ab2666471c2ffafe5e0e9c3dc144bbe':
Import translations. DO NOT MERGE
2015-01-19 15:28:11 +00:00
Geoff Mendal
80b03b607a
am 8c302e34: (-s ours) am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE
...
* commit '8c302e34220ae13eacbd997eb955f55c545601e6':
Import translations. DO NOT MERGE
2015-01-19 15:28:09 +00:00
Geoff Mendal
3c075f8fd3
Import translations. DO NOT MERGE
...
Change-Id: I9b5b4d49b4e7cfb40b84c2381db5921eec95bece
Auto-generated-cl: translation import
2015-01-19 07:24:33 -08:00
Geoff Mendal
f7282d213a
am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'e7b79f16c1548ba2c40af4452167c64ba442566e':
Import translations. DO NOT MERGE
2015-01-19 15:20:49 +00:00
Geoff Mendal
8c302e3422
am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE
...
* commit '21df822137b4750d1be2ccf7895876758255c8d0':
Import translations. DO NOT MERGE
2015-01-19 15:20:48 +00:00
Geoff Mendal
e7b79f16c1
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-01-19 15:18:14 +00:00
Geoff Mendal
21df822137
am 69b87f79: (-s ours) Import translations. DO NOT MERGE
...
* commit '69b87f79256a5edacb90ab7ccce069737ca59b3d':
Import translations. DO NOT MERGE
2015-01-19 15:14:52 +00:00
Geoff Mendal
e06ab11084
Import translations. DO NOT MERGE
...
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
2015-01-19 07:14:45 -08:00
Geoff Mendal
69b87f7925
Import translations. DO NOT MERGE
...
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
2015-01-19 07:07:29 -08:00
Zoltan Szatmary-Ban
77c1d36de5
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 cd9b1507fb
2015-01-19 10:53:45 +00:00
Paul Lawrence
792da778f3
Merge "Make cryptkeeper background dark black"
2015-01-16 21:31:05 +00:00
Paul Lawrence
8e53d7ff08
Make cryptkeeper background dark black
...
Bug: 18331607
Change-Id: Ia6ab86efa49753cd180b60c5cbcdbe8f274ab5e7
2015-01-16 13:16:10 -08:00
Fyodor Kupolov
b0afc2a0dc
Merge "Show Location restriction without the Settings item"
2015-01-16 21:00:03 +00:00
xinhe
82ff3d5c56
set softAP on a specified band, including both 2.4 and 5 GHz band
...
Bug:18929692
Change-Id: I455e9b17e5091596beb0246ccfd981c5d2b932f0
2015-01-16 10:50:56 -08:00
Zoltan Szatmary-Ban
3af2e4c35c
Eliminate duplicated code in Settings for category headers
...
Change-Id: I5bdba2ad4f9e1987f9e818af9d5aa96a9d558f6b
2015-01-16 15:48:13 +00:00
Paul Lawrence
d300f3f3a4
Merge "Set font sizes of typed passwords and pins to match keyguard"
2015-01-16 14:59:48 +00:00
Maurice Lam
143d821c03
Merge "[WifiSetup] Remove grey Wi-Fi icon asset"
2015-01-16 02:52:49 +00:00
Andre Eisenbach
77f3c6e5c3
am b1789780: am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
...
* commit 'b1789780f7453822d195567f011ea926d9c67492':
Do not perform SDP during pairing
2015-01-16 02:52:25 +00:00
Andre Eisenbach
b1789780f7
am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
...
* commit 'edf618c1b7ceb283146de1e26b85a56ab04b206f':
Do not perform SDP during pairing
2015-01-16 02:47:55 +00:00
