OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Separate collection of indexable data from indexing"
TreeHugger Robot [Thu, 7 Sep 2017 17:51:22 +0000 (17:51 +0000)]
Merge "Separate collection of indexable data from indexing"

6 years agoSeparate collection of indexable data from indexing
Matthew Fritze [Tue, 22 Aug 2017 22:51:50 +0000 (15:51 -0700)]
Separate collection of indexable data from indexing

The first step in refactoring the god class,
DatabaseIndexingManager.

The class has one major entry point: indexDatabase
which begins a chain of calls that first collects all the
data from the fragments, and then massages that data into
the SQLite database. Unfortunately, most of the methods
do not return data, and just pass along some mutated
form of the data until it can be insterted.

Reading and testing this class is very difficult.

This first step moves the collection of the indexable data
into a new class which has a few benefits:
- The data can be easily mocked in tests
- Reduces complexity of D.I.M.
- Separates data collection from indexing, which allows the
indexable data to be piped into a new API that unbundled
search can consume.

Bug:33577327
Test: make RunSettingsRoboTests
Test: Grabbed a DB dump before change, compared to DB dump after change
to make sure everything is still indexed.
Change-Id: Ibc91e3d75ff5dcf5274b93b29bf3544f90b2194d

6 years agoMerge "Cache storage values for fast loading." into oc-mr1-dev am: 7fae6c67fb
Daniel Nishi [Thu, 7 Sep 2017 15:35:03 +0000 (15:35 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev am: 7fae6c67fb
am: cad295918c

Change-Id: I42136185af82217383526a38c8c3a4ffc2e4829e

6 years agoMerge "Cache storage values for fast loading." into oc-mr1-dev
Daniel Nishi [Thu, 7 Sep 2017 15:15:16 +0000 (15:15 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
am: 7fae6c67fb

Change-Id: I5e29852872dd08e0e5bb3f1822127879dc354319

6 years agoMerge "Cache storage values for fast loading." into oc-mr1-dev
Daniel Nishi [Wed, 6 Sep 2017 23:07:14 +0000 (23:07 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev

6 years agoMerge "Reorder "on the lock screen" options." into oc-mr1-dev am: 40b8d3d238
Alison Cichowlas [Wed, 6 Sep 2017 22:54:54 +0000 (22:54 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev am: 40b8d3d238
am: 22fc09757e

Change-Id: Ifd08b4aff4ef20c37302726aa14eedd93e80958f

6 years agoMerge "Misc polishing fixes for Settings" into oc-mr1-dev am: bda6500884
Fan Zhang [Wed, 6 Sep 2017 22:54:09 +0000 (22:54 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev am: bda6500884
am: 08c4871dbe

Change-Id: Ib01d65ae56ac7f03f25ca320724ba6b3cd90b861

6 years agoMerge "Pre-set initial state to wifi tether switches." into oc-mr1-dev am: dad9b79630
Fan Zhang [Wed, 6 Sep 2017 22:53:14 +0000 (22:53 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev am: dad9b79630
am: b1ff93dfeb

Change-Id: I9206b968d53c89924076e1f3b9979fd00e68945d

6 years agoMerge "Reorder "on the lock screen" options." into oc-mr1-dev
Alison Cichowlas [Wed, 6 Sep 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
am: 40b8d3d238

Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1

6 years agoMerge "Misc polishing fixes for Settings" into oc-mr1-dev
Fan Zhang [Wed, 6 Sep 2017 21:23:04 +0000 (21:23 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
am: bda6500884

Change-Id: I119661153a87d0ebe67367c7350c2934679902a3

6 years agoMerge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
Fan Zhang [Wed, 6 Sep 2017 21:22:14 +0000 (21:22 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
am: dad9b79630

Change-Id: I6236900d715e7ef85e2855513c41689a68046a07

6 years agoMerge "Create owner file for development package"
TreeHugger Robot [Wed, 6 Sep 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Create owner file for development package"

6 years agoMerge "Reorder "on the lock screen" options." into oc-mr1-dev
Alison Cichowlas [Wed, 6 Sep 2017 21:01:35 +0000 (21:01 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev

6 years agoMerge "Misc polishing fixes for Settings" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev

6 years agoMerge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 19:53:39 +0000 (19:53 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev

6 years agoMerge "Clean up test strings"
TreeHugger Robot [Wed, 6 Sep 2017 19:49:36 +0000 (19:49 +0000)]
Merge "Clean up test strings"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a359a550 -s ours
Bill Yi [Wed, 6 Sep 2017 19:19:25 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a359a550  -s ours
am: 25012afc7f  -s ours

Change-Id: Ic4993853ef8110722cb1217bfdf8f3dc513d4904

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 18:56:13 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 14a359a550  -s ours

Change-Id: I3a7049ec212e3da3b673d3480ef3be5396762098

6 years agoImport translations. DO NOT MERGE am: 535dd7f066 -s ours am: 363626edcf -s ours
Bill Yi [Wed, 6 Sep 2017 18:43:28 +0000 (18:43 +0000)]
Import translations. DO NOT MERGE am: 535dd7f066  -s ours am: 363626edcf  -s ours
am: f8f6cb368d  -s ours

Change-Id: I8b992a197206c0ae4371b1846d9273645c047062

6 years agoMerge "Properly show/hide advanced settings" into oc-mr1-dev am: 12c9d6d65a
Julia Reynolds [Wed, 6 Sep 2017 18:42:36 +0000 (18:42 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev am: 12c9d6d65a
am: fa3fa3483e

Change-Id: I9cab11035c64975b45e1c3d99bd707a07b6c693e

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 18:40:23 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE am: 535dd7f066 -s ours
Bill Yi [Wed, 6 Sep 2017 18:40:07 +0000 (18:40 +0000)]
Import translations. DO NOT MERGE am: 535dd7f066  -s ours
am: 363626edcf  -s ours

Change-Id: I7db2955fe4f48c1867d16513682a1a985eed01f1

6 years agoMerge "Properly show/hide advanced settings" into oc-mr1-dev
Julia Reynolds [Wed, 6 Sep 2017 18:39:24 +0000 (18:39 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev
am: 12c9d6d65a

Change-Id: Id5e2a6291b630114fc4952ed49fcd57929205461

6 years agoImport translations. DO NOT MERGE am: 535dd7f066 -s ours am: 6171c4a5bb -s ours
Bill Yi [Wed, 6 Sep 2017 18:32:05 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am: 535dd7f066  -s ours am: 6171c4a5bb  -s ours
am: e93c8d88f5  -s ours

Change-Id: I2181f0f6fb36703590d9820be5c22330d3280d7c

6 years agoImport translations. DO NOT MERGE am: 535dd7f066 -s ours
Bill Yi [Wed, 6 Sep 2017 18:29:32 +0000 (18:29 +0000)]
Import translations. DO NOT MERGE am: 535dd7f066  -s ours
am: 6171c4a5bb  -s ours

Change-Id: Iccd2d99cf8f2c096253dafe6c42f712cf0ee6292

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 18:27:10 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am: 535dd7f066  -s ours

Change-Id: I49d4fe2d5608a2d050390d6e53a770c4dec11cff

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 18:27:05 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am: 535dd7f066  -s ours

Change-Id: Ib159ba464000cbfc9304a5d246f717d1ce35bcc2

6 years agoMerge "Properly show/hide advanced settings" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 18:26:13 +0000 (18:26 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev

6 years agoMerge "Fix policy transparency is missing in remove work profile button" into oc...
Tony Mak [Wed, 6 Sep 2017 18:24:14 +0000 (18:24 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev am: 0280441397
am: 799c54830b

Change-Id: I50dcaf5dcb2de3385a48e1f079f725ff5d9b082b

6 years agoMerge "Fix policy transparency is missing in remove work profile button" into oc...
Tony Mak [Wed, 6 Sep 2017 18:12:05 +0000 (18:12 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
am: 0280441397

Change-Id: Ibe78c546ae2d510c7f33862b700b9873e554743c

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 6 Sep 2017 18:05:42 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMisc polishing fixes for Settings
Fan Zhang [Wed, 6 Sep 2017 17:17:43 +0000 (10:17 -0700)]
Misc polishing fixes for Settings

- Never return null when querying userDictionaryLocales
- Auto mirror mobile setting icon in RTL to match status bar.

Fixes: 65298627
Fixes: 65361092
Test: robotests
Change-Id: I0f9827f7bc23baf4895712c0f86584aeccfb9c73

6 years agoMerge "Fix policy transparency is missing in remove work profile button" into oc...
TreeHugger Robot [Wed, 6 Sep 2017 17:57:09 +0000 (17:57 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev

6 years agoClean up test strings
Fan Zhang [Wed, 6 Sep 2017 17:54:19 +0000 (10:54 -0700)]
Clean up test strings

- Mark everything untranslatable to avoid TC confusion

Change-Id: Iea43b0f5f63253833d91aeaa11b3c463cd170741
Fixes: 65355069
Test: builds

6 years agoMerge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am...
Antony Sargent [Wed, 6 Sep 2017 16:55:27 +0000 (16:55 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am: c3b47925e3
am: f92f6c24f1

Change-Id: I81d955471c420647b884533cf09656cf7cae28c1

6 years agoMerge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
Antony Sargent [Wed, 6 Sep 2017 16:53:28 +0000 (16:53 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
am: c3b47925e3

Change-Id: I7c9a07543340992e8bd3ff15538d74d28a1aab22

6 years agoMerge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
Antony Sargent [Wed, 6 Sep 2017 16:42:41 +0000 (16:42 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev

6 years agoCreate owner file for development package
Fan Zhang [Wed, 6 Sep 2017 16:29:21 +0000 (09:29 -0700)]
Create owner file for development package

Bug: 65294119
Test: builds
Change-Id: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce

6 years agoMerge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev...
Jack He [Wed, 6 Sep 2017 16:33:27 +0000 (16:33 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev am: ffea17b57f
am: c97bf8daef

Change-Id: Id631d10c6eda378bb9fa99025ee5ac68c82cb10f

6 years agoMerge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
Jack He [Wed, 6 Sep 2017 16:31:27 +0000 (16:31 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
am: ffea17b57f

Change-Id: I4295f1c186863d157520d93abfe0cbaf3c354247

6 years agoMerge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 16:25:28 +0000 (16:25 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev

6 years agoMerge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
Charles He [Wed, 6 Sep 2017 16:12:08 +0000 (16:12 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
am: e7cf5e6221

Change-Id: I356a58cadd3e19e61d9585f08e47c9d4cdcf4318

6 years agoMerge "Enforce wifi config lockdown on details page." into oc-mr1-dev
Charles He [Wed, 6 Sep 2017 16:06:32 +0000 (16:06 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
am: 10adff1163

Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d

6 years agoMerge "Enforce wifi config lockdown on details page." into oc-mr1-dev
Charles He [Wed, 6 Sep 2017 15:59:16 +0000 (15:59 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev

6 years agoEnforce wifi config lockdown on details page.
Charles He [Sat, 2 Sep 2017 17:45:18 +0000 (18:45 +0100)]
Enforce wifi config lockdown on details page.

Fixes the bug that, on the new WifiDetailPreference page, the "Forget"
button is not disabled properly for wifi configs created and protected
by DevicePolicyManger.

Robolectric test to follow in a separate CL.

Test: manual, by locking down wifi config with TestDPC
Test: make RunSettingsRoboTests
Bug: 64971700
Bug: 65396674
Change-Id: I27740eabd5eb94415e4258c9c80f91df2d9ab476

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 15:36:23 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 15:31:10 +0000 (08:31 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ie01e378113e1d71c095e3a750b668d59bf3e4c46

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 15:15:05 +0000 (08:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: If965ef4d51917904739ed4726b036a285adc6d6d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoProperly show/hide advanced settings
Julia Reynolds [Wed, 6 Sep 2017 13:09:30 +0000 (09:09 -0400)]
Properly show/hide advanced settings

Change-Id: I31f6f877f1945187a6f19e1b383bd3755656fb9b
Fixes: 65375390
Test: manual

6 years agoFix policy transparency is missing in remove work profile button
Tony Mak [Tue, 5 Sep 2017 15:41:05 +0000 (16:41 +0100)]
Fix policy transparency is missing in remove work profile button

The policy transparency code is not triggered as the button is disabled.

BUG: 64570769
Test: 1. Remove work profile without restriction.
Test: 2. Remove work profile with restriction. Observed a dialog explains
why it is disabled.
Test: 3. Verify setting new admin, uninstall and deactivate button are
         working

Change-Id: I1fc9c996785c67daf41a5d31e732d9d82eb56b17

6 years agoMerge "Settings is crashed high probability when doing follow steps" am: 2584202cb7...
edgar.huang [Wed, 6 Sep 2017 01:56:23 +0000 (01:56 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab am: e096a55f03
am: 8aeabc23c6

Change-Id: I23eeea1f5f95e8cb9d55e3f59877909574cf5f66

6 years agoMerge "Settings is crashed high probability when doing follow steps" am: 2584202cb7...
edgar.huang [Wed, 6 Sep 2017 00:44:05 +0000 (00:44 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
am: e096a55f03

Change-Id: Id5ace14f946ac9cab23bcafb053e5087ae6a38a1

6 years agoMerge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
edgar.huang [Wed, 6 Sep 2017 00:30:44 +0000 (00:30 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
am: 8f42d1a4ab

Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad

6 years agoMerge "Settings is crashed high probability when doing follow steps"
edgar.huang [Wed, 6 Sep 2017 00:21:17 +0000 (00:21 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46

6 years agoMerge "Settings is crashed high probability when doing follow steps"
Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Settings is crashed high probability when doing follow steps"

6 years agoBluetooth: In-band ringtone setting should be reset to true
Jack He [Tue, 5 Sep 2017 22:44:48 +0000 (15:44 -0700)]
Bluetooth: In-band ringtone setting should be reset to true

* Enable in-band ringing setting should be reset to true when toggling
  developer options switch

Bug: 65382863
Test: make, try toggling "Enable in-band ringing" preference
Change-Id: Ic3221710983d5c493fa3dff36bc24611948fc4c1

6 years agoCache storage values for fast loading.
Daniel Nishi [Thu, 10 Aug 2017 21:09:19 +0000 (14:09 -0700)]
Cache storage values for fast loading.

If the user moves away from the storage fragment and returns, this
allows us to use cached data from the previous calculation. If the data
is > 1 minute old, we consider it stale. Otherwise, we can bypass the
loading screen.

Fixes: 37923463
Test: Settings Robotest

Change-Id: I7650d4d742852f8d447878c077b9190bc0a0bb22

6 years agoPre-set initial state to wifi tether switches.
Fan Zhang [Tue, 5 Sep 2017 20:32:24 +0000 (13:32 -0700)]
Pre-set initial state to wifi tether switches.

The preset initial state helps eliminating animation jank when first
landing on the page.

Change-Id: Ia7ba83983f18409b1c653cc1ebb0f3aad281358c
Fixes: 64811322
Test: robotests

6 years agoReorder "on the lock screen" options.
Alison Cichowlas [Tue, 5 Sep 2017 18:57:33 +0000 (14:57 -0400)]
Reorder "on the lock screen" options.

Fixes: 62872287
Change-Id: I7b2755e7a33fa1a31cebd18d93d268d330d87794
Test: RunSettingsRoboTests, manual

6 years agoMerge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am:...
Adrian Roos [Tue, 5 Sep 2017 18:58:22 +0000 (18:58 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb708f
am: 2faa5e7ac5

Change-Id: I011b521869406bd5db74686bd7c15496a03f54c4

6 years agoMerge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
Adrian Roos [Tue, 5 Sep 2017 18:55:47 +0000 (18:55 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
am: d57edb708f

Change-Id: I385acf93d60bfbc98f39aa0178018e3976a39974

6 years agoMerge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
TreeHugger Robot [Tue, 5 Sep 2017 18:43:30 +0000 (18:43 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev

6 years agoFix Bluetooth switch status in Connected devices screen
Antony Sargent [Tue, 29 Aug 2017 16:30:52 +0000 (09:30 -0700)]
Fix Bluetooth switch status in Connected devices screen

The symptom observed is that the Bluetooth master switch on the
Connected devices page doesn't properly respond to Bluetooth turning off
via quicksettings - either turning on airplane mode or just toggling
Bluetooth.

The root cause was that MasterSwitchPreference's isChecked method would
not return the true value of whether the switch was checked - if the
control is disabled, it always just returns false. This interacts badly
with code in BluetoothEnabler - we disable the switch when the Bluetooth
state is in transition (eg becomes STATE_TURNING_OFF), and we also
attempt to avoid calling setChecked if the switch is already in the
desired state. So the switch would be checked but disabled, and we'd
avoid ever calling setChecked(false) on it.

A thorough fix would be to remove the code from MasterSwitchPreference's
isChecked method that looks at the enabled state, since enabled and
checked really should be treated as separate concerns. But given the
timeframe of MR1, we're opting for a more conservative fix of directly
accessing the switch and checking it's state, to avoid introducing bugs
in other consumers that might be depending on the current
behavior. We'll then do the thorough fix on the master branch which will
give a lot more time for any unexpected issues to be found (I audited
other usages and none seemed likely to be a problem, but it's better to
be safe than sorry).

Change-Id: I19a6c6b71e74595be3ef32a9718a430b67a89d53
Bug: 64940731
Test: make RunSettingsRoboTests

6 years agoFRP: Use SUW theme for factory reset protection flow
Adrian Roos [Tue, 5 Sep 2017 10:37:38 +0000 (12:37 +0200)]
FRP: Use SUW theme for factory reset protection flow

Bug: 37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349

6 years agoSettings is crashed high probability when doing follow steps
edgar.huang [Thu, 31 Aug 2017 03:22:25 +0000 (11:22 +0800)]
Settings is crashed high probability when doing follow steps

Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.

6 years agoMerge "Make photos/videos storage preference normal." into oc-mr1-dev am: 3d1f6abd6f
Daniel Nishi [Sat, 2 Sep 2017 03:58:04 +0000 (03:58 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev am: 3d1f6abd6f
am: 5467aed58d

Change-Id: Ic5218a18aa0ea099a113a4c45737baf6bfc05e3a

6 years agoMerge "Make photos/videos storage preference normal." into oc-mr1-dev
Daniel Nishi [Sat, 2 Sep 2017 03:39:51 +0000 (03:39 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
am: 3d1f6abd6f

Change-Id: Ic944357091b2cd16115fd4b0f3ff0459090a3e27

6 years agoMerge "Make photos/videos storage preference normal." into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 03:29:52 +0000 (03:29 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev

6 years agoMake photos/videos storage preference normal.
Daniel Nishi [Wed, 23 Aug 2017 17:28:36 +0000 (10:28 -0700)]
Make photos/videos storage preference normal.

We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.

Fixes: 64147318
Test: Settings robotests

Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6

6 years agoMerge "Set drawable for the entity header app preference button." into oc-mr1-dev...
Doris Ling [Sat, 2 Sep 2017 00:46:36 +0000 (00:46 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev am: 5fe8e76b36
am: c905662743

Change-Id: Iea22293c41c88fbd9c0a20e71bcfc3972fba17c0

6 years agoMerge "Set drawable for the entity header app preference button." into oc-mr1-dev
Doris Ling [Sat, 2 Sep 2017 00:41:28 +0000 (00:41 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
am: 5fe8e76b36

Change-Id: I02625057fd4636f8ce61d5772f7ce4083fb7f81f

6 years agoMerge "Set drawable for the entity header app preference button." into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 00:17:08 +0000 (00:17 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev

6 years agoMerge "Show work profile apps only on app list." into oc-mr1-dev am: 8618b8649f
Daniel Nishi [Fri, 1 Sep 2017 23:37:21 +0000 (23:37 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev am: 8618b8649f
am: d3e0d745a8

Change-Id: Ieb84a6732af3eacb9d576ecc9cb685cff38b8e20

6 years agoMerge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev...
Amit Mahajan [Fri, 1 Sep 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev am: cf11e21d47
am: f161b63c2a

Change-Id: I10c73c2b94d521860d569d3fb7ef5560dde4393b

6 years agoMerge "Show work profile apps only on app list." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
am: 8618b8649f

Change-Id: I8757ff64193dc0754b01aa769e55a355464e2d01

6 years agoMerge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
Amit Mahajan [Fri, 1 Sep 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
am: cf11e21d47

Change-Id: Ica848195898e8d88e3882091c2a06ff4e79e55ca

6 years agoMerge "Show work profile apps only on app list." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev

6 years agoMerge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
Amit Mahajan [Fri, 1 Sep 2017 22:42:09 +0000 (22:42 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev

6 years agoSet drawable for the entity header app preference button.
Doris Ling [Thu, 24 Aug 2017 22:24:33 +0000 (15:24 -0700)]
Set drawable for the entity header app preference button.

In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.

Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes: 64826061
Test: make RunSettingsRoboTests

6 years agoShow work profile apps only on app list.
Daniel Nishi [Fri, 11 Aug 2017 01:32:25 +0000 (18:32 -0700)]
Show work profile apps only on app list.

For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.

Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes: 62963093
Test: Settings robotest

6 years agoMerge "Removed deprecated BIND_AUTOFILL permission."
TreeHugger Robot [Fri, 1 Sep 2017 15:11:50 +0000 (15:11 +0000)]
Merge "Removed deprecated BIND_AUTOFILL permission."

6 years agoMerge "Add settings page for notification channel groups"
Julia Reynolds [Fri, 1 Sep 2017 12:49:39 +0000 (12:49 +0000)]
Merge "Add settings page for notification channel groups"

6 years agoUpdate accessibility preference icon. am: f664c77f31
Doris Ling [Fri, 1 Sep 2017 01:15:08 +0000 (01:15 +0000)]
Update accessibility preference icon. am: f664c77f31
am: c413dd167d

Change-Id: Iccbd479e32a7abdd8e8fbf16274825354dbe5805

6 years agoUpdate accessibility preference icon.
Doris Ling [Fri, 1 Sep 2017 00:47:41 +0000 (00:47 +0000)]
Update accessibility preference icon.
am: f664c77f31

Change-Id: I53d15d3a850f5f0bdae9add3003a00b6e7c80009

6 years agoMerge "Fix ClassScanner and re-enable CodeInspectionTest tests"
TreeHugger Robot [Thu, 31 Aug 2017 23:26:51 +0000 (23:26 +0000)]
Merge "Fix ClassScanner and re-enable CodeInspectionTest tests"

6 years agoMerge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am:...
Colin Cross [Thu, 31 Aug 2017 22:43:03 +0000 (22:43 +0000)]
Merge "Fix errorprone build" am: 0bed3cacd7  -s ours am: a1bcb02184  -s ours am: 450f423a21  -s ours
am: bfab966085  -s ours

Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549

6 years agoMerge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours
Colin Cross [Thu, 31 Aug 2017 22:35:19 +0000 (22:35 +0000)]
Merge "Fix errorprone build" am: 0bed3cacd7  -s ours am: a1bcb02184  -s ours
am: 450f423a21  -s ours

Change-Id: I4a0aff24c589b0a1eefa97b9f1c9dd144e395303

6 years agoMerge "Fix errorprone build" am: 0bed3cacd7 -s ours
Colin Cross [Thu, 31 Aug 2017 22:27:59 +0000 (22:27 +0000)]
Merge "Fix errorprone build" am: 0bed3cacd7  -s ours
am: a1bcb02184  -s ours

Change-Id: Ic3b3ce30a29b967189fae95ec53f52569350fa82

6 years agoMerge "Fix errorprone build"
Colin Cross [Thu, 31 Aug 2017 22:24:00 +0000 (22:24 +0000)]
Merge "Fix errorprone build"
am: 0bed3cacd7  -s ours

Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8

6 years agoMerge "Fix errorprone build"
Treehugger Robot [Thu, 31 Aug 2017 22:16:52 +0000 (22:16 +0000)]
Merge "Fix errorprone build"

6 years agoUpdate accessibility preference icon.
Doris Ling [Thu, 31 Aug 2017 21:58:15 +0000 (14:58 -0700)]
Update accessibility preference icon.

Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes: 65256821
Test: visual

6 years agoRemoved deprecated BIND_AUTOFILL permission.
Felipe Leme [Thu, 31 Aug 2017 21:27:08 +0000 (14:27 -0700)]
Removed deprecated BIND_AUTOFILL permission.

Test: make -j100 RunSettingsRoboTests

Bug: 37563972

Change-Id: I423f9c6234e8c1898ed66b22e1078c6f91c58422

6 years agoChange to disable mvno data field in ApnEditor if needed.
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.

Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48

6 years agoFix ClassScanner and re-enable CodeInspectionTest tests
Antony Sargent [Thu, 31 Aug 2017 20:34:06 +0000 (13:34 -0700)]
Fix ClassScanner and re-enable CodeInspectionTest tests

This fixes the code in ClassScanner for finding all classes in a given
package to not depend on directory entries in the .jar files generated
by the build system. This dependency caused our tests in
CodeInspepectionTest.java to fail when this CL:

https://android-review.googlesource.com/#/c/platform/build/+/456418/

stopped adding directory entries in the .jar files generated by the
build process. Instead of depending on directories being present in the
list of resources provided by the classloader, this CL switches to using
Guava's ClassPath class to enumerate all loadable classes and filter
them to the ones in the package of interest.

Change-Id: I583919096450b61d4816256be280e2f5f1ce2316
Fixes: 64840107
Test: make RunSettingsRoboTests

6 years agoMerge "Legacy channels say "allow sound" instead of "let the app decide". We had...
Alison Cichowlas [Thu, 31 Aug 2017 20:23:27 +0000 (20:23 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506
am: 4010eb294f

Change-Id: Iaa85e2d06431bd92886aafc8b94b36c20de46eef

6 years agoMerge "Legacy channels say "allow sound" instead of "let the app decide". We had...
Alison Cichowlas [Thu, 31 Aug 2017 20:10:19 +0000 (20:10 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
am: 49d25a0506

Change-Id: I3cd8b74fd35dbbdb73512a15f368a527119a9c20

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
Jack He [Thu, 31 Aug 2017 19:54:20 +0000 (19:54 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
am: 4dddaf18e1

Change-Id: I249a0a3fc1a8c030041cfca8b3dbd49bc2badf07

6 years agoMerge "Legacy channels say "allow sound" instead of "let the app decide". We had...
TreeHugger Robot [Thu, 31 Aug 2017 19:51:50 +0000 (19:51 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
Jack He [Thu, 31 Aug 2017 19:25:33 +0000 (19:25 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
am: bf66bf30b1

Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
TreeHugger Robot [Thu, 31 Aug 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev