Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,605 Commits 1 Branch 0 Tags
092909f87108efbb7b60d7cd22fd6ce1a5b4749b
Commit Graph

11951 Commits

Author SHA1 Message Date
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
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
1ec941db0c Handling of issues while migrating primary storage 
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
 2016-04-28 14:44:53 -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
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
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
TreeHugger Robot
e75063b87b Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c 
am: 54994aa

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

Change-Id: I4a4cb36ac2a1b7aafecbdaa3ae447c5f9382db49
 2016-04-28 00:01:08 +00:00
Adrian Roos
54994aaf4c Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87
 2016-04-27 23:45:11 +00:00
Felipe Leme
06c9bdc168 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 am: e9f4fe7 
am: dbaaa26

* commit 'dbaaa26bf39fb299ee40de1ce554321e03628aa0':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I0ed635218e73da7e6bda54915e57e600f0a881e4
 2016-04-27 23:43:32 +00:00
Fan Zhang
1f8aea56f0 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev am: cd89d12 
am: 8d52417

* commit '8d52417257160443c2d52afa9d74c8406f0c7515':
  Monitor connectivity change and display offline promo.

Change-Id: Ib8b034b739f7048e788fa4b292ec291143ffe629
 2016-04-27 23:43:31 +00:00
Daniel Nishi
613ef6f696 Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev am: 883c214 
am: 35eb879

* commit '35eb879739daa0026c463494e71e525d58f5397f':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: Ia1e3499093808bdb795f4288b53c6235a5965e21
 2016-04-27 23:43:31 +00:00
Adrian Roos
9103fbb837 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98
 2016-04-27 22:52:56 +00:00
Wei Wang
e1c1a13cba 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
 2016-04-27 15:51:19 -07:00
TreeHugger Robot
aee8d8c7e1 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 2016-04-27 22:40:05 +00:00
TreeHugger Robot
dbaaa26bf3 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
 2016-04-27 21:38:13 +00:00
Felipe Leme
e9f4fe7c4d Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: If77ecd7bc909fcd7af17a02aaa99061e4f242cad
 2016-04-27 21:31:53 +00:00
Felipe Leme
040b2ed9b2 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I5a8bce52f789a274ca1fc7cff1fb130072f9e0c4
 2016-04-27 21:31:51 +00:00
TreeHugger Robot
a21ac18b05 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 2016-04-27 21:15:59 +00:00
Fan Zhang
8d52417257 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 
am: cd89d12

* commit 'cd89d1264227fccd9fe72acc78d959ff17196f69':
  Monitor connectivity change and display offline promo.

Change-Id: I72ce587dba5ffb9e821658e10415a5d5ffad7e5d
 2016-04-27 21:01:00 +00:00
Daniel Nishi
35eb879739 Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev 
am: 883c214

* commit '883c2141eb4e03992a11f3a447c97845ab34048c':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: I7728f81d30bebf447624c0305f772d4be1e97588
 2016-04-27 21:00:59 +00:00
Adrian Roos
3686ef5e03 Fix crash when recreating SecuritySubSettings 
Restoring instance state requires the items to be
there after onCreate.

Change-Id: Icef92bcbb168a0b4029a86b2b74235e344e2055e
Fixes: 27013071
 2016-04-27 13:58:23 -07:00
Fan Zhang
cd89d12642 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 2016-04-27 20:42:38 +00:00
Daniel Nishi
883c2141eb Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev 2016-04-27 20:31:58 +00:00
Daniel Nishi
c73fb891bc Fix a Deletion Helper crash when it fails to get an app list. 
Bug 28424827
Change-Id: I5c3c426d557fb1647a3909bf88fbb7d24329dc57
 2016-04-27 20:29:07 +00:00
Clara Bayarri
a0ad1b5cf2 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 03fb024 
am: c8ab34c

* commit 'c8ab34c5e44608ecab00da342916933b50d47eb7':
  Fix Settings Condition expand button a11y label

Change-Id: Idf60d662db506c3c7089a413fff7ea29b7c0685c
 2016-04-27 19:36:11 +00:00
Felipe Leme
616ff3e6a4 Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS. 
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
 2016-04-27 12:33:57 -07:00
Jason Monk
c8ab34c5e4 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 
am: 03fb024

* commit '03fb0244d58d1d932570c1eacdce498d8146e68f':
  Fix Settings Condition expand button a11y label

Change-Id: Ia0d8bb962071b75f5d78912a07e64d012caff9ce
 2016-04-27 19:31:26 +00:00
Clara Bayarri
03fb0244d5 Merge "Fix Settings Condition expand button a11y label" into nyc-dev 
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I3ce32065454d5b5e0bf58954e03ff88b8e205a1a
 2016-04-27 19:26:54 +00:00
Clara Bayarri
3cb641e25d Merge "Fix Settings Condition expand button a11y label" into nyc-dev 
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I5891f817f4f484c79968c9ea8300596b5c1652d1
 2016-04-27 19:26:52 +00:00
Fan Zhang
2ddde4a928 Monitor connectivity change and display offline promo. 
Bug: 28141203
Change-Id: I2af7cc3071d835092fba961ff59189f1fb295063
 2016-04-27 12:21:46 -07:00
Jason Monk
51b1e0515d Merge "Fix Settings Condition expand button a11y label" into nyc-dev 2016-04-27 19:15:59 +00:00
Julia Reynolds
4df14d6f07 Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38 am: 8f2fd11 
am: 7cf6779

* commit '7cf677975c0a55825a8132bfe905bc2c75445ba7':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: I35b2e3dbbfcc2396578a7d171bc4392640813e28
 2016-04-27 18:56:02 +00:00
Julia Reynolds
7cf677975c Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38 
am: 8f2fd11

* commit '8f2fd1106c48588e9138714ce83da1d4f3656b26':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If4f1b16655504bfd407af415bdd27fec4d36ac6f
 2016-04-27 18:42:02 +00:00
Julia Reynolds
481a277eb6 Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev 
am: ae35c38

* commit 'ae35c38fe7ee475a1c4c5a0386184ef7d682359b':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: I12e4212fc2a7df04be34a1c7baa81303b93ab06e
 2016-04-27 18:37:52 +00:00