OSDN Git Service
Matthew Fritze [Tue, 30 May 2017 20:38:57 +0000 (20:38 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
am:
fed6e817a5
Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
TreeHugger Robot [Tue, 30 May 2017 20:24:22 +0000 (20:24 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
Daniel Nishi [Tue, 30 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Fix an override filter bug." into oc-dev
am:
5cc0a122d3
Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
Daniel Nishi [Tue, 30 May 2017 19:44:36 +0000 (19:44 +0000)]
Merge "Fix an override filter bug." into oc-dev
Matthew Fritze [Tue, 30 May 2017 16:58:55 +0000 (09:58 -0700)]
Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes:
38254258
Test: Search "mode" -> no summary text
Christine Franks [Fri, 26 May 2017 20:18:28 +0000 (20:18 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
am:
532a88dcd0
Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
Doris Ling [Fri, 26 May 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
am:
dd7912e12f
Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40
TreeHugger Robot [Fri, 26 May 2017 19:38:37 +0000 (19:38 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
Christine Franks [Fri, 26 May 2017 17:24:45 +0000 (10:24 -0700)]
Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.
Bug:
62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.
Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
Julia Reynolds [Fri, 26 May 2017 14:54:11 +0000 (14:54 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
am:
540e8f50e3
Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
Suprabh Shukla [Fri, 26 May 2017 01:18:05 +0000 (01:18 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am:
136a3da4a3
Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
Fan Zhang [Thu, 25 May 2017 23:16:54 +0000 (23:16 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
am:
5bb87f9f34
Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
jackqdyulei [Thu, 25 May 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
am:
f68bb7e75c
Change-Id: I96a82cc6e02f858fb00501ac122822aa2877cdf6
TreeHugger Robot [Thu, 25 May 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
Daniel Nishi [Mon, 22 May 2017 23:33:32 +0000 (16:33 -0700)]
Fix an override filter bug.
The override filter for storage to ensure that we filter by UUID and
user id was designed as an override filter. This worked as long as there
never was any other filters which could be used out of Storage Settings.
It turns out the instant apps filter applies here.
As a result, I've moved these filters into being "composite filters"
which are composed with the primary filter instead of overriding the
primary filter.
Fixes:
35245772
Test: Settings Robotests... but as for the composing part it is
b/
34768986
Change-Id: I6f5acb909568ab02e81187c09fdda9533d635781
Alison Cichowlas [Thu, 25 May 2017 20:09:22 +0000 (20:09 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev
am:
ed8b39fe60
Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
Lei Yu [Thu, 25 May 2017 20:07:20 +0000 (20:07 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
am:
1a8c2dd899
Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028
TreeHugger Robot [Thu, 25 May 2017 20:06:27 +0000 (20:06 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev
Lei Yu [Thu, 25 May 2017 19:51:13 +0000 (19:51 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix:
62051309
Fix:
62045663
Test: make RunSettingsRoboTests
Julia Reynolds [Wed, 24 May 2017 20:20:06 +0000 (16:20 -0400)]
Allow some system channels to be blocked
Test: manual
Bug:
38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0
jackqdyulei [Tue, 23 May 2017 22:08:24 +0000 (15:08 -0700)]
Sort app list after smeared on screen
Then we could make sure the app list is sorted
Bug:
62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Alison Cichowlas [Wed, 24 May 2017 17:15:27 +0000 (13:15 -0400)]
Update notification settings to match Notification Dot branding.
Bug:
38387970
Test: string changes only, manually verified
Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
jackqdyulei [Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
am:
0a6d61883c
Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
Fan Zhang [Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
am:
7731b4244e
Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
Doris Ling [Thu, 25 May 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
am:
1dead24890
Change-Id: Ic64e4f29c2e7124b3e977acb245f0e3e15f84ff6
TreeHugger Robot [Thu, 25 May 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
jackqdyulei [Wed, 24 May 2017 00:01:39 +0000 (17:01 -0700)]
Add NPE check for refreshUi
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.
Bug:
37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
Doris Ling [Wed, 24 May 2017 20:24:23 +0000 (13:24 -0700)]
Listener to tether state change on Network & internet page.
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.
Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix:
38452559
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 24 May 2017 22:48:55 +0000 (22:48 +0000)]
Tether screen cleanup
am:
20ae31e87c
Change-Id: I5294531666526a05d07db15ff208eedec3504970
Fan Zhang [Wed, 24 May 2017 18:19:52 +0000 (11:19 -0700)]
Recursively remove preference from screen.
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.
Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix:
38507066
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 4 May 2017 18:28:16 +0000 (11:28 -0700)]
Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference
Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix:
37518463
Test: visual
(cherry picked from commit
d80117dcea2ae386dea238ae760a12f8004f4b4c)
jackqdyulei [Wed, 24 May 2017 19:26:16 +0000 (19:26 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
am:
a935b3c030
Change-Id: I969c301888aca43b5e2154fc86dd139ebb83c3f3
TreeHugger Robot [Wed, 24 May 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
Matthew Fritze [Wed, 24 May 2017 17:16:01 +0000 (17:16 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am:
ae0886c9f7
Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
TreeHugger Robot [Wed, 24 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
jackqdyulei [Mon, 22 May 2017 22:40:19 +0000 (15:40 -0700)]
Make "Battery usage" accessible at any time
Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.
Bug:
38497822
Test: RunSettingsRoboTests
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Tony Mak [Wed, 24 May 2017 10:53:25 +0000 (10:53 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
am:
7226c9f4c4
Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
TreeHugger Robot [Wed, 24 May 2017 10:49:11 +0000 (10:49 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
jackqdyulei [Wed, 24 May 2017 01:33:01 +0000 (01:33 +0000)]
Merge "Split loading process for battery header" into oc-dev
am:
987ee5338a
Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
TreeHugger Robot [Wed, 24 May 2017 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
jackqdyulei [Wed, 24 May 2017 00:54:40 +0000 (00:54 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
am:
4e0f69c10c
Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
TreeHugger Robot [Wed, 24 May 2017 00:49:48 +0000 (00:49 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
Suprabh Shukla [Wed, 24 May 2017 00:03:37 +0000 (00:03 +0000)]
Revert "Adding SecureTouchListener to DeviceAdminAdd"
This reverts commit
c1f10cb9c6f4188b2b6b95fa35b8c2a584ff55cb.
Bug:
35056974,
38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
Bill Yi [Wed, 24 May 2017 00:19:39 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
20748da300 -s ours
Change-Id: Ife6fcaa53d906080248b0cb63e8a32ae3a373793
TreeHugger Robot [Wed, 24 May 2017 00:10:58 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug:
38349587
Test: RunSettingsRoboTests
Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
jackqdyulei [Tue, 23 May 2017 22:35:54 +0000 (15:35 -0700)]
Turn on power accounting in AOSP
Bug:
38328724
Test: RunSettingsRoboTests
Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742
Matthew Fritze [Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
am:
96a8dffafb
Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
jackqdyulei [Tue, 23 May 2017 21:30:47 +0000 (14:30 -0700)]
Update the strings for "show all apps"
Bug:
38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
TreeHugger Robot [Tue, 23 May 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
Bill Yi [Tue, 23 May 2017 22:05:15 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
Matthew Fritze [Tue, 23 May 2017 21:02:57 +0000 (21:02 +0000)]
Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit
8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes:
36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
Felipe Leme [Tue, 23 May 2017 20:57:34 +0000 (20:57 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
am:
3cf690e906
Change-Id: Ia76b7b27c3697645b58ee705733211b85a4dca40
TreeHugger Robot [Tue, 23 May 2017 20:44:08 +0000 (20:44 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
Daniel Nishi [Tue, 23 May 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Fix storage summary background colors." into oc-dev
am:
8b8f27cd06
Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev
Felipe Leme [Thu, 18 May 2017 21:32:13 +0000 (14:32 -0700)]
Refactored ConfirmationDialogFragment to use default construcutor.
Test: manual verification
Test: make RunSettingsRoboTests -j90
Fixes:
38397850
Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
Geoffrey Pitsch [Tue, 23 May 2017 15:24:09 +0000 (15:24 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
am:
77bb0aaf96
Change-Id: I571de55e0b3d090ec2442e2019b2a460b0185283
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
Tony Mak [Mon, 22 May 2017 13:22:57 +0000 (14:22 +0100)]
Show app battery usage in correct user
Test: m -j RunSettingsRoboTests
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925
Fix:
38447829
Lei Yu [Tue, 23 May 2017 06:21:32 +0000 (06:21 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
am:
37f6b7f751
Change-Id: I5b5edc8b88a16c83a77ca584d21279892ebb08bf
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
Lei Yu [Tue, 23 May 2017 01:56:48 +0000 (01:56 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
am:
161571617b
Change-Id: I7022cedf1252c5b8b02c6336611c9158ed98dc6c
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
jackqdyulei [Mon, 22 May 2017 21:23:37 +0000 (14:23 -0700)]
Use BatteryStatsLoader in InstalledAppDetails
InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.
Bug:
38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."
This reverts commit
a3c528f64db7aa96c258bdc2f6dad0a8d6897461.
Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Kevin Chyn [Mon, 22 May 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
am:
32ad1c0db4
Change-Id: I3fecd41dac6e4fb3b576a18bf46f1d9a25c1b9ca
TreeHugger Robot [Mon, 22 May 2017 22:40:41 +0000 (22:40 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
Kevin Chyn [Sat, 20 May 2017 01:01:18 +0000 (18:01 -0700)]
Queue events if enrollment sidecar listener is null
Fixes:
38102355
Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762
Geoffrey Pitsch [Thu, 11 May 2017 16:58:23 +0000 (12:58 -0400)]
Developer setting to enable notification channel warnings
Defaults to enabled for debuggable builds
Fixes:
37945054
Fixes:
38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0
Hemant Gupta [Sat, 20 May 2017 01:37:14 +0000 (01:37 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
am:
860b608e41
Change-Id: If246a2f7d340b1d21c805322fa10f0c2fed8115c
TreeHugger Robot [Sat, 20 May 2017 01:33:36 +0000 (01:33 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
Kevin Chyn [Sat, 20 May 2017 00:00:01 +0000 (00:00 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
am:
5ccc2fe242
Change-Id: I08fb0fd4826135f4b469e6516d2cea25cba0a679
TreeHugger Robot [Fri, 19 May 2017 23:56:11 +0000 (23:56 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
Hemant Gupta [Tue, 16 May 2017 09:57:33 +0000 (15:27 +0530)]
Settings: Convert notifications to use NotificationChannel (2/2)
Test Setup:
===========
HW DUT: Pixel O
Remote: MecApp (PBAP Client, MAP Client, SAP Client)
Steps:
=====
1. Enable BT on DUT and bond with Remote.
2. Connect from MecApp for PBAP, MAP, SAP and observe if
connection goes through fine.
Reproducibility:
===============
5/5
Observation:
============
MAP, PBAP and SAP cannot be connected.
Root cause:
In Android O, notifications are hidden by default.
This must be changed to use notification channels so that the
priority of the notifications can be updated.
Test: PBAP/MAP/SAP connection works fine with MecApp.
Bug:
38331825
Change-Id: I51de0ea303037bf88773352d99f092673acda2e3
(cherry picked from commit
bd9f532013f0397879101f68f21ac8841fec344b)
Kevin Chyn [Fri, 19 May 2017 19:22:44 +0000 (12:22 -0700)]
Fix settings crash due to enrolling error
Test: There's a condition where FP enrollment fails and a fragment
transaction/commit occurs after onSaveInstanceState. We should be
using commitAllowingStateLoss() instead of commit()
I'm not able to repro this issue but from looking at the stack
trace this should fix the problem.
Fixes:
38432354
Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0
Adam Bookatz [Fri, 19 May 2017 18:32:31 +0000 (18:32 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev
am:
11e7781b32
Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0
Adam Bookatz [Fri, 19 May 2017 18:24:31 +0000 (18:24 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev
Lorenzo Colitti [Fri, 19 May 2017 03:10:14 +0000 (03:10 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
am:
7d045387e0
Change-Id: Ie329358b56b34a94bbf12d32b9829247e6a6bf3d
TreeHugger Robot [Fri, 19 May 2017 03:01:27 +0000 (03:01 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
Matthew Fritze [Fri, 19 May 2017 00:49:41 +0000 (00:49 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev
am:
6f4a6a737d
Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2
TreeHugger Robot [Fri, 19 May 2017 00:41:02 +0000 (00:41 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev
Daniel Nishi [Thu, 18 May 2017 22:07:24 +0000 (22:07 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev
am:
c7299663e7
Change-Id: I2873188fb073261695d79719c99617a355f17acc
Daniel Nishi [Thu, 18 May 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev
Fan Zhang [Thu, 18 May 2017 20:34:47 +0000 (20:34 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev
am:
13bcf501dd
Change-Id: I9a7e0fa439344a44ddde299795d83d00dd83306d
TreeHugger Robot [Thu, 18 May 2017 20:29:10 +0000 (20:29 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev
Bill Yi [Thu, 18 May 2017 20:13:46 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6253e0710b -s ours
Change-Id: I2ba0f963274890e9c2c8ce5c9347b74ab3a9cce2
TreeHugger Robot [Thu, 18 May 2017 20:05:19 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
jackqdyulei [Thu, 18 May 2017 19:26:20 +0000 (19:26 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
am:
21d2403c67
Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19
jackqdyulei [Thu, 18 May 2017 19:25:57 +0000 (19:25 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev
am:
28cf04d994
Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
TreeHugger Robot [Thu, 18 May 2017 19:13:33 +0000 (19:13 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev