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
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
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
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
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
Adam Lesinski
e01dfd1a82
Added Warning dialog when enabling usage access for app
...
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
2014-08-15 21:14:28 -07:00
Christopher Tate
73c3e7f549
am 17488da0: am 98774d34: am 568eeca5: Disallow downgrade of bundled home apps
...
* commit '17488da041c5e43e8a59737f60f94b4b2d0e052f':
Disallow downgrade of bundled home apps
2014-08-16 00:56:49 +00:00
Christopher Tate
17488da041
am 98774d34: am 568eeca5: Disallow downgrade of bundled home apps
...
* commit '98774d3445e988840d4f68a91fbe7b9f48c3364c':
Disallow downgrade of bundled home apps
2014-08-16 00:49:10 +00:00
Jim Miller
1a7fa40105
am 248e9eff: am 0b4e4fb1: am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
...
* commit '248e9eff3d95806a0062a17bf78cf11e575f2fa6':
Remove temporary workaround for GMS TrustAgent while API changed.
2014-08-16 00:43:56 +00:00
Fabrice Di Meglio
36585bef4f
am 6dded222: am e15902d6: am 4325f808: Update NFC to use a SwitchPreference
...
* commit '6dded22257031f6a95e103a69ea2d182c315327a':
Update NFC to use a SwitchPreference
2014-08-16 00:43:44 +00:00
Christopher Tate
98774d3445
am 568eeca5: Disallow downgrade of bundled home apps
...
* commit '568eeca569f97bfdd7cf6ae3b9cb5e7360eadc2c':
Disallow downgrade of bundled home apps
2014-08-16 00:43:04 +00:00
Christopher Tate
568eeca569
Disallow downgrade of bundled home apps
...
Bug 14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
2014-08-15 15:36:56 -07:00
Baligh Uddin
2719eebfc5
am b3b64705: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
2014-08-15 22:36:02 +00:00
Jim Miller
248e9eff3d
am 0b4e4fb1: am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
...
* commit '0b4e4fb1102eb2ec421faa81afcb889eacb7f772':
Remove temporary workaround for GMS TrustAgent while API changed.
2014-08-15 22:04:00 +00:00
Jim Miller
0b4e4fb110
am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
...
* commit '23c76e38ef2a62a996dbb304c558c80b3fee5f28':
Remove temporary workaround for GMS TrustAgent while API changed.
2014-08-15 21:45:31 +00:00
Fabrice Di Meglio
6dded22257
am e15902d6: am 4325f808: Update NFC to use a SwitchPreference
...
* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
Update NFC to use a SwitchPreference
2014-08-15 21:42:46 +00:00
Fabrice Di Meglio
e15902d617
am 4325f808: Update NFC to use a SwitchPreference
...
* commit '4325f8080888bd3b15246f5bbd9db878aced030c':
Update NFC to use a SwitchPreference
2014-08-15 21:37:24 +00:00
Fabrice Di Meglio
4325f80808
Update NFC to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
2014-08-15 14:28:04 -07:00
Glenn Kasten
bf84be427d
am d0ec634c: am e89abcc8: am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
...
* commit 'd0ec634c74fad66e6d8d5add4d5124167320a367':
Increase character limit for translation
2014-08-15 21:26:59 +00:00
arete
e0950be1b7
am e20063fc: am 4595b470: am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit 'e20063fc334d159446aa4f60b9884fdf82269a2c':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 21:26:58 +00:00
Fabrice Di Meglio
60e678e5d2
am c33bac82: am 880de9f2: am e3bced2c: Update Airplane mode to use a SwitchPreference
...
* commit 'c33bac825497da0746f3098fb8c02d4e9f439c3a':
Update Airplane mode to use a SwitchPreference
2014-08-15 21:26:57 +00:00
Maurice Lam
5df0204cf0
am e72e44d0: am 03ec9ff4: am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit 'e72e44d09982ae3c7fcc96ce0cd24e42bbd409d6':
[WifiSetup] Use framework AutoMirrored
2014-08-15 21:26:56 +00:00
Julia Reynolds
2ea6bb355f
am 9d20b0c0: am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev
...
* commit '9d20b0c089e7b65bc56f90b23fec909b98dbd4f7':
Disable disable button according to user restrictions.
2014-08-15 21:26:55 +00:00
Jim Miller
23c76e38ef
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
2014-08-15 21:23:40 +00:00
Jim Miller
6a0c89743c
Remove temporary workaround for GMS TrustAgent while API changed.
...
Fixes bug 16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
2014-08-15 14:30:01 -07:00
Baligh Uddin
b3b647054e
Import translations. DO NOT MERGE
...
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
2014-08-15 14:21:56 -07:00
Glenn Kasten
d0ec634c74
am e89abcc8: am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
...
* commit 'e89abcc8e88bec69e37f11fa051b9b299246a0f3':
Increase character limit for translation
2014-08-15 21:17:31 +00:00
arete
e20063fc33
am 4595b470: am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit '4595b470d37a3152d6f76488414e58da3ad516a4':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 21:17:29 +00:00