git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Amith Yamasani [Thu, 21 Aug 2014 21:03:27 +0000 (21:03 +0000)]

am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev

* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
Fix layout of Apn Settings screen

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Aug 2014 20:51:44 +0000 (20:51 +0000)]

Merge "Fix layout of Apn Settings screen" into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Aug 2014 20:30:35 +0000 (13:30 -0700)]

Fix layout of Apn Settings screen

Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1

am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev

* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
Disable non-permitted accessibility services and IMEs

Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev

commit | commitdiff | tree

Diego Pontoriero [Thu, 21 Aug 2014 16:41:56 +0000 (16:41 +0000)]

am dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev

* commit 'dbfd04d80abb4bb605ebd517d52137108cc24d6d':
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.

commit | commitdiff | tree

Diego Pontoriero [Thu, 21 Aug 2014 16:34:37 +0000 (16:34 +0000)]

Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Thu, 21 Aug 2014 16:31:05 +0000 (16:31 +0000)]

am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

* commit '98f61b71ac182d87256ea21e770b57c1168d1472':
Fixed a crash when sharing video through Bluetooth.

commit | commitdiff | tree

PauloftheWest [Thu, 21 Aug 2014 16:24:10 +0000 (16:24 +0000)]

Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

Disable non-permitted accessibility services and IMEs

Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 22:10:56 +0000 (15:10 -0700)]

Fixed a crash when sharing video through Bluetooth.

+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.

Bug: 17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b

am 10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev

* commit '10673f1a1e330cf20ddab04fbc09cce3f18d111d':
rename ScanResult.status -> autoJoinStatus

Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev

commit | commitdiff | tree

Jessica Hummel [Thu, 21 Aug 2014 11:35:04 +0000 (11:35 +0000)]

am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev

* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
Make string for work profile consistent with provisioning and framework strings.

commit | commitdiff | tree

Jessica Hummel [Thu, 21 Aug 2014 11:28:23 +0000 (11:28 +0000)]

Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 21 Aug 2014 04:15:26 +0000 (04:15 +0000)]

am fe3794a9: Remove "Choose Keyboards" settings

* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
Remove "Choose Keyboards" settings

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 21 Aug 2014 02:41:57 +0000 (11:41 +0900)]

Remove "Choose Keyboards" settings

Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037

commit | commitdiff | tree

Jeff Davidson [Thu, 21 Aug 2014 00:56:07 +0000 (00:56 +0000)]

am 8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev

* commit '8a983e438bbc0e851471b9d58f44778584a67075':
Suppress WiFi Assistant card until future platform updates.

commit | commitdiff | tree

Jeff Davidson [Thu, 21 Aug 2014 00:09:47 +0000 (00:09 +0000)]

am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev

* commit '4e064343b35cfa6a7615e453c1f6bcf96397e414':
Less intrusive VPN dialog.

commit | commitdiff | tree

Diego Pontoriero [Tue, 12 Aug 2014 01:25:51 +0000 (18:25 -0700)]

Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
for determining carrier app instead of MCC/MNC.

Related WirelessSettings change: http://ag/374330

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 22:10:17 +0000 (22:10 +0000)]

am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev

* commit 'e847e7ef56561bf7ac824d4e5aa742be08f92624':
Added a default Bluetooth icon for Bluetooth Preferences.

commit | commitdiff | tree

Jeff Davidson [Wed, 20 Aug 2014 23:59:30 +0000 (23:59 +0000)]

Merge "Less intrusive VPN dialog." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 21:56:55 +0000 (21:56 +0000)]

Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 21:46:37 +0000 (14:46 -0700)]

Added a default Bluetooth icon for Bluetooth Preferences.

Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 21:17:34 +0000 (21:17 +0000)]

am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev

* commit 'd251fba2fe308ea6aa18002c92506fca9d53848d':
Fixed a Bluetooth Scanning issue.

rename ScanResult.status -> autoJoinStatus

This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3

Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 21:08:26 +0000 (21:08 +0000)]

am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev

* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
Update string for profile owner addition warning

commit | commitdiff | tree

Jeff Davidson [Thu, 21 Aug 2014 00:47:29 +0000 (00:47 +0000)]

Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 20:12:08 +0000 (20:12 +0000)]

am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev

* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
Fixed a Settings dialog crash.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 19:53:04 +0000 (19:53 +0000)]

am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev

* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
Settings: Remove needless dialogTitle attribute.

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 20:58:45 +0000 (20:58 +0000)]

Merge "Update string for profile owner addition warning" into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 20:43:13 +0000 (13:43 -0700)]

Update string for profile owner addition warning

Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0

commit | commitdiff | tree

Jon Miranda [Wed, 20 Aug 2014 15:30:30 +0000 (15:30 +0000)]

am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev

* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
Added a developer option to save attribute data.

commit | commitdiff | tree

Jessica Hummel [Wed, 20 Aug 2014 08:18:24 +0000 (09:18 +0100)]

Make string for work profile consistent with provisioning and framework strings.

Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 03:19:32 +0000 (03:19 +0000)]

