OSDN Git Service
Jeff Sharkey [Thu, 6 Feb 2014 22:29:11 +0000 (22:29 +0000)]
Merge "Total and available fields missing in Settings storage menu"
Jeff Sharkey [Thu, 6 Feb 2014 22:25:30 +0000 (22:25 +0000)]
Merge "Fix memory leak in ManageApplication"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:52 +0000 (21:50 +0000)]
Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:02 +0000 (13:14 -0800)]
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
John Spurlock [Tue, 28 Jan 2014 14:03:41 +0000 (14:03 +0000)]
Merge "'When to daydream' dialog does not follow the JB dialog design guide"
Per Allard [Tue, 25 Jun 2013 07:54:13 +0000 (09:54 +0200)]
'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
Jun Su [Thu, 18 Jul 2013 09:43:26 +0000 (17:43 +0800)]
Fix memory leak in ManageApplication
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.
Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
Jeff Sharkey [Fri, 10 Jan 2014 23:04:31 +0000 (23:04 +0000)]
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
Amith Yamasani [Tue, 7 Jan 2014 18:37:53 +0000 (18:37 +0000)]
Merge "Dont show "Erase SD Card" when there is none"
Elliott Hughes [Fri, 3 Jan 2014 21:28:12 +0000 (21:28 +0000)]
Merge "Fix elapsed time formatting."
Elliott Hughes [Fri, 3 Jan 2014 20:14:13 +0000 (12:14 -0800)]
Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.
Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Johan Redestig [Thu, 19 Dec 2013 09:30:01 +0000 (10:30 +0100)]
Dont show "Erase SD Card" when there is none
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:
Card present and mounted -> Erase enabled
Card present but unmounted -> Erase enabled
No card present -> Erase disabled
Card present and MTP attached -> Erase disabled
Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
Behrooz Aliabadi [Tue, 16 Jul 2013 10:12:12 +0000 (12:12 +0200)]
Fix null pointer exceptions in NetworkPolicyEditor
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.
Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
Kenny Root [Fri, 13 Dec 2013 21:51:29 +0000 (21:51 +0000)]
Merge "Use java.util.Objects instead of internal API"
Kenny Root [Fri, 13 Dec 2013 21:28:08 +0000 (13:28 -0800)]
Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
The Android Open Source Project [Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)]
Amith Yamasani [Wed, 4 Dec 2013 19:17:33 +0000 (19:17 +0000)]
Merge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Wrong referring to the resource - id/android:id"
Ivan Kovac [Mon, 25 Nov 2013 13:55:21 +0000 (14:55 +0100)]
Wrong referring to the resource - id/android:id
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/
Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
Lorenzo Colitti [Tue, 26 Nov 2013 01:07:24 +0000 (01:07 +0000)]
Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 01:06:38 +0000 (01:06 +0000)]
Merge "Cache preferences and services in status dialog."
Lorenzo Colitti [Fri, 6 Sep 2013 09:04:26 +0000 (18:04 +0900)]
Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.
For consistency, also update the advanced wifi settings page.
[Cherry-pick of
deb8f08ace7e255939d793c8a5a0006d424734bc]
Bug:
10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
Lorenzo Colitti [Thu, 7 Nov 2013 18:53:29 +0000 (03:53 +0900)]
Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.
In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.
[Cherry-pick of
6eb6a908217e080aea43406028be491d269bdbb0]
Bug:
10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
The Android Open Source Project [Fri, 22 Nov 2013 18:35:36 +0000 (10:35 -0800)]
Baligh Uddin [Mon, 18 Nov 2013 19:18:59 +0000 (11:18 -0800)]
am
6d34b698: (-s ours) am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
6d34b6988b257eb35cd7162d403f6da8114e0b9b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
91c54aa81849fd60839ac62efb005df390c64438':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:59:35 +0000 (11:59 -0800)]
am
9c8a463c: am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
beb9a03b716d152ea25813fca3a93a1ec781a685':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:46:33 +0000 (11:46 -0800)]
am
72d674af: (-s ours) am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
72d674af97df6f964f217ad7eddec7ea58612114':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf214892d020d9f310dd583e519bc3e1e8925cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
bug:
11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid. We have already leveraged in TC.
bug:
11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
Baligh Uddin [Fri, 15 Nov 2013 19:15:23 +0000 (11:15 -0800)]
am
67a0472f: (-s ours) am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
67a0472f3f53c924d180fdabe41bb26608219a83':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
503b6deff226b12450decd5997111c77bd179a88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Bug:
11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
Svetoslav [Fri, 15 Nov 2013 06:30:53 +0000 (22:30 -0800)]
am
196bc5c6: am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:
11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
Jeff Brown [Fri, 15 Nov 2013 01:35:01 +0000 (17:35 -0800)]
am
8174aad5: am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
8174aad50382280c55a33f2572eb1fcdb53078c1':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev
Jim Miller [Fri, 15 Nov 2013 00:29:39 +0000 (16:29 -0800)]
am
31ee7e19: am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
Don't show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.
Bug:
11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug
11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
David Christie [Thu, 14 Nov 2013 22:20:31 +0000 (14:20 -0800)]
am
7ff9f2b4: am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 02:37:13 +0000 (18:37 -0800)]
am
2f888a47: (-s ours) am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
2f888a47522f8dcaad3f7ec32274675dd74c1501':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
Jeff Brown [Wed, 13 Nov 2013 17:02:20 +0000 (09:02 -0800)]
am
3aedfdfd: am
81ed0438: Finalize assets for screen cast.
* commit '
3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am
81ed0438: Finalize assets for screen cast.
* commit '
81ed043857dadcb69885c1e2ac37d63925c56c65':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.
Bug:
11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
Baligh Uddin [Mon, 11 Nov 2013 22:48:31 +0000 (14:48 -0800)]
am
74a503fd: (-s ours) am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
74a503fddf2626f6aedec486e9b30c4beb6377e2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
Jeff Brown [Mon, 11 Nov 2013 18:27:24 +0000 (10:27 -0800)]
am
2fba8be9: am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug:
11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
Ed Heyl [Fri, 8 Nov 2013 21:59:55 +0000 (13:59 -0800)]
am
7ebe4c6c: am
a27816dc: merge in release branch changes (no-op).
* commit '
7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am
a27816dc: merge in release branch changes (no-op).
* commit '
a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug:
11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
Robert Greenwalt [Thu, 7 Nov 2013 18:43:11 +0000 (10:43 -0800)]
am
384bf727: am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
384bf72708b623bf48a0395a51db94bda055f496':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:32:55 +0000 (10:32 -0800)]
am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
29b7a8446a36286bd4311ec2f52281fd1628a86e':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:31:03 +0000 (18:31 +0000)]
Merge "Add batch scan data to power stats." into klp-dev
The Android Automerger [Thu, 7 Nov 2013 14:01:28 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:06:01 +0000 (20:06 -0800)]
am
f9be657a: (-s ours) am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f9be657ac28f2530938c24b09458defdbca07c4c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:03:44 +0000 (20:03 -0800)]
am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7d7164361e3e9cf9198fca4050fca81547053b04':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:00:04 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Kenny Root [Wed, 6 Nov 2013 23:14:35 +0000 (15:14 -0800)]
am
279c1e15: am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
279c1e15d23254728783ad99faff7349d9543ac4':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Kenny Root [Wed, 6 Nov 2013 23:11:14 +0000 (15:11 -0800)]
am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
d0de39e716c7d93beeb83f9b442af437be651e55':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 23:09:05 +0000 (23:09 +0000)]
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
Baligh Uddin [Wed, 6 Nov 2013 22:34:35 +0000 (14:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Lifu Tang [Wed, 6 Nov 2013 06:26:19 +0000 (22:26 -0800)]
am
5b68e4c8: am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
Shows LGAAYL when launching Location Settings
Lifu Tang [Wed, 6 Nov 2013 06:23:01 +0000 (22:23 -0800)]
am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
741bc054243576dcfff17bf3a807dc8732bca332':
Shows LGAAYL when launching Location Settings
Lifu Tang [Wed, 6 Nov 2013 06:20:56 +0000 (06:20 +0000)]
Merge "Shows LGAAYL when launching Location Settings" into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:56:59 +0000 (18:56 -0800)]
am
36ddea8c: am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
36ddea8c212b21dc24e270ce7d20023db1477a32':
Remove line break.
Jason Monk [Wed, 6 Nov 2013 02:56:49 +0000 (18:56 -0800)]
am
c85359ef: am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
c85359ef11221c09e7a5d55692ffda0f98b8e00c':
Add PAC UI to Wi-Fi Settings
Geoffrey Borggaard [Wed, 6 Nov 2013 02:39:31 +0000 (18:39 -0800)]
am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
5b7111d05db50d479290517b1b459dbcfc178a7f':
Remove line break.
Geoffrey Borggaard [Wed, 6 Nov 2013 02:37:48 +0000 (02:37 +0000)]
Merge "Remove line break." into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:22:58 +0000 (18:22 -0800)]
am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
4e42c80872e3543247913afd270fe5b9950b2969':
Add PAC UI to Wi-Fi Settings
Jason Monk [Wed, 6 Nov 2013 02:20:49 +0000 (02:20 +0000)]
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:49:37 +0000 (15:49 -0800)]
am
e202393f: (-s ours) am
1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e202393f797540ebd2c472dd63b63557e9fcbab9':
Import translations. DO NOT MERGE
Amith Yamasani [Tue, 5 Nov 2013 23:49:25 +0000 (15:49 -0800)]
am
f7f6e4bf: am
060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
* commit '
f7f6e4bfc6e9dbfb8b2b22875e62a5bfa8e1a82a':
Adjust power control widget minWidth to occupy 4 cells.
Baligh Uddin [Tue, 5 Nov 2013 23:15:23 +0000 (15:15 -0800)]
am
1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1bfd35410db22b1f4aabe4ad3f471bedb088584d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:12:13 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Amith Yamasani [Tue, 5 Nov 2013 21:54:00 +0000 (13:54 -0800)]
am
060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
* commit '
060d5fd1727b087094e295481b2633deb33a6616':
Adjust power control widget minWidth to occupy 4 cells.
Amith Yamasani [Tue, 5 Nov 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
Jason Monk [Tue, 5 Nov 2013 16:54:48 +0000 (11:54 -0500)]
Add PAC UI to Wi-Fi Settings
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None. This should only be visible in EDU users as only EDU
has PAC.
Bug:
11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
Elliott Hughes [Tue, 5 Nov 2013 18:35:25 +0000 (10:35 -0800)]
am
98f5e186: am
c3a6cd6e: Merge "Move a line into try block"
* commit '
98f5e1861da4d708e7199b5d563895cf4d2c8db7':
Move a line into try block
Elliott Hughes [Tue, 5 Nov 2013 18:30:01 +0000 (10:30 -0800)]
am
c3a6cd6e: Merge "Move a line into try block"
* commit '
c3a6cd6ee531c81f776551caa40b63732115e971':
Move a line into try block
Geoffrey Borggaard [Tue, 5 Nov 2013 18:10:49 +0000 (13:10 -0500)]
Remove line break.
The "network may be monitored" message had an extra line break.
Bug:
11534572
Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
OSDN Git Service
