Julia Reynolds
01b4f06c89
am 9a49d7af: am 51e8febf: am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev
...
* commit '9a49d7af25c98f57250defd4c8d6db9666eaaaaa':
Supress menu if screen ought to be hidden.
2014-08-19 19:08:13 +00:00
Julia Reynolds
9a49d7af25
am 51e8febf: am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev
...
* commit '51e8febf8c4b522a9704b3ba9bb19a2f7f45a0f5':
Supress menu if screen ought to be hidden.
2014-08-19 19:02:52 +00:00
Julia Reynolds
51e8febf8c
am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev
...
* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
Supress menu if screen ought to be hidden.
2014-08-19 18:54:36 +00:00
Lifu Tang
8f993ebd17
am 868c7c45: am 6a86746f: am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev
...
* commit '868c7c450ef302329e994310ce9fcfb0d272731a':
Dim the preference icons when its disabled
2014-08-19 17:51:52 +00:00
Lifu Tang
868c7c450e
am 6a86746f: am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev
...
* commit '6a86746f98b760728180931ef23956e97ae09e8b':
Dim the preference icons when its disabled
2014-08-19 17:41:12 +00:00
Lifu Tang
6a86746f98
am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev
...
* commit '72bd4d252dc7a706b661f2970396dc0211d7b4de':
Dim the preference icons when its disabled
2014-08-19 17:32:13 +00:00
Amith Yamasani
a44e57802e
am 6b3973fc: am 408943e9: am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
...
* commit '6b3973fc1e436f0e1adce6f4b331865a386b85a3':
Update strings for guest removal affordance and dialog
2014-08-19 15:59:08 +00:00
Amith Yamasani
6b3973fc1e
am 408943e9: am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
...
* commit '408943e9aa708a1077197300a775e7dea677d037':
Update strings for guest removal affordance and dialog
2014-08-19 15:51:04 +00:00
Lifu Tang
72bd4d252d
Merge "Dim the preference icons when its disabled" into lmp-dev
2014-08-19 15:47:37 +00:00
Amith Yamasani
408943e9aa
am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
...
* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
Update strings for guest removal affordance and dialog
2014-08-19 15:43:40 +00:00
Lifu Tang
536c5e22c3
am 8d576dd2: am 47cdb727: am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev
...
* commit '8d576dd26ff133079ea835bb531b88101449f3bc':
Set switch to the correct enabling state
2014-08-19 04:44:25 +00:00
Lifu Tang
8d576dd26f
am 47cdb727: am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev
...
* commit '47cdb7276230b87a3a9ba75073a483fb7c531036':
Set switch to the correct enabling state
2014-08-19 04:36:14 +00:00
Lifu Tang
47cdb72762
am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev
...
* commit '081a9162c959f9cbd0cbd76674501cdb47d516a7':
Set switch to the correct enabling state
2014-08-19 04:29:17 +00:00
Lifu Tang
081a9162c9
Merge "Set switch to the correct enabling state" into lmp-dev
2014-08-19 02:08:36 +00:00
Lifu Tang
b18e242366
Set switch to the correct enabling state
...
- Fix b/16951708
Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
2014-08-18 16:46:48 -07:00
PauloftheWest
e112a21ef9
am 6e73e81a: am a4ab5a3a: am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit '6e73e81ab7df741aedb3cd16a30b39da841309e4':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:22:56 +00:00
PauloftheWest
2439b3a34d
am fe9c0e05: am 480fcb24: am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit 'fe9c0e056cde88171ecca304e0e4d39ddabeeeaf':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:22:55 +00:00
PauloftheWest
6e73e81ab7
am a4ab5a3a: am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit 'a4ab5a3a2b0924d55445a1c195336bd9e237d577':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:15:04 +00:00
PauloftheWest
fe9c0e056c
am 480fcb24: am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit '480fcb2432c6a1d0615eacdf50b144ce5e435dae':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:15:03 +00:00
PauloftheWest
a4ab5a3a2b
am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
...
* commit '31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
Fixed a crash when rotating a saved networks dialog.
2014-08-18 20:07:36 +00:00
PauloftheWest
480fcb2432
am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
...
* commit '6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
Fixed a bug were AdvanceWifiSettings would crash on resume.
2014-08-18 20:07:35 +00:00
Lifu Tang
db0b7637fa
Dim the preference icons when its disabled
...
- Fix b/16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
2014-08-18 11:22:13 -07:00
Alexandra Gherghina
2d8392b7ce
am 518f3e00: am 9db8f0aa: am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '518f3e00757e439415f8d4006ad0bd4d9ed154d6':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 17:12:19 +00:00
Alexandra Gherghina
518f3e0075
am 9db8f0aa: am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '9db8f0aaf3f220208e50b088e4114ee41b0ff19c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 17:07:05 +00:00
Alexandra Gherghina
9db8f0aaf3
am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
...
* commit '0cad779d3e4d7ef361fa972e54879cd6791b467c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
2014-08-18 16:56:17 +00:00
Alexandra Gherghina
70dab229ea
am 13e00185: am 4b81ebf2: am cd88c2f7: Fix Account Settings crash
...
* commit '13e00185b8436a19796da8c67dcbd7c7f07474ab':
Fix Account Settings crash
2014-08-18 16:53:11 +00:00
Alexandra Gherghina
13e00185b8
am 4b81ebf2: am cd88c2f7: Fix Account Settings crash
...
* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
Fix Account Settings crash
2014-08-18 16:44:28 +00:00
Alexandra Gherghina
4b81ebf285
am cd88c2f7: Fix Account Settings crash
...
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash
2014-08-18 16:39:54 +00:00
Alexandra Gherghina
cd88c2f7c3
Fix Account Settings crash
...
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
2014-08-18 14:34:13 +01:00
Baligh Uddin
902c0c4d8f
am 1169cd85: (-s ours) am 1f4e0347: (-s ours) am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1169cd85d22b83c1d56a54c5e7291df0031371f0':
Import translations. DO NOT MERGE
2014-08-17 14:41:42 +00:00
Baligh Uddin
1169cd85d2
am 1f4e0347: (-s ours) am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1f4e0347b903823a19417e57d0e398e6e9c5dda6':
Import translations. DO NOT MERGE
2014-08-17 14:24:12 +00:00
Baligh Uddin
1f4e0347b9
am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE
2014-08-17 14:08:30 +00:00
Adam Lesinski
346249eb6d
am 6f0b3aa9: am 82951de9: am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit '6f0b3aa9d9f9be9ca37626314f83c886f6e8a9bc':
Added Warning dialog when enabling usage access for app
2014-08-16 07:03:43 +00:00
Adam Lesinski
6f0b3aa9d9
am 82951de9: am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit '82951de9fe1be4686e80ea61807140274deaff50':
Added Warning dialog when enabling usage access for app
2014-08-16 06:56:29 +00:00
Adam Lesinski
82951de9fe
am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit 'a9dc57c145c91eaa5b43510575eae3e425adc461':
Added Warning dialog when enabling usage access for app
2014-08-16 06:49:40 +00:00
Baligh Uddin
59b0881d4c
am 46411458: (-s ours) am a07fddf1: (-s ours) am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE
...
* commit '464114588d1badea73691b360a3942f3ba0fb0b8':
Import translations. DO NOT MERGE
2014-08-16 05:14:17 +00:00
Baligh Uddin
464114588d
am a07fddf1: (-s ours) am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a07fddf1834f80872a83527dc5309d96fadb151d':
Import translations. DO NOT MERGE
2014-08-16 04:51:34 +00:00
Baligh Uddin
a07fddf183
am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE
...
* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE
2014-08-16 04:38:20 +00:00
Amith Yamasani
d05dd864d6
Merge "Update strings for guest removal affordance and dialog" into lmp-dev
2014-08-16 04:32:18 +00:00
Amith Yamasani
94c0181c8f
Update strings for guest removal affordance and dialog
...
Exit guest -> Remove guest
etc.
Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
2014-08-18 16:42:43 -07:00
PauloftheWest
31584ec3e9
Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
2014-08-16 04:32:18 +00:00
PauloftheWest
3280dc144f
Fixed a crash when rotating a saved networks dialog.
...
Bug: 16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
2014-08-18 09:28:21 -07:00
Alexandra Gherghina
0cad779d3e
Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
2014-08-16 04:29:45 +00:00
Alexandra Gherghina
f2e39f2ee4
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
...
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.
Bug: 17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
2014-08-18 17:42:26 +01:00
PauloftheWest
6a2b1a44d2
Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
2014-08-16 04:03:42 +00:00
PauloftheWest
c2cf256853
Fixed a bug were AdvanceWifiSettings would crash on resume.
...
Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
2014-08-18 11:49:09 -07:00
Baligh Uddin
88ee936a94
am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE
...
* commit '2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
2014-08-16 04:02:06 +00:00
Baligh Uddin
f14fa7ed4e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-16 03:56:00 +00:00
Baligh Uddin
e63747ac7b
Import translations. DO NOT MERGE
...
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
2014-08-16 00:01:16 -07:00
Adam Lesinski
a9dc57c145
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
2014-08-16 03:52:42 +00:00