am ff0e81eb: Declare CAST_SETTINGS activity.

* commit 'ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
Declare CAST_SETTINGS activity.

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 00:47:54 +0000 (17:47 -0700)]

Declare CAST_SETTINGS activity.

Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.

Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f

commit | commitdiff | tree

Maurice Lam [Wed, 20 Aug 2014 02:22:21 +0000 (02:22 +0000)]

am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev

* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
[WifiSetup] Change illustration aspect ratio

commit | commitdiff | tree

Jon Miranda [Wed, 20 Aug 2014 15:24:32 +0000 (15:24 +0000)]

Merge "Added a developer option to save attribute data." into lmp-dev

commit | commitdiff | tree

Maurice Lam [Wed, 20 Aug 2014 01:59:43 +0000 (01:59 +0000)]

Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev

commit | commitdiff | tree

Alan Viverette [Wed, 20 Aug 2014 00:47:11 +0000 (00:47 +0000)]

am aaa066b6: Add "experimental" subtitle to color correction and inversion

* commit 'aaa066b66d4c8acf8931e624cf81376ac35d358e':
Add "experimental" subtitle to color correction and inversion

commit | commitdiff | tree

Alan Viverette [Wed, 20 Aug 2014 00:37:16 +0000 (17:37 -0700)]

Add "experimental" subtitle to color correction and inversion

BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 21:09:42 +0000 (21:09 +0000)]

Merge "Fixed a Bluetooth Scanning issue." into lmp-dev

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 20:59:13 +0000 (20:59 +0000)]

am b7b686ca: Merge "Fix encryption strings" into lmp-dev

* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
Fix encryption strings

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 20:59:12 +0000 (20:59 +0000)]

am d5a497b8: Merge "Change decryption strings" into lmp-dev

* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
Change decryption strings

commit | commitdiff | tree

Maurice Lam [Tue, 19 Aug 2014 20:20:27 +0000 (13:20 -0700)]

[WifiSetup] Change illustration aspect ratio

Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.

Bug: 17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab

commit | commitdiff | tree

Lorenzo Colitti [Tue, 19 Aug 2014 19:29:01 +0000 (19:29 +0000)]

am f1b786d8: Stop using LinkProperties for static configuration.

* commit 'f1b786d8a8dc894904c5edc6e375da0e7ddb7ed4':
Stop using LinkProperties for static configuration.

commit | commitdiff | tree

Lorenzo Colitti [Tue, 12 Aug 2014 01:05:51 +0000 (10:05 +0900)]

Stop using LinkProperties for static configuration.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df

commit | commitdiff | tree

Julia Reynolds [Tue, 19 Aug 2014 18:54:36 +0000 (18:54 +0000)]

am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev

* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
Supress menu if screen ought to be hidden.

am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev

* commit '72bd4d252dc7a706b661f2970396dc0211d7b4de':
Dim the preference icons when its disabled

Merge "Dim the preference icons when its disabled" into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Tue, 19 Aug 2014 15:43:40 +0000 (15:43 +0000)]

am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev

* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
Update strings for guest removal affordance and dialog

am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev

* commit '081a9162c959f9cbd0cbd76674501cdb47d516a7':
Set switch to the correct enabling state

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 20:03:17 +0000 (20:03 +0000)]

Merge "Fixed a Settings dialog crash." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Wed, 20 Aug 2014 17:55:12 +0000 (10:55 -0700)]

Fixed a Settings dialog crash.

+ Fixed a bug where Settings would crash when trying to open paired bluetooth
device settings after device orientation change.

Bug: 16972564
Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24

Merge "Set switch to the correct enabling state" into lmp-dev

commit | commitdiff | tree

Jeff Davidson [Tue, 19 Aug 2014 01:13:43 +0000 (18:13 -0700)]

Suppress WiFi Assistant card until future platform updates.

This replaces the previous behavior of an increasing timeout. When the
user dismisses the WiFi Assistant card, either by opting out or
successfully configuring the assistant, the card is suppressed until
the next major platform upgrade (assuming the assistant is not enabled
at the time of the upgrade).

Bug: 16902858
Change-Id: I5373a7a743f21777b7b75a620b5a4e9004e57466

commit | commitdiff | tree

Jon Miranda [Tue, 12 Aug 2014 16:08:29 +0000 (09:08 -0700)]

Added a developer option to save attribute data.

After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.

Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849

Set switch to the correct enabling state

- Fix b/16951708

Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 21:44:48 +0000 (14:44 -0700)]

Fixed a Bluetooth Scanning issue.

+ When refreshing Bluetooth devices, sometimes it took awhile for some
devices to come back up. This is a fix.

Bug: 17049458
Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:07:36 +0000 (20:07 +0000)]

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.

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:07:35 +0000 (20:07 +0000)]

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.

Dim the preference icons when its disabled

- Fix b/16956979

Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 16:56:17 +0000 (16:56 +0000)]

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.

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 16:39:54 +0000 (16:39 +0000)]

am cd88c2f7: Fix Account Settings crash

* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 13:34:08 +0000 (14:34 +0100)]

Fix Account Settings crash

Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4

