OSDN Git Service
Baligh Uddin [Wed, 1 Oct 2014 22:30:48 +0000 (22:30 +0000)]
am
cb6b336e: (-s ours) am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
cb6b336ec2e0d90df9977993d351d372a5ace4d7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)]
am
48f0021c: (-s ours) am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
48f0021cec8943c3027f41faff147b83ba6d991f':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:30:41 +0000 (22:30 +0000)]
am
9184ed5c: am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
9184ed5cb4ac66839515da9c0ae69b08a97a91ae':
Remove WebView DRP Setting from Developer Settings
Baligh Uddin [Wed, 1 Oct 2014 22:16:50 +0000 (22:16 +0000)]
am
299c6e12: (-s ours) am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
299c6e127d5105890a963208a64309af42051b56':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 22:16:47 +0000 (22:16 +0000)]
am
0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
0905bb07fc7059afc567d03dbca7696604aee0e2':
Import translations. DO NOT MERGE
Hui Shu [Wed, 1 Oct 2014 22:15:49 +0000 (22:15 +0000)]
am
c1c9888d: am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
c1c9888db4171a9db81345f428342ec838b5da99':
Remove WebView DRP Setting from Developer Settings
Baligh Uddin [Wed, 1 Oct 2014 19:32:47 +0000 (19:32 +0000)]
am
8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8133d31b5275c35dd078ec24f300863dc9ac706f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 19:32:32 +0000 (19:32 +0000)]
am
9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 Oct 2014 19:29:16 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:14 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:12 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:10 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 18:56:50 +0000 (18:56 +0000)]
am
b5550a65: am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b5550a65c089f230a58b636c9a55c61a054d169b':
Disambiguate categories in Settings > Trusted Credentials
Hui Shu [Wed, 1 Oct 2014 18:32:04 +0000 (18:32 +0000)]
am
905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
Remove WebView DRP Setting from Developer Settings
Hui Shu [Wed, 1 Oct 2014 18:28:51 +0000 (18:28 +0000)]
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:20:47 +0000 (17:20 +0000)]
am
45f8ffa1: am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
Disambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)]
am
b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '
b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 15:47:59 +0000 (15:47 +0000)]
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
Maurice Lam [Wed, 1 Oct 2014 15:19:17 +0000 (15:19 +0000)]
am
492f8728: am
5fdb8fa4: am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
492f87288699dbf8bb521c4160688b73d241d454':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:19:16 +0000 (15:19 +0000)]
am
e78840ff: am
42eff3b7: am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
e78840ff097dd09c24977876e2f84972dbe1361b':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Wed, 1 Oct 2014 15:19:15 +0000 (15:19 +0000)]
am
3cc8fe3b: am
976aba99: am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
3cc8fe3bcc9aad32a0740ccf4a4c23cee537deba':
Update Settings App icons
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.
Maurice Lam [Wed, 1 Oct 2014 15:09:26 +0000 (15:09 +0000)]
am
5fdb8fa4: am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
5fdb8fa41d44fe31148f00b6c909f511f11fde52':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:09:25 +0000 (15:09 +0000)]
am
42eff3b7: am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
42eff3b7e695c28c4074f7fd71606fa0ecfe199c':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am
976aba99: am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
976aba99c8b06676b9e097de74287bb70138c848':
Update Settings App icons
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.
Maurice Lam [Wed, 1 Oct 2014 15:03:19 +0000 (15:03 +0000)]
am
f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '
f7b567081ef5f4daafdf0b229793323751e0d764':
[WifiSetup] Update background texture
Svetoslav [Wed, 1 Oct 2014 15:02:20 +0000 (15:02 +0000)]
am
52448442: Use default encryption password if an accessibility service is enabled.
* commit '
524484426855f814ff1f3189fd5221dd630dbf8c':
Use default encryption password if an accessibility service is enabled.
Fabrice Di Meglio [Wed, 1 Oct 2014 15:00:30 +0000 (15:00 +0000)]
am
fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '
fc14e272aaed6a6e36c044b93e12d68896aaa543':
Update Settings App icons
PauloftheWest [Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)]
am
29aab7a2: Fixed a Settings crash.
* commit '
29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
Maurice Lam [Wed, 1 Oct 2014 01:54:40 +0000 (01:54 +0000)]
Merge "[WifiSetup] Update background texture" into lmp-dev
Maurice Lam [Tue, 30 Sep 2014 02:40:42 +0000 (19:40 -0700)]
[WifiSetup] Update background texture
Bug:
17611097
Change-Id: I75264ecac3b689426500e063a18d687866638a85
Hui Shu [Tue, 30 Sep 2014 23:53:36 +0000 (16:53 -0700)]
Remove WebView DRP Setting from Developer Settings
BUG:
17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
Svetoslav [Tue, 30 Sep 2014 01:15:45 +0000 (18:15 -0700)]
Use default encryption password if an accessibility service is enabled.
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.
bug:
17671790
Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
Baligh Uddin [Tue, 30 Sep 2014 19:59:02 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79c53aaccbdec874aa56c457c61e8f5858a42c45
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Sep 2014 19:55:13 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43fa57825b6b23b06740ec46d0af3f43ce041fec
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Sep 2014 19:51:14 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I484b3919be4abf29231049a2e96867b0a8453538
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Sep 2014 19:47:02 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b6fcec9576d2305d0eb872b9d3d404f4b0556a1
Auto-generated-cl: translation import
Fabrice Di Meglio [Tue, 30 Sep 2014 19:45:31 +0000 (19:45 +0000)]
Merge "Update Settings App icons" into lmp-dev
Zoltan Szatmary-Ban [Tue, 30 Sep 2014 15:30:07 +0000 (16:30 +0100)]
Disambiguate categories in Settings > Trusted Credentials
Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials
screen instead of names of profiles that may be the same (or similar) for both.
Bug:
17629895
Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
Fabrice Di Meglio [Tue, 30 Sep 2014 02:17:56 +0000 (19:17 -0700)]
Update Settings App icons
Per UX request
See bug: #
17703962 update Settings app icons
Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
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.
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
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: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 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
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 [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 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
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: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