Commit Graph

11981 Commits

Author SHA1 Message Date
Jason Monk
e58559e3ca Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cd5d6137bc
am: 1b997d2cd9

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

Change-Id: I4ed32a93c8d53e283af7c4884d2aae3876727801
2016-04-29 18:02:15 +00:00
Jason Monk
1b997d2cd9 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
2016-04-29 17:59:36 +00:00
Jason Monk
cd5d6137bc 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: Ie1095da87343cc74d65bbcf255d5692197a7a241
2016-04-29 17:57:24 +00:00
Mihai Nita
1a3818b686 Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: 48db95270e
am: 7d5bc8f454

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

Change-Id: I0a0bdadc04321bc28a3ce702063f9b631daf647d
2016-04-29 17:55:09 +00:00
Jason Monk
a1fe122b99 Merge "Don't crash settings when out of space." into nyc-dev 2016-04-29 17:54:34 +00:00
Mihai Niță
7d5bc8f454 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
2016-04-29 17:52:50 +00:00
Jason Monk
ef71f605f3 Don't crash settings when out of space.
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128
2016-04-29 13:51:08 -04:00
Mihai Nita
48db95270e 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: Ia6218cfbd9d2b0d29e36def684f5909932980481
2016-04-29 17:50:39 +00:00
Mihai Niță
7dce005fab Merge "Fix: accessibility actions move languages but don't update" into nyc-dev 2016-04-29 17:46:16 +00:00
Clara Bayarri
c970be3876 Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 1159a0a79c
am: 2e8d2fabfc

* commit '2e8d2fabfcb815a2199195dd1a7669b59338fdf4':
  Remove Secure Startup option from Security Settings

Change-Id: I32d3c509f0b7ba03acc8f933d2840bb92c293872
2016-04-29 17:43:41 +00:00
Clara Bayarri
2e8d2fabfc 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
2016-04-29 17:41:14 +00:00
Clara Bayarri
99e5285425 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
2016-04-29 17:39:05 +00:00
Clara Bayarri
1159a0a79c Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

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

Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
2016-04-29 17:38:56 +00:00
Clara Bayarri
35bf932eb0 Merge "Remove Secure Startup option from Security Settings" into nyc-dev 2016-04-29 17:28:42 +00:00
Clara Bayarri
a8d92b59be Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663 am: 55fc7dd52b
am: c0249cbabe

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

Change-Id: Id5491136bd8d5dfb2e8ebf7c13d04efc021372b8
2016-04-29 16:52:08 +00:00
Clara Bayarri
c0249cbabe 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
2016-04-29 16:49:04 +00:00
Clara Bayarri
55fc7dd52b 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
2016-04-29 16:46:28 +00:00
Clara Bayarri
0a84fd121d 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: I178049719bc00f5baddce247c257004ec41fcbbe
2016-04-29 16:46:27 +00:00
Clara Bayarri
d2549ce663 Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev 2016-04-29 16:38:12 +00:00
Fan Zhang
0a121a79a8 Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev am: 050d94151f
am: e00703242b

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

Change-Id: I663a620e3ee4175b5c0f5a33b4a5deac59c6d8fd
2016-04-29 15:59:28 +00:00
Clara Bayarri
f534a66afd 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
2016-04-29 16:58:09 +01:00
Fan Zhang
e00703242b 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
2016-04-29 15:56:25 +00:00
Fan Zhang
050d94151f Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev 2016-04-29 15:49:30 +00:00
Julia Reynolds
4f2b8c0b52 Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 1d5fbf6672
am: cfdd9a90ff

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

Change-Id: Id873584972e461677a088ff0e1327e887bba6879
2016-04-29 14:39:55 +00:00
Julia Reynolds
cfdd9a90ff Merge "Fix NPE in user settings." into nyc-dev am: e69d754865
am: 1d5fbf6672

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

Change-Id: I80b5e7c37b158ed03f43eeef78b4359ed107b730
2016-04-29 14:37:26 +00:00
Julia Reynolds
1d5fbf6672 Merge "Fix NPE in user settings." into nyc-dev
am: e69d754865

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

Change-Id: Icb2585bb7619e9bac4592f904b8978b8668ba4ff
2016-04-29 14:34:28 +00:00
Julia Reynolds
9f6de156ca Merge "Fix NPE in user settings." into nyc-dev
am: e69d754865

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

Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933
2016-04-29 14:34:28 +00:00
Julia Reynolds
8bda21a9d4 Fix NPE in user settings.
Bug: 28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
2016-04-29 08:42:01 -04:00
Philip P. Moltmann
0a1e8fa7fc Handling of issues while migrating primary storage am: 1ec941db0c am: 16d64842d9
am: 5fd8e1b03c

