Commit Graph

15256 Commits

Author SHA1 Message Date
Lei Yu
c6fdf599fb Merge "Add NPE check for screen and cellular update." 2017-02-25 18:35:16 +00:00
Marie Janssen
cd45633eb0 Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am: 17ad73ed9b am: 019c8f38fe
am: 14795a7855

Change-Id: If28610b01c89647b66f84561455e540c480d49fa
2017-02-25 13:51:01 +00:00
Marie Janssen
019c8f38fe Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am: 17ad73ed9b

Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
2017-02-25 13:44:29 +00:00
Marie Janssen
41cdfd8887 Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.

Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix: 35246073
2017-02-25 13:39:16 +00:00
TreeHugger Robot
b7c595a636 Merge "Removed AccountSettings used in old IA only." 2017-02-25 03:04:06 +00:00
TreeHugger Robot
7450c35828 Merge "Removed emergency info and add user when locked from Users settings." 2017-02-25 02:45:36 +00:00
TreeHugger Robot
52c5c54ef8 Merge changes from topic 'build_number_logging'
* changes:
  Log when build number preference is clicked.
  DeviceInfo: move more prefereces in PreferenceController
2017-02-25 01:19:19 +00:00
Chen Xu
fbf747bb76 Merge "move ACTION_CARRIER_SETUP intent to public api"
am: d989558616

Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
2017-02-25 01:11:04 +00:00
Chen Xu
d989558616 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
Doris Ling
f074f0f6dd Removed AccountSettings used in old IA only.
- remove AccountSettings and all related code that is used in old IA, so
that it will not show up in search.

Change-Id: I9f83112f760fd991caf89de109fde9e675b8c981
Fix: 34165913
Test: make RunSettingsRoboTests
2017-02-24 16:04:35 -08:00
Fan Zhang
f42377a18e Log when build number preference is clicked.
Optionally also log whether user is in development mode.

Change-Id: I1f5dc2891b2c4fc74f940e3118fb09ee18cc9688
Fix: 34774945
Test: make RunSettingsRoboTests
2017-02-24 15:39:02 -08:00
Jason Monk
5286610f59 Merge "Switch references to colorError" 2017-02-24 23:29:30 +00:00
TreeHugger Robot
2228aecfbb Merge "Properly forget networks and refresh page in SavedAcessPointsWifiSettings." 2017-02-24 23:22:16 +00:00
Fan Zhang
efb8d625a2 DeviceInfo: move more prefereces in PreferenceController
Bug: 34774945
Test: make RunSettingsRoboTests
Change-Id: Ie5e113a6df85bab5be50c947bd7b91cfacdccb7f
2017-02-24 14:34:34 -08:00
Soroosh Mariooryad
fc19e30d4d Merge "Move suggestions package to dashboard.suggestions" 2017-02-24 21:55:29 +00:00
jackqdyulei
906055e383 Add NPE check for screen and cellular update.
When battery is full of charge, usageList in BatteryStatsHelper
will be empty. As a result, we cannot find BatterySipper with
type screen and cell, which creates the null pointer error.

In this cl, I add NPE check for sipper. When sipper is null, all
data will be set to default value. I also add check for totalPower
so we won't have divided by zero error.

Bug: 35757789
Test: RunSettingsRoboTests
Change-Id: I80f3c0c542e0a50868e7c314a8d9b3c17999d8c6
2017-02-24 13:47:14 -08:00
Doris Ling
ed0fc506a3 Removed emergency info and add user when locked from Users settings.
In new IA, Emergency Info and Add user when locked has been moved to
Users & accounts page.

Change-Id: I1a1e4bd801936b654d8a4ede7cfc64e2ac285019
Fix: 33703736
Test: make SettingsTests
2017-02-24 12:38:57 -08:00
TreeHugger Robot
ee4798f368 Merge "Fix issue with app info summary for diasbled app." 2017-02-24 20:30:11 +00:00
Jason Monk
6fca98f905 Switch references to colorError
Test: make
Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946
2017-02-24 14:57:31 -05:00
Soroosh Mariooryad
5f375a2776 Move suggestions package to dashboard.suggestions
Test: RunSettingsRoboTests

Change-Id: I4f9af27767c8e55d3b1a16e77c099da52d40aab5
2017-02-24 11:04:41 -08:00
fionaxu
181138d2d1 move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs 33679956

Test: Manual
Bug: 33679956
Merged-in: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
Change-Id: I84ffd5f2c8c3418689ee3d5ff5ddc3f9f7959763
2017-02-24 10:45:12 -08:00
Doris Ling
b8642c7464 Fix issue with app info summary for diasbled app.
- also check the component enable state to determine whether an app is
really enabled or not.

Change-Id: I8075ec9253b9136c58fc206e10b10f77b1efe6c2
Fix: 35673125
Test: make RunSettingsRoboTests
2017-02-24 10:36:23 -08:00
Chen Xu
be9002a29b Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-24 18:15:47 +00:00
TreeHugger Robot
3cac802860 Merge "Add wipe on login failure to Privacy Settings page" 2017-02-24 14:42:23 +00:00
TreeHugger Robot
c03fb82b91 Merge "Fix NPE when logging start intent." 2017-02-24 03:59:23 +00:00
Stephen Chen
2c10f078df Properly forget networks and refresh page in SavedAcessPointsWifiSettings.
The dialog access point rebuilt after fragment is destroyed (i.e.
orientation change) did not properly save selected Preference, and
caused NPE. Changed onForget to refresh preference list.

Bug: 35207121
Test: b/35322875 tracking bug for saved networks tests.
Change-Id: I81935c5a6e3efab4d4e3b6e7c2b150bacf06d7c1
2017-02-23 19:39:09 -08:00
Fan Zhang
a8ecacb246 Fix NPE when logging start intent.
Change-Id: I3a19131b879b4d52644bfb43292434917d30b423
Fix: 34774945
Test: make RunSettingsRoboTests
2017-02-23 18:20:26 -08:00
Fan Zhang
69e95c6e75 DeviceInfo: Wrap prefereces in PreferenceController
Bug: 34774945
Test: make RunSettingsRoboTests
Change-Id: I8bf56b436064684f4d2010e6899548249af69fc3
2017-02-23 17:30:34 -08:00
Andre Eisenbach
7e0df1e48c Add key to NFC search index option
Bug: 35657617
Test: manual
Change-Id: If9350272f7e48b061dea2f0da75c3c5bcd0ee9ac
2017-02-23 22:54:06 +00:00
Marie Janssen
37e7c0eb4c Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9 am: 7b9f96983d
am: dd0c9e6265

Change-Id: Ifb9bc78d4e9569248c5ed97facad33b6aa1170c4
2017-02-23 22:01:15 +00:00
Marie Janssen
7b9f96983d Merge "Bluetooth: service for pairing notification"
am: 7dfc705ad9

Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
2017-02-23 21:52:24 +00:00
TreeHugger Robot
d86a16f481 Merge "Add logging whenever preference leads to intent." 2017-02-23 21:28:56 +00:00
Andre Eisenbach
8c3e46e628 Merge "Do not index NFC for search if NFC is not present" 2017-02-23 21:00:54 +00:00
Andre Eisenbach
4d03c5b489 Do not index NFC for search if NFC is not present
Bug: 35657617
Test: manual
Change-Id: I320b46d4d384611725d2dea628cf42180b8018ac
2017-02-23 12:45:57 -08:00
TreeHugger Robot
ab987168dc Merge "Update metrics constant for Encryption & credentials." 2017-02-23 20:41:44 +00:00
Fan Zhang
ee45943177 Add logging whenever preference leads to intent.
Bug: 34774945
Test: make RunSettignsRoboTests
Change-Id: I694e5a0a2b614c695193c9c525991a1558e0a81a
2017-02-23 11:55:50 -08:00
TreeHugger Robot
4bc851b520 Merge "Convert DeviceInfoSettings into a dashboard fragment." 2017-02-23 19:16:22 +00:00
TreeHugger Robot
d41ce87072 Merge "Draw currently connected network in Picker." 2017-02-23 18:59:34 +00:00
Doris Ling
4785c00b2c Update metrics constant for Encryption & credentials.
Use the new metrics constant for the sub-page instead of the original
"security" metrics.

Change-Id: I0bdceae3d2e299e94791021c0d0aff2c9019fdd0
Fix: 35630998
Test: make RunSettingsRoboTests
2017-02-23 10:57:19 -08:00
TreeHugger Robot
a563f1b57b Merge "First pass at removing duplicate results" 2017-02-23 18:57:13 +00:00
Daniel Nishi
63558780a5 Merge "Add support for user profiles to the Storage Settings." 2017-02-23 18:39:35 +00:00
Fan Zhang
c62e2f033d Convert DeviceInfoSettings into a dashboard fragment.
This is needed to use logging from DashboardFragemnt.
This page is now a mixture of PrefernceController and non-controller
preferences.

Also permanently removed system update preference from xml to simplify
migration

Todo: convert the rest of preference into controller.

Bug: 34774945
Test: make RunSettingsRoboTests
Change-Id: Ie5130ea7377db2ccf2236cdf48e5cc26d1347d7a
2017-02-23 09:42:57 -08:00
Daniel Nishi
ee2a238e1d Merge "Use the upstreamed StorageStatsSource wrapper." 2017-02-23 17:35:29 +00:00
Sundeep Ghuman
0b61e3028c Draw currently connected network in Picker.
Make sure to call refresh when adding the Access Point Preference to the
WifiPicker's Connected Access Point Category. This will case the icon
and the title to be drawn.

Bug: 35388267
Test: None. Too difficult without robolectric testing which requires
refactor.

Change-Id: I7949733f8ca7f904327872df54f6963c723bc704
2017-02-22 19:25:38 -08:00
TreeHugger Robot
82c108ab32 Merge "Remove refresh menu icon in battery settings" 2017-02-23 02:37:51 +00:00
TreeHugger Robot
7b8c9b92f1 Merge "Don't show afw default app pref if there is no candidate." 2017-02-23 02:17:31 +00:00
Daniel Nishi
e3ac0cd6db Use the upstreamed StorageStatsSource wrapper.
This was upstreamed into SettingsLib when similar wrappers
started showing up in other projects. Settings, however, was
using the non-upstreamed version.

Change-Id: Iffadb75655165d3b64a25fd7b21e5b9765cb40be
Fixes: 35680800
Test: Settings Robotests still pass despite the data swap out.
2017-02-22 17:49:41 -08:00
Daniel Nishi
9f60f42a94 Add support for user profiles to the Storage Settings.
This adds new preferences for each profile (such as the work
profile) and defines a new view for viewing the storage
breakdown for the individual profile. The functionality closely
mimics the presentation on the main view, but without the system-wide
breakdown and without any additional users/profiles.

Bug: 34715777
Test: Settings Robotests

Change-Id: I19d449b648c6566331fd02e45c2e45f8c74ea7e7
2017-02-22 17:33:24 -08:00
Chris Tate
eb32ad8779 Merge "Send the tethering entitlement broadcast to manifest receivers" 2017-02-23 00:50:08 +00:00
Fan Zhang
c13b950b02 Don't show afw default app pref if there is no candidate.
Change-Id: I25f077662264406a8a4d819db7b4713be753a33b
Fix: 22564285
Test: make RunSettingsRoboTests
2017-02-22 15:08:22 -08:00