commit | commitdiff | tree

Baligh Uddin [Sun, 17 Aug 2014 14:08:30 +0000 (14:08 +0000)]

am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adam Lesinski [Sat, 16 Aug 2014 06:49:40 +0000 (06:49 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Sat, 16 Aug 2014 04:38:20 +0000 (04:38 +0000)]

am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE

* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 19:42:48 +0000 (19:42 +0000)]

Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 19:37:07 +0000 (15:37 -0400)]

Settings: Remove needless dialogTitle attribute.

DropDownPreference has no dialog, and therefore no title.

Remove to avoid confusion for future copy-pasters.

Bug:16241745
Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0

commit | commitdiff | tree

Amith Yamasani [Tue, 19 Aug 2014 15:39:37 +0000 (15:39 +0000)]

Merge "Update strings for guest removal affordance and dialog" into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Mon, 18 Aug 2014 23:42:43 +0000 (16:42 -0700)]

Update strings for guest removal affordance and dialog

Exit guest -> Remove guest
etc.

Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:00:36 +0000 (20:00 +0000)]

Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 16:25:03 +0000 (09:25 -0700)]

Fixed a crash when rotating a saved networks dialog.

Bug: 16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 16:50:04 +0000 (16:50 +0000)]

Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 12:16:17 +0000 (13:16 +0100)]

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

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 20:49:52 +0000 (20:49 +0000)]

Merge "Change decryption strings" into lmp-dev

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 15:55:26 +0000 (08:55 -0700)]

Change decryption strings

Bug: 17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:00:11 +0000 (20:00 +0000)]

Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 18:49:09 +0000 (11:49 -0700)]

Fixed a bug were AdvanceWifiSettings would crash on resume.

Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5

commit | commitdiff | tree

Baligh Uddin [Sat, 16 Aug 2014 04:02:06 +0000 (04:02 +0000)]

am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE

* commit '2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 17 Aug 2014 13:49:40 +0000 (13:49 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 16 Aug 2014 07:01:16 +0000 (00:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import

commit | commitdiff | tree

Adam Lesinski [Sat, 16 Aug 2014 06:43:23 +0000 (06:43 +0000)]

Merge "Added Warning dialog when enabling usage access for app" into lmp-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 12 Aug 2014 03:54:12 +0000 (20:54 -0700)]

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

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 20:50:14 +0000 (20:50 +0000)]

Merge "Fix encryption strings" into lmp-dev

commit | commitdiff | tree

Julia Reynolds [Tue, 19 Aug 2014 18:43:31 +0000 (18:43 +0000)]

Merge "Supress menu if screen ought to be hidden." into lmp-dev

commit | commitdiff | tree

Julia Reynolds [Mon, 18 Aug 2014 20:04:48 +0000 (16:04 -0400)]

Supress menu if screen ought to be hidden.

Bug: 14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4

commit | commitdiff | tree

Christopher Tate [Sat, 16 Aug 2014 00:43:04 +0000 (00:43 +0000)]

am 568eeca5: Disallow downgrade of bundled home apps

* commit '568eeca569f97bfdd7cf6ae3b9cb5e7360eadc2c':
Disallow downgrade of bundled home apps

commit | commitdiff | tree

Christopher Tate [Fri, 15 Aug 2014 16:20:46 +0000 (09:20 -0700)]

Disallow downgrade of bundled home apps

Bug 14162565

Change-Id: I754721178722edbf0765039bc9669ed24b92633c

commit | commitdiff | tree

Baligh Uddin [Fri, 15 Aug 2014 22:36:02 +0000 (22:36 +0000)]

am b3b64705: (-s ours) Import translations. DO NOT MERGE

* commit 'b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Davidson [Tue, 12 Aug 2014 22:59:01 +0000 (15:59 -0700)]

Less intrusive VPN dialog.

Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91

commit | commitdiff | tree

Jim Miller [Fri, 15 Aug 2014 21:45:31 +0000 (21:45 +0000)]

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.

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 15 Aug 2014 21:37:24 +0000 (21:37 +0000)]

am 4325f808: Update NFC to use a SwitchPreference

* commit '4325f8080888bd3b15246f5bbd9db878aced030c':
Update NFC to use a SwitchPreference

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 15 Aug 2014 21:14:17 +0000 (14:14 -0700)]

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

commit | commitdiff | tree

Jim Miller [Fri, 15 Aug 2014 21:36:38 +0000 (21:36 +0000)]

Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev

commit | commitdiff | tree

Jim Miller [Fri, 15 Aug 2014 21:28:58 +0000 (14:28 -0700)]

Remove temporary workaround for GMS TrustAgent while API changed.

Fixes bug 16401527

Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e

commit | commitdiff | tree

Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import

commit | commitdiff | tree

Glenn Kasten [Fri, 15 Aug 2014 21:07:10 +0000 (21:07 +0000)]

am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev

* commit '2be2a8a47f5ef585301479268752aa3d7d3a9261':
Increase character limit for translation

am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.

* commit '300e920f66c03b390ce738ccf4d4646ffa039d40':
Keep SwitchPreference status until user makes choice in confirmation dialog.