* commit '5fd8e1b03cc09e438f72697308c95a1c531b2a45':
  Handling of issues while migrating primary storage

Change-Id: I1065eebd7c9b509d6bb5e932a6a819a8bc8afc86
2016-04-28 23:26:28 +00:00
Philip P. Moltmann
5fd8e1b03c Handling of issues while migrating primary storage am: 1ec941db0c
am: 16d64842d9

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

Change-Id: I0c817a826c44e42ab169423eac9500c92650fb7e
2016-04-28 23:24:06 +00:00
Philip P. Moltmann
16d64842d9 Handling of issues while migrating primary storage
am: 1ec941db0c

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

Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
2016-04-28 23:21:50 +00:00
Philip P. Moltmann
4d2714fd10 Handling of issues while migrating primary storage
am: 1ec941db0c

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

Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
2016-04-28 23:21:48 +00:00
Philip P. Moltmann
1ec941db0c Handling of issues while migrating primary storage
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
2016-04-28 14:44:53 -07:00
Fan Zhang
a6c862caf6 Prompt sign-in when there is no account for support options
Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
2016-04-28 14:40:07 -07:00
Jason Monk
b5829b0355 Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: db723c9
am: 9574c90

* commit '9574c9091bd182f4e89d9c725c6f0702968db803':
  Fix summary lifecycle

Change-Id: I82265dbc34460733cbfcd1c32d02c88d6037ae7c
2016-04-28 15:05:02 +00:00
Jason Monk
9574c9091b Merge "Fix summary lifecycle" into nyc-dev am: 6e51591
am: db723c9

* commit 'db723c92211b9a6a71a0431256e7615304459dbd':
  Fix summary lifecycle

Change-Id: I04c55c1e345cbabb0de89f134df88122069e897c
2016-04-28 15:01:37 +00:00
Jason Monk
db723c9221 Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: Ic66ba905b1f225bbfaff6db51164727a21599238
2016-04-28 14:58:11 +00:00
Jason Monk
c39a0fa7ce Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f
2016-04-28 14:58:11 +00:00
Jason Monk
8d8de14905 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
2016-04-28 10:42:10 -04:00
Jason Monk
066245deda Merge "Fix search after upgrade" into nyc-dev am: f96b594 am: 5745801
am: d08a592

* commit 'd08a592ba3e23a20c8eac030f6a676d16c5bd964':
  Fix search after upgrade

Change-Id: I1715cb15f867573673b1ca133f2d4ba007de4f80
2016-04-28 14:24:23 +00:00
Jason Monk
d08a592ba3 Merge "Fix search after upgrade" into nyc-dev am: f96b594
am: 5745801

* commit '574580101438166980a47a582cde88df25ad3f81':
  Fix search after upgrade

Change-Id: Ib04ab37894535d559e7d8f7c7749f838600df46f
2016-04-28 14:20:48 +00:00
Jason Monk
5745801014 Merge "Fix search after upgrade" into nyc-dev
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
  Fix search after upgrade

Change-Id: I5e393db4d91a59b491077ede1563bc0fe036a023
2016-04-28 14:17:28 +00:00
Jason Monk
31c0cfe2f2 Merge "Fix search after upgrade" into nyc-dev
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
  Fix search after upgrade

Change-Id: Iba0908e1a338fc4feea5ce6c7fbbe5847cd16dcb
2016-04-28 14:17:28 +00:00
Jason Monk
18fbdd023b 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
2016-04-28 10:08:29 -04:00
Wei Wang
2745712539 Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: aee68e0
am: d780b1b

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

Change-Id: I687415fa5383dc1965b1e4b0d3a0948a6e554714
2016-04-28 06:09:11 +00:00
Wei Wang
d780b1b4e1 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
2016-04-28 06:06:14 +00:00
Wei Wang
ec8b526fd0 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
2016-04-28 06:03:17 +00:00
Wei Wang
aee68e029a 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: Ie48ad7a27367353e50d0dc021c2f36eebf04af77
2016-04-28 06:03:16 +00:00
Wei Wang
920cf0a7b3 Merge "Add an entry in developer options for location tools." into nyc-dev 2016-04-28 05:57:30 +00:00
Adrian Roos
ea81145fa3 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c am: 54994aa
am: e75063b

* commit 'e75063b87b324d9c78f1a46fa09dde2466fef898':
  Fix crash when recreating SecuritySubSettings

Change-Id: Id96edf75f19cb1fcc0f696dccc8b081d2b7cd213
2016-04-28 01:48:10 +00:00