Commit Graph

33929 Commits

Author SHA1 Message Date
Antony Sargent
5ac2e138b1 Merge "Fix app filter breakage caused by ag/1900403" 2017-02-27 16:55:36 +00:00
Jeff Sharkey
bf31617f40 Merge "Follow API removals." 2017-02-27 01:45:45 +00:00
Lei Yu
c6fdf599fb Merge "Add NPE check for screen and cellular update." 2017-02-25 18:35:16 +00:00
Meng Wang
d3b0c37ef2 WiFiCallingSettings: don't start carrier app in onResume
onResume initialize UI before registering switch change listener.
So that listener is not invoked in UI initialization, but only real
switch change by user.

Bug: 33680334
Test: make
Test: manual - carrier app is not invoked in onResume
Change-Id: I7ca1eb1eab214b50c8de72946590c1ecb676d4df
2017-02-25 10:23:23 -08: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
14795a7855 Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am: 17ad73ed9b
am: 019c8f38fe

Change-Id: I12084f452872d8fb9778ad6360c8e58196fdcddf
2017-02-25 13:47:59 +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
Treehugger Robot
17ad73ed9b Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" 2017-02-25 13:39:28 +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
25f3d48047 Merge "Restore the shortcut icon size." 2017-02-25 02:42:24 +00:00
Fan Zhang
93d2294eab Experimental change to use colorful icons in Settings home
Bug: 34978809
Test: manual
Change-Id: Ia48404dd631d996dfcc25457baef9f60ab4408cb
2017-02-24 17:41:37 -08:00
Chen Xu
92b6814946 Merge "move ACTION_CARRIER_SETUP intent to public api" am: d989558616 am: fbf747bb76
am: 9f5e1f92b8  -s ours

Change-Id: I7a06998f8ffb4d49525e2a5ad40267f0d6712455
2017-02-25 01:24:41 +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
9f5e1f92b8 Merge "move ACTION_CARRIER_SETUP intent to public api" am: d989558616
am: fbf747bb76

Change-Id: I4fa43c07a96d070c209e6c71a7c5227958aef2ee
2017-02-25 01:17:45 +00:00
Makoto Onuki
fa7b3b31a6 Restore the shortcut icon size.
Bug: 35515740
Test: Manual tests with Ibb94728eb03
Change-Id: I606916e97acdf5106372deec98f2bd98509b39f7
2017-02-24 17:15:04 -08: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
Antony Sargent
16e6eced00 Fix app filter breakage caused by ag/1900403
Bug: 35726115
Test: manual, run existing robo tests by make RunSettingsRoboTests

In ag/1900403 I renumbered the int constants in ManageApplications.java
to remove a gap in the sequence without realizing that the arrays
containing strings/filters based on these constants still contained
entries for the constant whose value was removed.

In this CL I've fixed that and reorganized the initialization code slightly
to make it easier to keep things in sync going forward.

Change-Id: I6d2db6499fb7eb080570bc757bde497fcd39fead
2017-02-24 16:05:30 -08: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
jackqdyulei
166d25abb1 Add NPE check for battery header update.
Battery header uses AsyncTask to update the label. So if user
press back button before the update completes, the "getContext()"
in AsyncTask callback will return null, which causes the crash.

It seems there is no good way to fix it expect adding a NPE check.

Bug: 35650224
Test: RunSettingsRoboTests
Change-Id: I7bd9fd87caa13614fe1896cf72557a09744691c1
2017-02-24 14:17:58 -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
TreeHugger Robot
20df926729 Merge "Update summary text for Emergency info" 2017-02-24 19:04:13 +00:00
Jeff Sharkey
2079a38036 Follow API removals.
Test: builds, boots
Bug: 31241513
Change-Id: I64c688cb377981d2a8f2a30ddb79e3b72f2e7254
2017-02-24 12:03:09 -07:00
TreeHugger Robot
b82a41f43c Merge "Change app detail header title to multi-line." 2017-02-24 18:50:59 +00: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
William Luh
4f80f221c6 Query the security feature provider on separate threads.
Bug: 35065510
Test: make RunSettingsRoboTests
Change-Id: Ib9ffc5bf9c3ace5d2a904206f834f69eccfb690d
2017-02-24 09:49:37 -08: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
TreeHugger Robot
80f9e536d5 Merge "Change static defined color inside drawable" 2017-02-24 03:31:05 +00: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
Hyunyoung Song
e2c31ffc2b Change static defined color inside drawable
Test: manual build and installed on bullhead
-theme based color attribute may not load from correct context inside drawables.

b/35681210

Change-Id: I8869963dee76d6744c619a25f01270e2a2f5d77c
2017-02-23 17:37:19 -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
Doris Ling
afc08b4458 Update summary text for Emergency info
- changed text to Info & contacts for <user>

Change-Id: I731f6f038baa3d4dc0dfd9d83bade44185b096b7
Fix: 34976320
Test: Visual
2017-02-23 14:23:53 -08: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
dd0c9e6265 Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9
am: 7b9f96983d

Change-Id: I0392be2a4016dd8df5cb5f682a858178a3a2dd37
2017-02-23 21:56:41 +00:00