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

Jeff Brown [Wed, 20 Aug 2014 03:31:48 +0000 (03:31 +0000)]

am 2cd05f71: am ff0e81eb: Declare CAST_SETTINGS activity.

* commit '2cd05f71230bfdb04abc792e605b0d68befb01ce':
Declare CAST_SETTINGS activity.

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:44:34 +0000 (02:44 +0000)]

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

* commit '8904061e66e52491cb0cecb4bb1ade418d254f63':
[WifiSetup] Change illustration aspect ratio

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

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:54:45 +0000 (00:54 +0000)]

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

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

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

Paul Lawrence [Tue, 19 Aug 2014 21:08:15 +0000 (21:08 +0000)]

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

* commit '17f213d781a394378c9e944d6fefee5dd56d7c25':
Fix encryption strings

commit | commitdiff | tree

Paul Lawrence [Tue, 19 Aug 2014 21:08:12 +0000 (21:08 +0000)]

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

* commit '71894714c920cc08aa15c1423d3f370cbcc2f409':
Change decryption strings

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:37:42 +0000 (19:37 +0000)]

am d73fc0c8: am f1b786d8: Stop using LinkProperties for static configuration.

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

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

Julia Reynolds [Tue, 19 Aug 2014 19:02:52 +0000 (19:02 +0000)]

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

* commit '51e8febf8c4b522a9704b3ba9bb19a2f7f45a0f5':
Supress menu if screen ought to be hidden.

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.

commit | commitdiff | tree

Lifu Tang [Tue, 19 Aug 2014 17:41:12 +0000 (17:41 +0000)]

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

* commit '6a86746f98b760728180931ef23956e97ae09e8b':
Dim the preference icons when its disabled

commit | commitdiff | tree

Lifu Tang [Tue, 19 Aug 2014 17:32:13 +0000 (17:32 +0000)]

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

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

commit | commitdiff | tree

Amith Yamasani [Tue, 19 Aug 2014 15:51:04 +0000 (15:51 +0000)]

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

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

commit | commitdiff | tree

Lifu Tang [Tue, 19 Aug 2014 17:25:19 +0000 (17:25 +0000)]

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

commit | commitdiff | tree

Lifu Tang [Tue, 19 Aug 2014 04:36:14 +0000 (04:36 +0000)]

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

* commit '47cdb7276230b87a3a9ba75073a483fb7c531036':
Set switch to the correct enabling state

commit | commitdiff | tree

Lifu Tang [Tue, 19 Aug 2014 04:29:17 +0000 (04:29 +0000)]

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

Lifu Tang [Tue, 19 Aug 2014 04:24:09 +0000 (04:24 +0000)]

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

commit | commitdiff | tree

Lifu Tang [Mon, 18 Aug 2014 23:46:48 +0000 (16:46 -0700)]

Set switch to the correct enabling state

- Fix b/16951708

Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:15:04 +0000 (20:15 +0000)]

am a4ab5a3a: am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev

* commit 'a4ab5a3a2b0924d55445a1c195336bd9e237d577':
Fixed a crash when rotating a saved networks dialog.

commit | commitdiff | tree

PauloftheWest [Mon, 18 Aug 2014 20:15:03 +0000 (20:15 +0000)]

am 480fcb24: am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev

* commit '480fcb2432c6a1d0615eacdf50b144ce5e435dae':
Fixed a bug were AdvanceWifiSettings would crash on resume.

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.

commit | commitdiff | tree

Lifu Tang [Mon, 18 Aug 2014 18:08:43 +0000 (11:08 -0700)]

Dim the preference icons when its disabled

- Fix b/16956979

Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7

commit | commitdiff | tree

Alexandra Gherghina [Mon, 18 Aug 2014 17:07:05 +0000 (17:07 +0000)]

am 9db8f0aa: am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev

* commit '9db8f0aaf3f220208e50b088e4114ee41b0ff19c':
Switch to listening for USER_INITIALIZE broadcast in the Settings app.

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:44:28 +0000 (16:44 +0000)]

am 4b81ebf2: am cd88c2f7: Fix Account Settings crash

* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
Fix Account Settings crash

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:24:12 +0000 (14:24 +0000)]

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

* commit '1f4e0347b903823a19417e57d0e398e6e9c5dda6':
Import translations. DO NOT MERGE

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:56:29 +0000 (06:56 +0000)]

am 82951de9: am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev

* commit '82951de9fe1be4686e80ea61807140274deaff50':
Added Warning dialog when enabling usage access for app

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:51:34 +0000 (04:51 +0000)]

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

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

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

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:49:10 +0000 (00:49 +0000)]

am 98774d34: am 568eeca5: Disallow downgrade of bundled home apps

* commit '98774d3445e988840d4f68a91fbe7b9f48c3364c':
Disallow downgrade of bundled home apps

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

Jim Miller [Fri, 15 Aug 2014 22:04:00 +0000 (22:04 +0000)]

am 0b4e4fb1: am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev

* commit '0b4e4fb1102eb2ec421faa81afcb889eacb7f772':
Remove temporary workaround for GMS TrustAgent while API changed.

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:42:46 +0000 (21:42 +0000)]

am e15902d6: am 4325f808: Update NFC to use a SwitchPreference

* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
Update NFC to use a SwitchPreference

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:17:31 +0000 (21:17 +0000)]

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

* commit 'e89abcc8e88bec69e37f11fa051b9b299246a0f3':
Increase character limit for translation

commit | commitdiff | tree

arete [Fri, 15 Aug 2014 21:17:29 +0000 (21:17 +0000)]

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

* commit '4595b470d37a3152d6f76488414e58da3ad516a4':
Keep SwitchPreference status until user makes choice in confirmation dialog.

commit | commitdiff | tree

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

am 880de9f2: am e3bced2c: Update Airplane mode to use a SwitchPreference

* commit '880de9f2edd81e1ad09158f07893374053210778':
Update Airplane mode to use a SwitchPreference

commit | commitdiff | tree

Maurice Lam [Fri, 15 Aug 2014 21:17:07 +0000 (21:17 +0000)]

am 03ec9ff4: am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev

* commit '03ec9ff4395ea2275e54e40f6ecdaa2721cf26e9':
[WifiSetup] Use framework AutoMirrored

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Aug 2014 21:16:59 +0000 (21:16 +0000)]

am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev

* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
Disable disable button according to user restrictions.

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

commit | commitdiff | tree

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

am 1b1f3d59: am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev

* commit '1b1f3d5949a68967e5cc405d5aed1c357ecb0aa0':
Fix bug #16703191 APN settings shows back button even when you intent into it

commit | commitdiff | tree

arete [Fri, 15 Aug 2014 20:56:44 +0000 (20:56 +0000)]

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

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

commit | commitdiff | tree

arete [Fri, 15 Aug 2014 19:04:48 +0000 (12:04 -0700)]

Keep SwitchPreference status until user makes choice in confirmation dialog.

Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 15 Aug 2014 20:45:12 +0000 (20:45 +0000)]

am e3bced2c: Update Airplane mode to use a SwitchPreference

* commit 'e3bced2cdaf70812f658c45c170e4943ed79dfaf':
Update Airplane mode to use a SwitchPreference

commit | commitdiff | tree

Maurice Lam [Fri, 15 Aug 2014 20:36:35 +0000 (20:36 +0000)]

am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev

* commit 'cd93d141302ee374285d5a8dcd97bc7ab61298cc':
[WifiSetup] Use framework AutoMirrored

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 6 Aug 2014 17:22:52 +0000 (10:22 -0700)]

Update Airplane mode to use a SwitchPreference

- do the switch

See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Aug 2014 20:23:20 +0000 (20:23 +0000)]

am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev

* commit 'fad2b09db8cf65478db35f9a8265c948ccffeabc':
Disable disable button according to user restrictions.

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]

Merge "Disable disable button according to user restrictions." into lmp-dev

commit | commitdiff | tree

Glenn Kasten [Fri, 15 Aug 2014 21:01:17 +0000 (21:01 +0000)]

Merge "Increase character limit for translation" into lmp-dev

commit | commitdiff | tree

Glenn Kasten [Fri, 15 Aug 2014 20:24:45 +0000 (13:24 -0700)]

Increase character limit for translation

Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75

commit | commitdiff | tree

Maurice Lam [Fri, 15 Aug 2014 20:29:32 +0000 (20:29 +0000)]

Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev

commit | commitdiff | tree

Maurice Lam [Fri, 15 Aug 2014 19:04:12 +0000 (12:04 -0700)]

[WifiSetup] Use framework AutoMirrored

Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.

Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 15 Aug 2014 18:46:56 +0000 (18:46 +0000)]

am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev

* commit '0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
Fix bug #16703191 APN settings shows back button even when you intent into it

commit | commitdiff | tree

John Spurlock [Fri, 15 Aug 2014 15:21:49 +0000 (15:21 +0000)]

am 9c979df2: am a7f8addd: Settings: Update to follow NotificationManager aidl change.

* commit '9c979df2d6a768e909b546dc198f005c17ebeeab':
Settings: Update to follow NotificationManager aidl change.

commit | commitdiff | tree

John Spurlock [Fri, 15 Aug 2014 15:16:15 +0000 (15:16 +0000)]

am a7f8addd: Settings: Update to follow NotificationManager aidl change.

* commit 'a7f8addd0982f599105aeb9611477b149860db83':
Settings: Update to follow NotificationManager aidl change.

commit | commitdiff | tree

John Spurlock [Thu, 14 Aug 2014 17:03:13 +0000 (13:03 -0400)]

Settings: Update to follow NotificationManager aidl change.

Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7

Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f

commit | commitdiff | tree

Baligh Uddin [Fri, 15 Aug 2014 11:50:34 +0000 (11:50 +0000)]

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

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

commit | commitdiff | tree

Maurice Lam [Fri, 15 Aug 2014 11:50:00 +0000 (11:50 +0000)]

am 2d57c470: am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev

* commit '2d57c4705d73f37e0c7c1b96cc9e1288e4c17306':
[WifiSetup] Update illustrations

commit | commitdiff | tree

Jim Miller [Fri, 15 Aug 2014 11:49:21 +0000 (11:49 +0000)]

am adf93411: am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev

* commit 'adf9341125fac14aef7beb272f6371a6aafb4aa3':
API review - move confirm credential constants from Intent

commit | commitdiff | tree

Selim Gurun [Fri, 15 Aug 2014 11:48:32 +0000 (11:48 +0000)]

am 63b671c8: am ce8d3910: Remove logic to read the key from GServices

* commit '63b671c84b48703bbc2d554fa378b8c1e853e19c':
Remove logic to read the key from GServices