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

Jason Monk [Fri, 29 Apr 2016 19:01:01 +0000 (19:01 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af
am: fc63188c2c

* commit 'fc63188c2cbb6fbda340c9f8c9c7b4541b160912':
Don't crash on Settings data usage

Change-Id: Iada79f9953fea61a164ddac887dff6aafce14553

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage

Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]

Merge "Don't crash on Settings data usage" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 18:29:30 +0000 (18:29 +0000)]

Merge "Disable stable id in support adapter." into nyc-mr1-dev
am: 7efc40797a

* commit '7efc40797af03adc9b56e9f87acba4fa4d659940':
Disable stable id in support adapter.

Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 18:20:50 +0000 (18:20 +0000)]

Merge "Disable stable id in support adapter." into nyc-mr1-dev

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:06:10 +0000 (14:06 -0400)]

Don't crash on Settings data usage

Consider Settings uid (SYSTEM_UID) to be an app.

Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:59:52 +0000 (17:59 +0000)]

Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:59:47 +0000 (17:59 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cf5a448ce5

* commit 'cf5a448ce57883088fa7f6b3d6683065e266470f':
Don't crash settings when out of space.

Change-Id: I3772a8b5210130f3cfbf4c7b6fe5d487eb9ace53

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:59:36 +0000 (17:59 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cd5d6137bc

* commit 'cd5d6137bc893f21928f6e77c70963780fc6e159':
Don't crash settings when out of space.

Change-Id: I04e91645bb1e35b28ab1900d1f172d0633e2dc11

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:57:27 +0000 (17:57 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev
am: a1fe122b99

* commit 'a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.

Change-Id: Id336b4dcf1ab7fce3581286d598cf590c4973548

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:57:24 +0000 (17:57 +0000)]

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:54:33 +0000 (17:54 +0000)]

Merge "Don't crash settings when out of space." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:44 +0000 (17:53 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:53:38 +0000 (17:53 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':

Change-Id: Ia1ee12e5410a835a3c6382208dd3a79a8aa37d3d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:01 +0000 (17:53 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:52:51 +0000 (17:52 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':
Fix: accessibility actions move languages but don't update

Change-Id: Ibbbcf694cb80a9ec586bce48a5cab07c98e7c38f

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:52:50 +0000 (17:52 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: 48db95270e

* commit '48db95270ec9a85edd15b1df1085aad0020851ba':
Fix: accessibility actions move languages but don't update

Change-Id: I99157a90add1fb4bdaa513a6b479d2c7d1634fde

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:51:08 +0000 (13:51 -0400)]

Don't crash settings when out of space.

Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128

commit | commitdiff | tree

Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am: 7dce005fab

* commit '7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update

Change-Id: Ie565b3a9d7d7caa00d8be389774b397339fec1b9

commit | commitdiff | tree

Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:46:16 +0000 (17:46 +0000)]

Merge "Fix: accessibility actions move languages but don't update" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:42:08 +0000 (17:42 +0000)]

Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:42:01 +0000 (17:42 +0000)]

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425

* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':

Change-Id: Id0f502c4093c7d48f4ec41c75e070c64df791298

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:41:23 +0000 (17:41 +0000)]

Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:41:17 +0000 (17:41 +0000)]

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425

* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':
Remove Secure Startup option from Security Settings

Change-Id: I68b498dba4eb5ea66768c07653aa9e2993940dcb

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:41:14 +0000 (17:41 +0000)]

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 1159a0a79c

* commit '1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
Remove Secure Startup option from Security Settings

Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:39:05 +0000 (17:39 +0000)]

Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings

Change-Id: Ife90c8effce61106a438ccd9158a001792810ede

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:38:56 +0000 (17:38 +0000)]

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:28:42 +0000 (17:28 +0000)]

Merge "Remove Secure Startup option from Security Settings" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 17:23:21 +0000 (10:23 -0700)]

