Commit Graph

14203 Commits

Author SHA1 Message Date
Sanket Padawe
1aa65f3b92 Fix build failure.
+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145
2016-10-17 11:39:03 -07:00
Sanket Padawe
a049c988e7 Fix multi-sim popup issue in data usage. am: 8591f26fa3
am: d8fc77122b

Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e
2016-10-17 17:25:04 +00:00
Sanket Padawe
d8fc77122b Fix multi-sim popup issue in data usage.
am: 8591f26fa3

Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
2016-10-17 17:18:34 +00:00
TreeHugger Robot
23665b0766 Merge "Fix a bug in navup button." 2016-10-15 00:27:57 +00:00
Fan Zhang
9cf5cfb03d Fix a bug in navup button.
When launching internal setting activity from dynamic tiles and hit back
button, it goes back to settings homepage. Instead it should just go
back to the UI where startActivity is called.

This is caused by various activity flags set in manifest. Instead of
using startActivity, internal settings screen will just be launched
using SubSetting, which doesn't have this problem.

For external settings, still use startActivityForResult to maintain
backstack.

Test: manual
Change-Id: I07aa6ed932b9048375629d6ffd6ad1adfaba3fd3
2016-10-14 15:42:28 -07:00
Sanket Padawe
8591f26fa3 Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.

Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
2016-10-14 15:41:52 -07:00
Fan Zhang
8da6f88a9b Add security to top level settings.
Bug: 31801373
Test: manual
Change-Id: I7bac30c07f2d811fa465f92f836c2c672a39d2e3
2016-10-14 14:02:03 -07:00
TreeHugger Robot
542fe0c0c3 Merge "Add summary provider for system tile." 2016-10-14 19:56:35 +00:00
Jerry Zhang
dc7ac74869 Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" 2016-10-14 18:24:36 +00:00
Fan Zhang
e0c253fccb Add summary provider for system tile.
Refactored getLocaleNames() into a FeatureProvider interface so it's
reusable and testable.

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I2d31a66a4b32cfa7a364a4cfef1f6eea87084577
2016-10-14 11:08:51 -07:00
TreeHugger Robot
352c55594f Merge "Show a disclaimer about enabling vpn lockdown" 2016-10-14 12:46:15 +00:00
TreeHugger Robot
edbf7ba8ec Merge "Show back button for non-toplevel settings in new IA." 2016-10-14 02:24:23 +00:00
TreeHugger Robot
436815da94 Merge "Add nfc preference controller." 2016-10-14 02:04:08 +00:00
TreeHugger Robot
533bfa6bd7 Merge "Use a ConcurrentSet to keep track of preferences in logger." 2016-10-14 00:51:32 +00:00
Jerry Zhang
5d36a177d9 Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.

Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
2016-10-13 17:32:22 -07:00
Doris Ling
e214570abf Add nfc preference controller.
Update connected devices and wireless setting to use the nfc
preference controller for displaying the nfc and bean settings.

Test: RunSettingsRoboTests
Bug: 31800290
Change-Id: I06eee6b7bfe1d8b767216198bd37f1c79e53d992
2016-10-13 17:19:35 -07:00
TreeHugger Robot
2b03a7d092 Merge "Add more preference controllers to network page." 2016-10-14 00:00:01 +00:00
Fan Zhang
60f0107b3a Show back button for non-toplevel settings in new IA.
Bug: 32159368
Test: RunSettingsRoboTests
Change-Id: I627a6e456ece8ecb1fc337fcd4dd1e9598dab554
2016-10-13 16:53:41 -07:00
Fan Zhang
eb0c8711c6 Use a ConcurrentSet to keep track of preferences in logger.
The preference set can be modified across different threads, apparently.

Change-Id: I4506066d86f7f7d5570c24511db20471d12b0b4a
Fixes: 32156066
Test: manual
2016-10-13 15:24:01 -07:00
Fan Zhang
f1acdd3a51 Add more preference controllers to network page.
- To support Mobile plan preference controller, extended
  LifecycleObserver pattern to also observe onCreate and onSaveInstance.

Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ie98db7efa91f0a8b4c8a06a784d3351237e59fe0
2016-10-13 15:01:18 -07:00
TreeHugger Robot
3bada0d272 Merge "Check for FingerprintManager before using." 2016-10-13 20:44:24 +00:00
Jeff Sharkey
8d8bb6ee1d Check for FingerprintManager before using.
Test: built
Bug: 32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
2016-10-13 12:59:17 -06:00
TreeHugger Robot
fdca235dc5 Merge "Add PreferenceControllers to Network page." 2016-10-13 04:00:45 +00:00
TreeHugger Robot
5db5b02b40 Merge "Add connected devices dashboard category for new IA." 2016-10-13 02:17:36 +00:00
Qi Ding
55cdee2738 Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d am: 85768b3723
am: 051c1b298d

