OSDN Git Service
Youhan Wang [Mon, 27 Feb 2017 21:14:50 +0000 (21:14 +0000)]
Merge "Add TelephonyMonitor debug switch in Developer Options."
TreeHugger Robot [Mon, 27 Feb 2017 20:23:31 +0000 (20:23 +0000)]
Merge "Moving load of suggestions from onViewCreated to onCategoriesChanged."
TreeHugger Robot [Mon, 27 Feb 2017 19:10:28 +0000 (19:10 +0000)]
Merge "Experimental change to use colorful icons in Settings home"
Meng Wang [Mon, 27 Feb 2017 18:34:34 +0000 (18:34 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume" am:
05c88316ec am:
e21cbcb6b4
am:
556e3bb3e8
Change-Id: I1a189c49f1ca8c0a8c12f1c834d90f61d25fc470
Meng Wang [Mon, 27 Feb 2017 18:32:30 +0000 (18:32 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume" am:
05c88316ec
am:
e21cbcb6b4
Change-Id: If09bb76b63b0e71d3fa9cf6a42c2436e52093d6a
Soroosh Mariooryad [Wed, 22 Feb 2017 22:28:38 +0000 (14:28 -0800)]
Moving load of suggestions from onViewCreated to onCategoriesChanged.
- This is required when a suggestion is completed and it needs to be
removed from the list immediately.
Test: RunSettingsRoboTests
Fixes: b/
35657186
Change-Id: I731bd1d4ef4a23a74cb4022513d0824ff5f74b2a
Meng Wang [Mon, 27 Feb 2017 18:29:48 +0000 (18:29 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume"
am:
05c88316ec
Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
Treehugger Robot [Mon, 27 Feb 2017 18:25:04 +0000 (18:25 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume"
Youhan Wang [Thu, 9 Feb 2017 17:50:39 +0000 (09:50 -0800)]
Add TelephonyMonitor debug switch in Developer Options.
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40
Bug:
35206589
Change-Id: I72d89acab95980511a2fd54420fd9d3c5ddaddab
Lei Yu [Mon, 27 Feb 2017 17:56:24 +0000 (17:56 +0000)]
Merge "Add NPE check for battery header update."
Antony Sargent [Mon, 27 Feb 2017 16:55:35 +0000 (16:55 +0000)]
Merge "Fix app filter breakage caused by ag/
1900403"
Jeff Sharkey [Mon, 27 Feb 2017 01:45:40 +0000 (01:45 +0000)]
Merge "Follow API removals."
Lei Yu [Sat, 25 Feb 2017 18:35:15 +0000 (18:35 +0000)]
Merge "Add NPE check for screen and cellular update."
Meng Wang [Thu, 23 Feb 2017 22:33:49 +0000 (14:33 -0800)]
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
Marie Janssen [Sat, 25 Feb 2017 13:51:01 +0000 (13:51 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am:
17ad73ed9b am:
019c8f38fe
am:
14795a7855
Change-Id: If28610b01c89647b66f84561455e540c480d49fa
Marie Janssen [Sat, 25 Feb 2017 13:47:59 +0000 (13:47 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am:
17ad73ed9b
am:
019c8f38fe
Change-Id: I12084f452872d8fb9778ad6360c8e58196fdcddf
Marie Janssen [Sat, 25 Feb 2017 13:44:29 +0000 (13:44 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am:
17ad73ed9b
Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
Treehugger Robot [Sat, 25 Feb 2017 13:39:27 +0000 (13:39 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
Marie Janssen [Thu, 23 Feb 2017 19:20:56 +0000 (11:20 -0800)]
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
TreeHugger Robot [Sat, 25 Feb 2017 03:04:05 +0000 (03:04 +0000)]
Merge "Removed AccountSettings used in old IA only."
TreeHugger Robot [Sat, 25 Feb 2017 02:45:35 +0000 (02:45 +0000)]
Merge "Removed emergency info and add user when locked from Users settings."
TreeHugger Robot [Sat, 25 Feb 2017 02:42:23 +0000 (02:42 +0000)]
Merge "Restore the shortcut icon size."
Fan Zhang [Sat, 25 Feb 2017 01:06:19 +0000 (17:06 -0800)]
Experimental change to use colorful icons in Settings home
Bug:
34978809
Test: manual
Change-Id: Ia48404dd631d996dfcc25457baef9f60ab4408cb
Chen Xu [Sat, 25 Feb 2017 01:24:41 +0000 (01:24 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api" am:
d989558616 am:
fbf747bb76
am:
9f5e1f92b8 -s ours
Change-Id: I7a06998f8ffb4d49525e2a5ad40267f0d6712455
TreeHugger Robot [Sat, 25 Feb 2017 01:19:14 +0000 (01:19 +0000)]
Merge changes from topic 'build_number_logging'
* changes:
Log when build number preference is clicked.
DeviceInfo: move more prefereces in PreferenceController
Chen Xu [Sat, 25 Feb 2017 01:17:45 +0000 (01:17 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api" am:
d989558616
am:
fbf747bb76
Change-Id: I4fa43c07a96d070c209e6c71a7c5227958aef2ee
Makoto Onuki [Thu, 23 Feb 2017 20:44:17 +0000 (12:44 -0800)]
Restore the shortcut icon size.
Bug:
35515740
Test: Manual tests with Ibb94728eb03
Change-Id: I606916e97acdf5106372deec98f2bd98509b39f7
Chen Xu [Sat, 25 Feb 2017 01:11:04 +0000 (01:11 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
am:
d989558616
Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
Antony Sargent [Fri, 24 Feb 2017 21:26:28 +0000 (13:26 -0800)]
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
Doris Ling [Fri, 24 Feb 2017 23:20:05 +0000 (15:20 -0800)]
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
Fan Zhang [Fri, 24 Feb 2017 23:37:14 +0000 (15:37 -0800)]
Log when build number preference is clicked.
Optionally also log whether user is in development mode.
Change-Id: I1f5dc2891b2c4fc74f940e3118fb09ee18cc9688
Fix:
34774945
Test: make RunSettingsRoboTests
Jason Monk [Fri, 24 Feb 2017 23:29:24 +0000 (23:29 +0000)]
Merge "Switch references to colorError"
TreeHugger Robot [Fri, 24 Feb 2017 23:22:15 +0000 (23:22 +0000)]
Merge "Properly forget networks and refresh page in SavedAcessPointsWifiSettings."
Fan Zhang [Fri, 24 Feb 2017 01:50:27 +0000 (17:50 -0800)]
DeviceInfo: move more prefereces in PreferenceController
Bug:
34774945
Test: make RunSettingsRoboTests
Change-Id: Ie5e113a6df85bab5be50c947bd7b91cfacdccb7f
jackqdyulei [Thu, 23 Feb 2017 00:42:26 +0000 (16:42 -0800)]
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
Soroosh Mariooryad [Fri, 24 Feb 2017 21:55:28 +0000 (21:55 +0000)]
Merge "Move suggestions package to dashboard.suggestions"
jackqdyulei [Fri, 24 Feb 2017 21:03:35 +0000 (13:03 -0800)]
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
Doris Ling [Fri, 24 Feb 2017 20:36:27 +0000 (12:36 -0800)]
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
TreeHugger Robot [Fri, 24 Feb 2017 20:30:11 +0000 (20:30 +0000)]
Merge "Fix issue with app info summary for diasbled app."
Jason Monk [Thu, 2 Feb 2017 01:20:44 +0000 (20:20 -0500)]
Switch references to colorError
Test: make
Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946
Soroosh Mariooryad [Thu, 23 Feb 2017 10:02:29 +0000 (02:02 -0800)]
Move suggestions package to dashboard.suggestions
Test: RunSettingsRoboTests
Change-Id: I4f9af27767c8e55d3b1a16e77c099da52d40aab5
TreeHugger Robot [Fri, 24 Feb 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Update summary text for Emergency info"
Jeff Sharkey [Fri, 24 Feb 2017 19:03:09 +0000 (12:03 -0700)]
Follow API removals.
Test: builds, boots
Bug:
31241513
Change-Id: I64c688cb377981d2a8f2a30ddb79e3b72f2e7254
TreeHugger Robot [Fri, 24 Feb 2017 18:50:59 +0000 (18:50 +0000)]
Merge "Change app detail header title to multi-line."
fionaxu [Fri, 24 Feb 2017 18:42:12 +0000 (10:42 -0800)]
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
Doris Ling [Fri, 24 Feb 2017 18:36:23 +0000 (10:36 -0800)]
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
Chen Xu [Fri, 24 Feb 2017 18:15:42 +0000 (18:15 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
TreeHugger Robot [Fri, 24 Feb 2017 14:42:22 +0000 (14:42 +0000)]
Merge "Add wipe on login failure to Privacy Settings page"
TreeHugger Robot [Fri, 24 Feb 2017 03:59:22 +0000 (03:59 +0000)]
Merge "Fix NPE when logging start intent."
Stephen Chen [Fri, 24 Feb 2017 03:39:09 +0000 (19:39 -0800)]
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
TreeHugger Robot [Fri, 24 Feb 2017 03:31:05 +0000 (03:31 +0000)]
Merge "Change static defined color inside drawable"
Fan Zhang [Fri, 24 Feb 2017 02:18:33 +0000 (18:18 -0800)]
Fix NPE when logging start intent.
Change-Id: I3a19131b879b4d52644bfb43292434917d30b423
Fix:
34774945
Test: make RunSettingsRoboTests
Hyunyoung Song [Thu, 23 Feb 2017 23:30:12 +0000 (15:30 -0800)]
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
Fan Zhang [Fri, 24 Feb 2017 00:05:30 +0000 (16:05 -0800)]
DeviceInfo: Wrap prefereces in PreferenceController
Bug:
34774945
Test: make RunSettingsRoboTests
Change-Id: I8bf56b436064684f4d2010e6899548249af69fc3
Andre Eisenbach [Thu, 23 Feb 2017 22:52:31 +0000 (14:52 -0800)]
Add key to NFC search index option
Bug:
35657617
Test: manual
Change-Id: If9350272f7e48b061dea2f0da75c3c5bcd0ee9ac
Doris Ling [Thu, 23 Feb 2017 22:23:53 +0000 (14:23 -0800)]
Update summary text for Emergency info
- changed text to Info & contacts for <user>
Change-Id: I731f6f038baa3d4dc0dfd9d83bade44185b096b7
Fix:
34976320
Test: Visual
Marie Janssen [Thu, 23 Feb 2017 22:01:15 +0000 (22:01 +0000)]
Merge "Bluetooth: service for pairing notification" am:
7dfc705ad9 am:
7b9f96983d
am:
dd0c9e6265
Change-Id: Ifb9bc78d4e9569248c5ed97facad33b6aa1170c4
Marie Janssen [Thu, 23 Feb 2017 21:56:41 +0000 (21:56 +0000)]
Merge "Bluetooth: service for pairing notification" am:
7dfc705ad9
am:
7b9f96983d
Change-Id: I0392be2a4016dd8df5cb5f682a858178a3a2dd37
Marie Janssen [Thu, 23 Feb 2017 21:52:24 +0000 (21:52 +0000)]
Merge "Bluetooth: service for pairing notification"
am:
7dfc705ad9
Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
Marie Janssen [Thu, 23 Feb 2017 21:41:05 +0000 (21:41 +0000)]
Merge "Bluetooth: service for pairing notification"
TreeHugger Robot [Thu, 23 Feb 2017 21:28:56 +0000 (21:28 +0000)]
Merge "Add logging whenever preference leads to intent."
Andre Eisenbach [Thu, 23 Feb 2017 21:00:53 +0000 (21:00 +0000)]
Merge "Do not index NFC for search if NFC is not present"
Andre Eisenbach [Thu, 23 Feb 2017 20:10:03 +0000 (12:10 -0800)]
Do not index NFC for search if NFC is not present
Bug:
35657617
Test: manual
Change-Id: I320b46d4d384611725d2dea628cf42180b8018ac
TreeHugger Robot [Thu, 23 Feb 2017 20:41:40 +0000 (20:41 +0000)]
Merge "Update metrics constant for Encryption & credentials."
Doris Ling [Thu, 23 Feb 2017 20:06:06 +0000 (12:06 -0800)]
Change app detail header title to multi-line.
- allow multi line in app detail header title so that title text will
not be cut off
- fix layout so that the app links buttons and the title text won't
overlap
Change-Id: I9d35a20bc6630f89182023ba097781870184d122
Fix:
35675169
Test: Visual
Fan Zhang [Thu, 23 Feb 2017 18:59:47 +0000 (10:59 -0800)]
Add logging whenever preference leads to intent.
Bug:
34774945
Test: make RunSettignsRoboTests
Change-Id: I694e5a0a2b614c695193c9c525991a1558e0a81a
TreeHugger Robot [Thu, 23 Feb 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Convert DeviceInfoSettings into a dashboard fragment."
TreeHugger Robot [Thu, 23 Feb 2017 18:59:34 +0000 (18:59 +0000)]
Merge "Draw currently connected network in Picker."
Doris Ling [Thu, 23 Feb 2017 18:57:19 +0000 (10:57 -0800)]
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
TreeHugger Robot [Thu, 23 Feb 2017 18:57:13 +0000 (18:57 +0000)]
Merge "First pass at removing duplicate results"
Daniel Nishi [Thu, 23 Feb 2017 18:39:30 +0000 (18:39 +0000)]
Merge "Add support for user profiles to the Storage Settings."
Fan Zhang [Thu, 23 Feb 2017 02:16:46 +0000 (18:16 -0800)]
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
Daniel Nishi [Thu, 23 Feb 2017 17:35:28 +0000 (17:35 +0000)]
Merge "Use the upstreamed StorageStatsSource wrapper."
TreeHugger Robot [Thu, 23 Feb 2017 04:21:34 +0000 (04:21 +0000)]
Merge "Personal sounds override work sounds, not replace"
Sundeep Ghuman [Thu, 23 Feb 2017 03:25:38 +0000 (19:25 -0800)]
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
TreeHugger Robot [Thu, 23 Feb 2017 02:37:51 +0000 (02:37 +0000)]
Merge "Remove refresh menu icon in battery settings"
TreeHugger Robot [Thu, 23 Feb 2017 02:17:30 +0000 (02:17 +0000)]
Merge "Don't show afw default app pref if there is no candidate."
Maurice Lam [Thu, 23 Feb 2017 02:01:44 +0000 (02:01 +0000)]
Merge "Update GLIF button styles"
Daniel Nishi [Thu, 9 Feb 2017 01:16:19 +0000 (17:16 -0800)]
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.
Daniel Nishi [Wed, 15 Feb 2017 23:25:48 +0000 (15:25 -0800)]
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
Chris Tate [Thu, 23 Feb 2017 00:50:08 +0000 (00:50 +0000)]
Merge "Send the tethering entitlement broadcast to manifest receivers"
Fan Zhang [Wed, 22 Feb 2017 22:29:22 +0000 (14:29 -0800)]
Don't show afw default app pref if there is no candidate.
Change-Id: I25f077662264406a8a4d819db7b4713be753a33b
Fix:
22564285
Test: make RunSettingsRoboTests
Bartosz Fabianowski [Tue, 14 Feb 2017 10:45:20 +0000 (11:45 +0100)]
Add wipe on login failure to Privacy Settings page
This CL adds information to the Enterprise Privacy Setting page that
tells the user how many times the password can be mistyped before
the device (or the work profile) is forcefully wiped.
Test: make RunSettingsRoboTests
Bug:
32692748
Change-Id: I4ae316802dbf5853ab4eacb0787647372d5e26c2
Matthew Fritze [Tue, 14 Feb 2017 17:32:23 +0000 (09:32 -0800)]
First pass at removing duplicate results
Removes the duplicate results which match Title and
Summary. Prioritizes higher ranked items and inline
results.
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I28d4f85b276c7bf5c7f3e1273eeec02066be097d
Christopher Tate [Wed, 22 Feb 2017 19:10:10 +0000 (11:10 -0800)]
Send the tethering entitlement broadcast to manifest receivers
Bug
35661943
Test: manual
Change-Id: I8bf9fcd7634c15b2380e83274db18eb29f993686
fionaxu [Sat, 18 Feb 2017 01:36:11 +0000 (17:36 -0800)]
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
Change-Id: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
TreeHugger Robot [Wed, 22 Feb 2017 19:28:54 +0000 (19:28 +0000)]
Merge "Update string char limit"
Daniel Nishi [Wed, 22 Feb 2017 19:17:40 +0000 (19:17 +0000)]
Merge "Add logging to help debug loader issue."
TreeHugger Robot [Wed, 22 Feb 2017 19:09:54 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 22 Feb 2017 18:53:47 +0000 (18:53 +0000)]
Import translations. DO NOT MERGE am:
55ba636186 -s ours
am:
8d36f807bc -s ours
Change-Id: I6c7cde0415a40ef8bdc4fcd69615098bf1697b11
Bill Yi [Wed, 22 Feb 2017 18:51:16 +0000 (18:51 +0000)]
Import translations. DO NOT MERGE
am:
55ba636186 -s ours
Change-Id: I9d64b082f425dbc5bd37b453e51a5e01127400a4
Lei Yu [Wed, 22 Feb 2017 18:44:34 +0000 (18:44 +0000)]
Merge "Add battery stats perference in battery settings page."
Antony Sargent [Wed, 22 Feb 2017 18:40:40 +0000 (18:40 +0000)]
Merge "Add "Instant apps" filter to app listing"
Fan Zhang [Wed, 22 Feb 2017 17:30:43 +0000 (09:30 -0800)]
Update string char limit
Change-Id: I79bd24ba548cd2b9f37d11f30af3076cdc394412
Fix:
35449637
Test: builds
Bill Yi [Wed, 22 Feb 2017 16:50:31 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied9c4535fc4e6739099864f17584108b1d938c50
Auto-generated-cl: translation import
Bill Yi [Wed, 22 Feb 2017 16:45:15 +0000 (08:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id90042e2ffb82fb6d438d1999f5c30f6ea2224be
Auto-generated-cl: translation import
Anton Philippov [Wed, 22 Feb 2017 11:17:03 +0000 (11:17 +0000)]
Merge "Remove intent-filter from PrivacySettingsActivity"
jackqdyulei [Tue, 14 Feb 2017 23:46:10 +0000 (15:46 -0800)]
Add battery stats perference in battery settings page.
Add a preferenceGroup at the bottom of the page, which contains
Screen and Cell usage data.
Bug:
35305983
Test: RunSettingsRoboTests & Screenshot
Change-Id: Ida6e92ddbd7155ec974a2f04c6d6d02ab9dab210
TreeHugger Robot [Wed, 22 Feb 2017 03:59:34 +0000 (03:59 +0000)]
Merge "Add logging to trace when force stop button is clicked"