Disable stable id in support adapter.

Bug: 28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 16:51:25 +0000 (16:51 +0000)]

Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663
am: 0a84fd121d

* commit '0a84fd121d8bf2c1301f4d4eb6465212f1172094':

Change-Id: I4645e0dbad308748f873bc38103996e655c5efb8

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 16:49:04 +0000 (16:49 +0000)]

Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663
am: 55fc7dd52b

* commit '55fc7dd52b5eb6a736c8a48fc5cddbb343c02a16':
Storage Settings shows hamburger instead of back arrow

Change-Id: Id4fa67b14edaaefd698f9ab0522ff271fc42b345

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 16:46:28 +0000 (16:46 +0000)]

Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am: d2549ce663

* commit 'd2549ce6635943144bde17582b825113c07aa868':
Storage Settings shows hamburger instead of back arrow

Change-Id: Icc2014157f5160968563fdbaab175cbd90a76d58

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 16:46:27 +0000 (16:46 +0000)]

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 16:38:11 +0000 (16:38 +0000)]

Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 15:58:09 +0000 (16:58 +0100)]

Storage Settings shows hamburger instead of back arrow

When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.

Bug: 28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 15:56:25 +0000 (15:56 +0000)]

Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
am: 050d94151f

* commit '050d94151fa931ee2c90a1c949090f66aa032792':
Prompt sign-in when there is no account for support options

Change-Id: I6b78faaf8080a5c0e6c4158592c297e1d9728039

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 15:49:30 +0000 (15:49 +0000)]

Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 14:37:39 +0000 (14:37 +0000)]

Merge "Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 9f6de156ca" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 14:37:27 +0000 (14:37 +0000)]

Merge "Fix NPE in user settings." into nyc-dev am: e69d754865
am: 9f6de156ca

* commit '9f6de156ca1391e386f86c284226269519381865':
Fix NPE in user settings.

Change-Id: Ia8ab48b8db1e29f046ba0ac41ea8f1cc62b697fb

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 14:37:26 +0000 (14:37 +0000)]

Merge "Fix NPE in user settings." into nyc-dev am: e69d754865
am: 1d5fbf6672

* commit '1d5fbf66729b76485362beb26771592370bdef7b':
Fix NPE in user settings.

Change-Id: I80b5e7c37b158ed03f43eeef78b4359ed107b730

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)]

Merge "Fix NPE in user settings." into nyc-dev
am: e69d754865

* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.

Change-Id: Icb2585bb7619e9bac4592f904b8978b8668ba4ff

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)]

Merge "Fix NPE in user settings." into nyc-dev
am: e69d754865

* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.

Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 14:29:18 +0000 (14:29 +0000)]

Merge "Fix NPE in user settings." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 13:36:56 +0000 (13:36 +0000)]

Merge "Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 am: 5d8a18ce2a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Shweta Chahar [Fri, 29 Apr 2016 13:36:45 +0000 (13:36 +0000)]

Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351
am: 5d8a18ce2a

* commit '5d8a18ce2addbb2304e9db6787b2e5d412aac8ee':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I46d54f787d0265a4329ddcbb76fcf9955f3921db

commit | commitdiff | tree

Shweta Chahar [Fri, 29 Apr 2016 13:36:43 +0000 (13:36 +0000)]

Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351
am: bf4e0306bc

* commit 'bf4e0306bc9acf8fcb00df87e8f03755f0c06c7a':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I77472d9ba0ddce30a5e99d9b65725312521d85ec

commit | commitdiff | tree

shwetachahar [Fri, 29 Apr 2016 13:34:19 +0000 (13:34 +0000)]

Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
am: 19c01f0351

* commit '19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I0b55dd38a001726331012df441de34ba998c512f

commit | commitdiff | tree

shwetachahar [Fri, 29 Apr 2016 13:34:19 +0000 (13:34 +0000)]

commit | commitdiff | tree

Shweta Chahar [Fri, 29 Apr 2016 13:29:10 +0000 (13:29 +0000)]

Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Fri, 29 Apr 2016 12:42:01 +0000 (08:42 -0400)]

Fix NPE in user settings.

Bug: 28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 28 Apr 2016 23:24:20 +0000 (23:24 +0000)]

Merge "Handling of issues while migrating primary storage am: 1ec941db0c am: 4d2714fd10" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Thu, 28 Apr 2016 23:24:08 +0000 (23:24 +0000)]

Handling of issues while migrating primary storage am: 1ec941db0c
am: 4d2714fd10

* commit '4d2714fd10c628c8b3b060d57d428fdffcf94217':
Handling of issues while migrating primary storage

Change-Id: If2e9111ea8c2f2b568ca23dcc935bb582b4a32cc

commit | commitdiff | tree

Philip P. Moltmann [Thu, 28 Apr 2016 23:24:06 +0000 (23:24 +0000)]

Handling of issues while migrating primary storage am: 1ec941db0c
am: 16d64842d9

* commit '16d64842d9b4e54f3e99a760e60918ac4f16bddf':
Handling of issues while migrating primary storage

Change-Id: I0c817a826c44e42ab169423eac9500c92650fb7e

commit | commitdiff | tree

Philip P. Moltmann [Thu, 28 Apr 2016 23:21:50 +0000 (23:21 +0000)]

Handling of issues while migrating primary storage
am: 1ec941db0c

* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage

Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65

commit | commitdiff | tree

Philip P. Moltmann [Thu, 28 Apr 2016 23:21:48 +0000 (23:21 +0000)]

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 17:45:39 +0000 (10:45 -0700)]

Handling of issues while migrating primary storage

Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452

commit | commitdiff | tree

Fan Zhang [Tue, 26 Apr 2016 22:05:04 +0000 (15:05 -0700)]

Prompt sign-in when there is no account for support options

Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995

commit | commitdiff | tree

Julia Reynolds [Thu, 28 Apr 2016 19:39:47 +0000 (19:39 +0000)]

Expand BT screen. am: 05c6a2c007
am: 8acb204098

* commit '8acb204098fffe65159a4332636ed2e133dd1459':

Change-Id: I2880d62010ce9a1bd70e3710f7e685ec7b65870c

commit | commitdiff | tree

Julia Reynolds [Thu, 28 Apr 2016 19:37:17 +0000 (19:37 +0000)]

Expand BT screen. am: 05c6a2c007
am: 8136b125f6

* commit '8136b125f66ae32f1ab64b74a225d583fb911c60':
Expand BT screen.

Change-Id: I882414db3110576b33ef9c3d102c074880a79e93

commit | commitdiff | tree

Julia Reynolds [Thu, 28 Apr 2016 19:35:28 +0000 (19:35 +0000)]

Expand BT screen.
am: 05c6a2c007

* commit '05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.

Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893

commit | commitdiff | tree

Julia Reynolds [Thu, 28 Apr 2016 19:24:51 +0000 (19:24 +0000)]

Expand BT screen.
am: 05c6a2c007

* commit '05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.

Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd

commit | commitdiff | tree

Julia Reynolds [Thu, 28 Apr 2016 13:41:25 +0000 (09:41 -0400)]

Expand BT screen.

Bug: 27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d

commit | commitdiff | tree

shwetachahar [Thu, 28 Apr 2016 15:05:55 +0000 (16:05 +0100)]

Set the max for pitch seekbar in xml in sync with the max for pitch
seekbar in TextToSpeechSettings.java

Bug: 28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 28 Apr 2016 15:01:48 +0000 (15:01 +0000)]

Merge "Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: c39a0fa" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 15:01:38 +0000 (15:01 +0000)]

Merge "Fix summary lifecycle" into nyc-dev am: 6e51591
am: c39a0fa

* commit 'c39a0fa7ce9bffeb00beb9487113a9634072fd3c':
Fix summary lifecycle

Change-Id: Id01514e1384f96c873be22d37e00e8c76ec6d3fd

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 15:01:37 +0000 (15:01 +0000)]

Merge "Fix summary lifecycle" into nyc-dev am: 6e51591
am: db723c9

* commit 'db723c92211b9a6a71a0431256e7615304459dbd':
Fix summary lifecycle

Change-Id: I04c55c1e345cbabb0de89f134df88122069e897c

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:58:11 +0000 (14:58 +0000)]

Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
Fix summary lifecycle

Change-Id: Ic66ba905b1f225bbfaff6db51164727a21599238

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:58:11 +0000 (14:58 +0000)]

Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
Fix summary lifecycle

Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:51:59 +0000 (14:51 +0000)]

Merge "Fix summary lifecycle" into nyc-dev

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:42:10 +0000 (10:42 -0400)]

Fix summary lifecycle

Once more and probably not for all

Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening. Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.

Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes: 28319383

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:34:11 +0000 (14:34 +0000)]

Merge "Fix search after upgrade" into nyc-dev am: f96b594
am: 31c0cfe

* commit '31c0cfe2f23c045b0d76155994d6085ee4bb58a6':

Change-Id: I06bb0c22f33e9ddde016242f97809d8b17f4fb9d

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:20:48 +0000 (14:20 +0000)]

Merge "Fix search after upgrade" into nyc-dev am: f96b594
am: 5745801

* commit '574580101438166980a47a582cde88df25ad3f81':
Fix search after upgrade

Change-Id: Ib04ab37894535d559e7d8f7c7749f838600df46f

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:17:28 +0000 (14:17 +0000)]

Merge "Fix search after upgrade" into nyc-dev
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
Fix search after upgrade

Change-Id: I5e393db4d91a59b491077ede1563bc0fe036a023

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:17:28 +0000 (14:17 +0000)]

Merge "Fix search after upgrade" into nyc-dev
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
Fix search after upgrade

Change-Id: Iba0908e1a338fc4feea5ce6c7fbbe5847cd16dcb

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:13:44 +0000 (14:13 +0000)]

Merge "Fix search after upgrade" into nyc-dev

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 14:07:28 +0000 (10:07 -0400)]

Fix search after upgrade

Settings was dropping the search tables after upgrade but not
clearing the bit that says a full index has completed.

Change-Id: If49960b8cc07e72127bac211ae4d6c1f25b71c81
Fixes: 28414461

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 28 Apr 2016 13:03:04 +0000 (13:03 +0000)]

Merge "Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd am: 474cd3c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 13:02:52 +0000 (13:02 +0000)]

Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd
am: 474cd3c

* commit '474cd3c0621ecd404fc22438ecb83b618880b3a1':
Default payment settings to disabled

Change-Id: Idc325d493d569411f805b48fc51e6ee55711be8c

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 13:02:51 +0000 (13:02 +0000)]

Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd
am: c6d5902

* commit 'c6d59023709b7e86db3b07b5e8b99c34b25f3c29':
Default payment settings to disabled

Change-Id: I075e3be940e4cfec1582c1d4a928a269327f2431

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 12:59:34 +0000 (12:59 +0000)]

Merge "Default payment settings to disabled" into nyc-dev
am: 6b421dd

* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
Default payment settings to disabled

Change-Id: Id7db30f04e32d212fa1edc719ad0363e468bec67

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 12:59:34 +0000 (12:59 +0000)]

commit | commitdiff | tree

Jason Monk [Thu, 28 Apr 2016 12:56:46 +0000 (12:56 +0000)]

Merge "Default payment settings to disabled" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 28 Apr 2016 06:06:25 +0000 (06:06 +0000)]

Merge "Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: ec8b526" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Wei Wang [Thu, 28 Apr 2016 06:06:14 +0000 (06:06 +0000)]

Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a
am: aee68e0

* commit 'aee68e029a37e7a18d8086e27ae1bf1bc6c33da1':
Add an entry in developer options for location tools.

Change-Id: I97963a037f35ca3dd0db22ed5d6ff086acb5f912

commit | commitdiff | tree

Wei Wang [Thu, 28 Apr 2016 06:06:13 +0000 (06:06 +0000)]

Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a
am: ec8b526

* commit 'ec8b526fd045c3ff5f4d729088482786fa47ea1b':
Add an entry in developer options for location tools.

Change-Id: I4677643929dc29d15c317b1f51af83c9837a40b8

commit | commitdiff | tree

Wei Wang [Thu, 28 Apr 2016 06:03:17 +0000 (06:03 +0000)]

Merge "Add an entry in developer options for location tools." into nyc-dev
am: 920cf0a

* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
Add an entry in developer options for location tools.

Change-Id: I5af67764994e4cfed9f8ef4243954260d48ae163

commit | commitdiff | tree

Wei Wang [Thu, 28 Apr 2016 06:03:16 +0000 (06:03 +0000)]

commit | commitdiff | tree

Wei Wang [Thu, 28 Apr 2016 05:57:30 +0000 (05:57 +0000)]

Merge "Add an entry in developer options for location tools." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 28 Apr 2016 00:19:16 +0000 (00:19 +0000)]

Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c
am: 9103fbb

* commit '9103fbb8379d436462fe095ac195a22a08ec7a5e':

Change-Id: Ia3d888aa2520572ba0b7a72d98d36a3a5853c8db

commit | commitdiff | tree

TreeHugger Robot [Thu, 28 Apr 2016 00:01:08 +0000 (00:01 +0000)]

Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c
am: 54994aa

* commit '54994aaf4cb24ce59d13418bca0b4d9ce5747596':
Fix crash when recreating SecuritySubSettings

Change-Id: I4a4cb36ac2a1b7aafecbdaa3ae447c5f9382db49

commit | commitdiff | tree

Adrian Roos [Wed, 27 Apr 2016 23:45:11 +0000 (23:45 +0000)]

Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
Fix crash when recreating SecuritySubSettings

Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87

commit | commitdiff | tree

Adrian Roos [Wed, 27 Apr 2016 22:52:56 +0000 (22:52 +0000)]

commit | commitdiff | tree

Wei Wang [Tue, 26 Apr 2016 04:52:03 +0000 (21:52 -0700)]

Add an entry in developer options for location tools.

This is a temporary place holder for location dogfood tools, which will
be removed before ship.

Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8

commit | commitdiff | tree

TreeHugger Robot [Wed, 27 Apr 2016 22:40:05 +0000 (22:40 +0000)]

Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 27 Apr 2016 21:38:24 +0000 (21:38 +0000)]

Merge "Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 am: 040b2ed" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Wed, 27 Apr 2016 21:38:16 +0000 (21:38 +0000)]

Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18
am: 040b2ed

* commit '040b2ed9b2a7c792879e908d67c90b3d15be5136':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I8947109fda1bfc4b6c77b79f77fe84ff72f8019e

commit | commitdiff | tree

TreeHugger Robot [Wed, 27 Apr 2016 21:38:13 +0000 (21:38 +0000)]

Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18
am: e9f4fe7

* commit 'e9f4fe7c4db589a022a886fe1c24c5098e9071e1':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I749e4b3c113dcc706112da6fee07decb443a5c6a

commit | commitdiff | tree

Felipe Leme [Wed, 27 Apr 2016 21:31:53 +0000 (21:31 +0000)]

Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: If77ecd7bc909fcd7af17a02aaa99061e4f242cad

commit | commitdiff | tree

Felipe Leme [Wed, 27 Apr 2016 21:31:51 +0000 (21:31 +0000)]