OSDN Git Service
PauloftheWest [Thu, 2 Oct 2014 12:47:31 +0000 (12:47 +0000)]
am
544ed0ef: am
cd93da02: am
8506c378: am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
544ed0ef8e72191f76cda597475d4ae3da963cb9':
Fixed a Settings crash.
Baligh Uddin [Thu, 2 Oct 2014 12:47:30 +0000 (12:47 +0000)]
am
7e09be13: (-s ours) am
91b315c1: (-s ours) am
02e6f611: (-s ours) am
6cbdf17e: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7e09be13705bad913555dedbf7fb16403bc401fb':
Import translations. DO NOT MERGE
PauloftheWest [Thu, 2 Oct 2014 12:47:29 +0000 (12:47 +0000)]
am
2f11848c: am
db464694: am
c4ef9bf8: am
dc5f87ff: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
2f11848cbf02ff8c1a75303ee4c0e2b63b002e43':
Fixed multiple MAP issues.
PauloftheWest [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
cd93da02: am
8506c378: am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
cd93da0235c61061d1eb335783183766c484cab2':
Fixed a Settings crash.
Baligh Uddin [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
91b315c1: (-s ours) am
02e6f611: (-s ours) am
6cbdf17e: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91b315c1d6afac99f51e58488a14d4a1d8498f3a':
Import translations. DO NOT MERGE
PauloftheWest [Thu, 2 Oct 2014 12:37:16 +0000 (12:37 +0000)]
am
db464694: am
c4ef9bf8: am
dc5f87ff: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
db46469432b67550b9b5968d7aa4004121332b0d':
Fixed multiple MAP issues.
PauloftheWest [Wed, 1 Oct 2014 15:19:14 +0000 (15:19 +0000)]
am
8506c378: am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
8506c378975c687f8658b6dbe13f41e69599832c':
Fixed a Settings crash.
PauloftheWest [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am
cc6736bf: am
29aab7a2: Fixed a Settings crash.
* commit '
cc6736bfdee735c236814488a169ee5a7c461f73':
Fixed a Settings crash.
PauloftheWest [Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)]
am
29aab7a2: Fixed a Settings crash.
* commit '
29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
Baligh Uddin [Tue, 30 Sep 2014 20:18:06 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1d79b0917bd6e59425a959a3038fd05e1490c18
Auto-generated-cl: translation import
PauloftheWest [Fri, 26 Sep 2014 23:05:44 +0000 (16:05 -0700)]
Fixed a Settings crash.
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.
Bug:
17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
Baligh Uddin [Mon, 29 Sep 2014 21:00:28 +0000 (21:00 +0000)]
am
02e6f611: (-s ours) am
6cbdf17e: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
02e6f6115bfa5f9652560cf5a58827ed6c4b43fb':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 29 Sep 2014 21:00:27 +0000 (21:00 +0000)]
am
c4ef9bf8: am
dc5f87ff: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
c4ef9bf82440764609356b3364e066a4b35a0114':
Fixed multiple MAP issues.
Baligh Uddin [Mon, 29 Sep 2014 20:50:31 +0000 (20:50 +0000)]
am
6cbdf17e: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6cbdf17e7b8244601174295d2ddeb333c073cfc4':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 29 Sep 2014 20:50:30 +0000 (20:50 +0000)]
am
dc5f87ff: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
dc5f87fffceac79169fe546055f2ecc3a4142bfe':
Fixed multiple MAP issues.
Baligh Uddin [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
709ddd5c24ca276e0c2efc76c77ae375276cc080':
Fixed multiple MAP issues.
Robert Greenwalt [Mon, 29 Sep 2014 19:44:57 +0000 (19:44 +0000)]
am
a3c7a104: am
42dd9335: am
20371b52: am
613620df: am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
a3c7a104b353bc67a4de6bc9ec391de0c1c9372f':
ATT Entitlement changes in Settings to pass Tether Type.
Elliott Hughes [Mon, 29 Sep 2014 19:44:47 +0000 (19:44 +0000)]
am
00d038df: am
100bed71: am
38c42ec1: am
66392541: am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
00d038df28adebf3d9d70d0afc101b17c15ee3d0':
Make the system locale available to the decryption UI.
Alexandra Gherghina [Mon, 29 Sep 2014 19:44:14 +0000 (19:44 +0000)]
am
24d0b6cc: am
b496606d: am
e5e43084: am
8ea6cbf7: am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
24d0b6cc625313676e391fc3f61fc46f7b95e06d':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Mon, 29 Sep 2014 19:44:13 +0000 (19:44 +0000)]
am
f458406f: am
294c32ce: am
5dab2fd3: am
c7611429: am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
f458406f4046092bb71d164f57bf2b4b8b6e1564':
Use plain user icon in UserSpinnerAdapter
PauloftheWest [Mon, 29 Sep 2014 19:44:12 +0000 (19:44 +0000)]
am
3708cce5: am
e03d52be: am
6a662321: am
0c74ea6c: am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
3708cce50598bf5855178c1b7ed8dca58fd95452':
Fixed a crash when rotating a WPS dialog.
Baligh Uddin [Mon, 29 Sep 2014 16:37:22 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Mon, 29 Sep 2014 15:10:23 +0000 (15:10 +0000)]
Merge "Fixed multiple MAP issues." into lmp-dev
Baligh Uddin [Mon, 29 Sep 2014 07:31:03 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import
Sky Faber [Fri, 26 Sep 2014 21:26:23 +0000 (14:26 -0700)]
User wifi separation feature.
-Enable forget button for all users.
Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
Vinit Deshpande [Sat, 27 Sep 2014 02:01:13 +0000 (02:01 +0000)]
Merge "Separate wifi AP added by applications."
Sky Faber [Mon, 22 Sep 2014 23:43:04 +0000 (16:43 -0700)]
Separate wifi AP added by applications.
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.
Change-Id: I12943563ef714c4287e13488578f020d136d006d
Robert Greenwalt [Sat, 27 Sep 2014 00:27:08 +0000 (00:27 +0000)]
am
42dd9335: am
20371b52: am
613620df: am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
42dd933597c350308629227f6b82b653a020a857':
ATT Entitlement changes in Settings to pass Tether Type.
Robert Greenwalt [Sat, 27 Sep 2014 00:22:36 +0000 (00:22 +0000)]
am
20371b52: am
613620df: am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
20371b52c4e103e481ae0deb14ce395a1deeb5d5':
ATT Entitlement changes in Settings to pass Tether Type.
Robert Greenwalt [Sat, 27 Sep 2014 00:18:16 +0000 (00:18 +0000)]
am
613620df: am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
613620df13f01c9871a71c83e4df8cc58031478e':
ATT Entitlement changes in Settings to pass Tether Type.
Robert Greenwalt [Sat, 27 Sep 2014 00:13:17 +0000 (00:13 +0000)]
am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf':
ATT Entitlement changes in Settings to pass Tether Type.
Robert Greenwalt [Sat, 27 Sep 2014 00:09:02 +0000 (00:09 +0000)]
Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
Elliott Hughes [Fri, 26 Sep 2014 23:13:55 +0000 (23:13 +0000)]
am
100bed71: am
38c42ec1: am
66392541: am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
100bed71759dee76a31b59af8dfbb4a522ebcf66':
Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 23:08:25 +0000 (23:08 +0000)]
am
38c42ec1: am
66392541: am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
38c42ec165f6257e86d61dcb74016774205890e1':
Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 23:03:52 +0000 (23:03 +0000)]
am
66392541: am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
66392541346505eaa4825323bb4ba28f55f1d136':
Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 22:58:34 +0000 (22:58 +0000)]
am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 19:29:12 +0000 (12:29 -0700)]
Make the system locale available to the decryption UI.
Bug:
17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
Rohit Sisodia [Mon, 22 Sep 2014 21:34:56 +0000 (16:34 -0500)]
ATT Entitlement changes in Settings to pass Tether Type.
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.
Bug:
17640036
Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
Alexandra Gherghina [Fri, 26 Sep 2014 21:52:43 +0000 (21:52 +0000)]
am
b496606d: am
e5e43084: am
8ea6cbf7: am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
b496606ddcd1d43b8791b6bbd8399cf5c13c8b7a':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Fri, 26 Sep 2014 21:52:42 +0000 (21:52 +0000)]
am
294c32ce: am
5dab2fd3: am
c7611429: am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
294c32ce458b9d53796387cd59ba1cab3cd592ce':
Use plain user icon in UserSpinnerAdapter
PauloftheWest [Fri, 26 Sep 2014 21:52:41 +0000 (21:52 +0000)]
am
e03d52be: am
6a662321: am
0c74ea6c: am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
e03d52beed9db5e965ecca19c59ab619760f86bb':
Fixed a crash when rotating a WPS dialog.
Alexandra Gherghina [Fri, 26 Sep 2014 20:46:00 +0000 (20:46 +0000)]
am
e5e43084: am
8ea6cbf7: am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
e5e430849c9cd6fce13c3194ab681c97822c180b':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Fri, 26 Sep 2014 20:45:59 +0000 (20:45 +0000)]
am
5dab2fd3: am
c7611429: am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
5dab2fd3b21f561fc5d5874566762ea88b260725':
Use plain user icon in UserSpinnerAdapter
Alexandra Gherghina [Fri, 26 Sep 2014 20:11:30 +0000 (20:11 +0000)]
am
8ea6cbf7: am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
8ea6cbf7d9a6f92bb76564c281597341b0ad1ebb':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Fri, 26 Sep 2014 20:11:29 +0000 (20:11 +0000)]
am
c7611429: am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
c7611429e906423c5f7ba9da80e40bb364c684b1':
Use plain user icon in UserSpinnerAdapter
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:28 +0000 (19:55 +0000)]
am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
9de68440a9ae9cfadee3939c1ca461e42871f766':
Match parent width for user spinner to fix tint
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:27 +0000 (19:55 +0000)]
am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter
Alexandra Gherghina [Fri, 26 Sep 2014 17:53:27 +0000 (17:53 +0000)]
Merge "Match parent width for user spinner to fix tint" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 17:42:48 +0000 (17:42 +0000)]
Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
Michael Wright [Fri, 26 Sep 2014 15:27:57 +0000 (15:27 +0000)]
am
d26109e8: am
94a72da1: am
65c402ef: am
28a049a6: am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
d26109e86fbce2a38eab3b656d1ce33dd3e72d70':
If a device identifier is specified, bring up keyboard layouts dialog.
PauloftheWest [Fri, 26 Sep 2014 15:15:41 +0000 (15:15 +0000)]
am
6a662321: am
0c74ea6c: am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
6a6623215545a59a9cebb5f87cb0cb71a586ec6d':
Fixed a crash when rotating a WPS dialog.
PauloftheWest [Fri, 26 Sep 2014 15:04:41 +0000 (15:04 +0000)]
am
0c74ea6c: am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
0c74ea6cc58054e8bfb74ee1eda4453ac10567ce':
Fixed a crash when rotating a WPS dialog.
PauloftheWest [Fri, 26 Sep 2014 14:54:19 +0000 (14:54 +0000)]
am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
3aabfca462af26c487d2a834f70d0998d7556637':
Fixed a crash when rotating a WPS dialog.
PauloftheWest [Fri, 26 Sep 2014 14:47:27 +0000 (14:47 +0000)]
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
Michael Wright [Fri, 26 Sep 2014 04:29:14 +0000 (04:29 +0000)]
am
94a72da1: am
65c402ef: am
28a049a6: am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
94a72da1316a3a7e2dd1b86943a3d9a186965dd0':
If a device identifier is specified, bring up keyboard layouts dialog.
Michael Wright [Thu, 25 Sep 2014 22:50:06 +0000 (22:50 +0000)]
am
65c402ef: am
28a049a6: am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
65c402ef9a58bc94056cbff5a93405da06c575dd':
If a device identifier is specified, bring up keyboard layouts dialog.
Michael Wright [Thu, 25 Sep 2014 22:38:32 +0000 (22:38 +0000)]
am
28a049a6: am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
28a049a69471f1cdb7dce4490ffea38c1b3f417e':
If a device identifier is specified, bring up keyboard layouts dialog.
Michael Wright [Thu, 25 Sep 2014 22:26:59 +0000 (22:26 +0000)]
am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
1b87bec5de17dc23cf63d9f71358b8c979f8c896':
If a device identifier is specified, bring up keyboard layouts dialog.
Michael Wright [Thu, 25 Sep 2014 22:18:33 +0000 (22:18 +0000)]
Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
PauloftheWest [Thu, 25 Sep 2014 19:36:09 +0000 (12:36 -0700)]
Fixed a crash when rotating a WPS dialog.
Bug:
17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:42:44 +0000 (18:42 +0000)]
am
9892f72a: am
cb4ec69c: am
8c6211b5: am
15f71b3f: am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
9892f72a1477416478d025f9b37837505dd44b32':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:42:43 +0000 (18:42 +0000)]
am
d1ce0ec8: am
bfb2dd48: am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
d1ce0ec8cd42671b2127ae207c2b491a884f29ce':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 18:42:41 +0000 (18:42 +0000)]
am
fe9fb062: am
9e9b5496: am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
fe9fb0625d7291d22fb84ac5a6db35d44024d2ae':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 18:42:38 +0000 (18:42 +0000)]
am
f3065166: am
390b0bae: am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
f3065166021cd8b63422508d2d0ec9e2ac283c73':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:32:33 +0000 (18:32 +0000)]
am
cb4ec69c: am
8c6211b5: am
15f71b3f: am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
cb4ec69ccc3d372ee26028396fb8dd439c036d64':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:32:32 +0000 (18:32 +0000)]
am
bfb2dd48: am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
bfb2dd48cbc049c225c2b56cbe4fbe5b8b8bd0b9':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 18:32:31 +0000 (18:32 +0000)]
am
9e9b5496: am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
9e9b54961d8e59bd89505dc8f20b337995cc2fcc':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 18:32:30 +0000 (18:32 +0000)]
am
390b0bae: am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
390b0bae5ddc0cf400d09193fea06e02630d8a41':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:57:52 +0000 (16:57 +0000)]
am
8c6211b5: am
15f71b3f: am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
8c6211b56f2272e38031ca845afe5a11a5b1e8e6':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:57:51 +0000 (16:57 +0000)]
am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
2a26ac58f025ea510800053b97aa39bef16091fa':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:57:50 +0000 (16:57 +0000)]
am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
72cf0cf96d13054569f58109aaf6c0543af1d796':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:57:49 +0000 (16:57 +0000)]
am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
8acdcf7a522af8c4f21e1727ae82be516e34c113':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:39:17 +0000 (16:39 +0000)]
am
15f71b3f: am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
15f71b3f952c97b838a6517b75028ce21e3bd06f':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]
am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
6da3f84c9789378d701894a0a65be536da5e220c':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]
am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
94e2341bb5557b405792d3040cc67ce24a965485':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:39:15 +0000 (16:39 +0000)]
am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
a522e9a83739446bf89d801f7ceac5f7effc3727':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:18 +0000 (16:24 +0000)]
am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
a2b7bb6be612fc050fc7634815a614f84fcac778':
Make Force Stop button work for packages of managed profile
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:17 +0000 (16:24 +0000)]
am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:24:15 +0000 (16:24 +0000)]
am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:22:25 +0000 (16:22 +0000)]
am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
d642d1abcfed427e4c152e28e39b50cdb68b81c6':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:38:40 +0000 (10:38 +0000)]
Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:35:57 +0000 (10:35 +0000)]
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
Paul Lawrence [Thu, 25 Sep 2014 10:35:01 +0000 (10:35 +0000)]
am
d54a2e05: am
1bbaf081: am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
d54a2e0506de833b3461a649d217a478f4046b4d':
Hide controls once password is known good
Alexandra Gherghina [Thu, 25 Sep 2014 10:29:16 +0000 (11:29 +0100)]
Match parent width for user spinner to fix tint
Bug:
17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
Paul Lawrence [Thu, 25 Sep 2014 10:24:13 +0000 (10:24 +0000)]
am
1bbaf081: am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
1bbaf081363e04506896965192c1d316c2e22ab6':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 10:14:08 +0000 (10:14 +0000)]
am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
f295f01bcc7200d46d24893392ce9522ace3928c':
Hide controls once password is known good
Alexandra Gherghina [Mon, 22 Sep 2014 09:16:06 +0000 (10:16 +0100)]
Use plain user icon in UserSpinnerAdapter
Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.
Bug:
17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
Paul Lawrence [Thu, 25 Sep 2014 10:03:46 +0000 (10:03 +0000)]
am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 09:51:35 +0000 (09:51 +0000)]
am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
29df37969794aa4db73af0d0fdbcde273aef5ab2':
Hide controls once password is known good
Alexandra Gherghina [Thu, 25 Sep 2014 09:37:57 +0000 (09:37 +0000)]
Merge "Add null check for sync authorities of an account type" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:28:00 +0000 (23:28 +0000)]
Merge "Include reason when wiping data." into lmp-dev
PauloftheWest [Wed, 24 Sep 2014 22:21:30 +0000 (15:21 -0700)]
Fixed multiple MAP issues.
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.
Bug:
17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
Paul Lawrence [Wed, 24 Sep 2014 22:59:07 +0000 (22:59 +0000)]
Merge "Hide controls once password is known good" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 20:57:07 +0000 (13:57 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
Adrian Roos [Wed, 24 Sep 2014 17:56:35 +0000 (17:56 +0000)]
am
b88b3ea8: am
ec93c7b0: am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
b88b3ea88b490291c684ecc11c923032f4d755a9':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:43:22 +0000 (17:43 +0000)]
am
ec93c7b0: am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
ec93c7b071ff36051a89e8ac339f4e76f3c9e26b':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:36:58 +0000 (17:36 +0000)]
am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
ed5953026910534857ffd7169b1e4da13f5b6588':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:24:14 +0000 (17:24 +0000)]
am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
c45bfc9a3cb46af2fadd8e400d8a691108b94be1':
Prevent saving credentials multiple times
Alan Viverette [Wed, 24 Sep 2014 17:17:06 +0000 (17:17 +0000)]
am
f1f7af01: am
05df9029: am
e4031966: am
6f6e547e: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
Fix background colors to point directly to theme attribute
OSDN Git Service