Change-Id: Ib75d421f6b4a4ee97006a3427bb4b1111c5ece2f
2016-10-13 01:40:53 +00:00
Qi Ding
051c1b298d Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
am: 85768b3723

Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
2016-10-13 01:34:08 +00:00
Qi Ding
85768b3723 Merge "Fix searched item isn't highlighted" am: 363c529dc6
am: 1d07de566d

Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
2016-10-13 01:28:00 +00:00
Doris Ling
b2c8c9cc9c Add connected devices dashboard category for new IA.
Add the initial version for the connected devices category.

Test: RunSettingsRoboTests
Bug: 31800290

Change-Id: Ibacef7d5ceaae5e71ff5e5b1c35dafa7738e4f75
2016-10-12 15:27:19 -07:00
Fan Zhang
7f1a4b5891 Add PreferenceControllers to Network page.
- Also made tiles refresh more efficient: when category changes, only
  refresh dynamic tiles. Static tiles from xml will not change due to
  category change.

Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: I1e4c85f2c122c65ec99729e43a66c80acdd863c8
2016-10-12 15:04:39 -07:00
Fan Zhang
c4f07e2d9a Merge "Add a new empty dashboard for Network & Internet." 2016-10-12 19:34:46 +00:00
Fan Zhang
bb93dc0242 Add a new empty dashboard for Network & Internet.
Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ide0c07839332e615f6ba86fb87a1eb04cce2fae7
2016-10-12 10:24:42 -07:00
Salvador Martinez
6906c95773 Merge "Memory Usage by apps no longer shows empty icon" 2016-10-12 17:22:48 +00:00
Dan Sandler
67d326d2b4 Suppress notif block/silence settings for essential packages. am: acf763e996
am: 80df316ac4

Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
2016-10-12 13:57:49 +00:00
Dan Sandler
80df316ac4 Suppress notif block/silence settings for essential packages.
am: acf763e996

Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
2016-10-12 13:51:04 +00:00
Daniel Sandler
0f6ae3aa87 Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev 2016-10-12 13:38:56 +00:00
Julia Reynolds
c747340fa0 Merge "Fix settings crash when disabling listener." 2016-10-12 12:46:13 +00:00
Doris Ling
dc9f6c71be Remove pickup gesture settings if sensor is not found. am: 94e0da52fc am: 79aa718669
am: ef980e4dd1

Change-Id: I6d5ee494b26838f0c508f297a28a18ccc1867422
2016-10-12 00:47:37 +00:00
Doris Ling
ef980e4dd1 Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
am: 79aa718669

Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
2016-10-12 00:35:58 +00:00
Doris Ling
79aa718669 Remove pickup gesture settings if sensor is not found.
am: 94e0da52fc

Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
2016-10-12 00:23:46 +00:00
Salvador Martinez
47d00cf158 Memory Usage by apps no longer shows empty icon
ProcessStatsPreference will now fallback to a
default icon instead of an empty icon. Logging
was added to be able to identify what causes
list to add entries with no text.

Test: Manual, requires installing -> uninstalling an app
Bug: 31812426
Change-Id: Ia1b147ba7a552ec4880776ebf8dba6745154117a
2016-10-11 16:45:57 -07:00
Doris Ling
49c0bab8bf Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev 2016-10-11 23:42:42 +00:00
TreeHugger Robot
1c3ac5bca9 Merge "Reorder prefs in display settings for new info architecture" 2016-10-11 23:39:03 +00:00
Fan Zhang
99abc025b9 Reorder prefs in display settings for new info architecture
Bug: 31800242
Test: Visual inspection
Change-Id: I0cd0e7464eb05881a9b27e726caa1b1e0d211fb6
2016-10-11 14:50:31 -07:00
Doris Ling
94e0da52fc Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.

Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.

Bug: 32072298

Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Julia Reynolds
6e99b3ee4e Fix settings crash when disabling listener.
Bug: 32092445
Test: manual
Change-Id: Iaa26e755381ba202cccf6d518dacb86eae4c6d10
2016-10-11 17:22:44 -04:00
Jeff Sharkey
ab50807d1e Offer a null FignerprintManager.
Settings likes null.

Test: builds
Bug: 32060380
Change-Id: I5ba19bccfd48916d4e581518928a6aee19e84a77
2016-10-11 14:30:19 -06:00
Nick Kralevich
d239fde717 Delete "Show CPU usage" am: 73dfef91b2 am: 0f3067ce58
am: a5a5ebfe5d

Change-Id: I0bde9410a458f90b0f6c2e1e037999399cf7afe0
2016-10-11 18:20:41 +00:00
Nick Kralevich
a5a5ebfe5d Delete "Show CPU usage" am: 73dfef91b2
am: 0f3067ce58

Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
2016-10-11 18:14:34 +00:00
Nick Kralevich
0f3067ce58 Delete "Show CPU usage"
am: 73dfef91b2

Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
2016-10-11 18:09:16 +00:00
Nick Kralevich
73dfef91b2 Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
2016-10-11 09:03:29 -07:00