OSDN Git Service
TreeHugger Robot [Fri, 13 Apr 2018 19:44:37 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Doris Ling [Fri, 13 Apr 2018 19:44:11 +0000 (19:44 +0000)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
Daniel Nishi [Fri, 13 Apr 2018 19:31:15 +0000 (19:31 +0000)]
Merge "Warn users before they change device name." into pi-dev
Bill Yi [Fri, 13 Apr 2018 18:39:46 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I50e29a33b46f948023f4b85d1ebacb99397d6ec9
TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]
Merge "Support customizing icon color for externally items." into pi-dev
Lei Yu [Fri, 13 Apr 2018 16:42:08 +0000 (16:42 +0000)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
Fan Zhang [Thu, 12 Apr 2018 21:04:09 +0000 (14:04 -0700)]
Support customizing icon color for externally items.
When a setting is injected to homepage, we now allow the setting
provider customize the background color for its icon.
If no custom bg color is provided, we fallback to existing behavior.
This behavior is only needed in homepage, because we don't have any
tinting logic in other pages so external setting providers can just
provide arbitrary icon.
Bug:
77188317
Test: robotests
Change-Id: I7d4b512fafc28537de46192026ce4bbe51b498c4
Lei Yu [Fri, 13 Apr 2018 00:35:11 +0000 (00:35 +0000)]
Merge "Log app versionCode in anomaly detection" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 00:10:32 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:35:15 +0000 (23:35 +0000)]
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:16:28 +0000 (23:16 +0000)]
Merge "Shuffle sound settings UI arrangment" into pi-dev
Daniel Nishi [Fri, 6 Apr 2018 01:24:13 +0000 (18:24 -0700)]
Warn users before they change device name.
This ensures users know that the change they make will be visible
through Bluetooth and Wi-Fi Hotspot.
Fixes:
74981919
Test: Settings robotest
Merged-In: Ib27066f4a123dc472730d7e663adfb039b1e27d6
Doris Ling [Thu, 12 Apr 2018 22:31:32 +0000 (15:31 -0700)]
Hide Default apps and App permissions under Advanced.
- decrease the initial expand count to move the 2 items into the
Advanced section in the Apps and notification page.
Change-Id: I5861c4c768d3a4d77677c75555d83065f2526a56
Fixes:
77823915
Test: manual
TreeHugger Robot [Thu, 12 Apr 2018 22:26:54 +0000 (22:26 +0000)]
Merge "Use a different string for vpn summary." into pi-dev
Bill Yi [Thu, 12 Apr 2018 22:16:40 +0000 (15:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Bug:
77897542
Change-Id: Ibe6564030f06ca559f4f4353c88746b8ab775da7
ryanywlin [Thu, 12 Apr 2018 21:51:46 +0000 (05:51 +0800)]
Shuffle sound settings UI arrangment
- Move "Ring volume" and "also viberate for calls" below to "Media volume"
- Add divider between "Media volume" and "Ring volume"
- Add divider between "also viberate for calls" and "Alarm volume"
Bug:
74130772
Test: rebuild
Change-Id: Ie274c0174d828a0804b8551760c407579585bd1b
Lei Yu [Thu, 12 Apr 2018 20:58:40 +0000 (13:58 -0700)]
Change "Advanced battery usage" to "Battery usage"
Also update the char limit to 25 to make it less impossible
to happen in other language.
Bug:
77649015
Test: Screenshot
Change-Id: I4cdbfc576660aacaeff019bbbb88abb42af63daa
Doris Ling [Thu, 12 Apr 2018 21:04:10 +0000 (14:04 -0700)]
Use a different string for vpn summary.
- for legacy vpn config, we do not get the vpn name to show in the
preference summary, and we used to simply show "Connected" as the summary
text. However, the string was changed to include the connected device
name as the parameter. Change to use connected summary string that does
not requires any parameter.
Change-Id: Ia6191eb315f5f23e0e6bf8da2a9537c211e8188e
Fixes:
77618408
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 12 Apr 2018 20:43:10 +0000 (20:43 +0000)]
Merge "Notification summary updates" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 18:50:23 +0000 (18:50 +0000)]
Merge changes from topic "anomaly_system_app" into pi-dev
* changes:
Add method to check if app has launcher activity
Add system app check for anomaly detection.
TreeHugger Robot [Thu, 12 Apr 2018 18:23:58 +0000 (18:23 +0000)]
Merge "Implement previously connected device UI" into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 16:24:25 +0000 (12:24 -0400)]
Notification summary updates
- Fix app info summary
- Add configure notifications summary
Test: make -j RunSettingsRoboTests
Change-Id: Ic3c3036ee903fe7403032925a8145693807793d5
Fixes:
77598357
Fixes:
73018368
TreeHugger Robot [Thu, 12 Apr 2018 17:44:04 +0000 (17:44 +0000)]
Merge "Refactor airplane mode preference controller." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 17:38:52 +0000 (17:38 +0000)]
Merge "Uniquely identify Slice intents" into pi-dev
Lei Yu [Thu, 12 Apr 2018 02:53:53 +0000 (19:53 -0700)]
Log app versionCode in anomaly detection
Change-Id: Ie760a4156b14b739279aa398bd1d2b8485449e91
Fixes:
77919142
Test: RunSettingsRoboTests
hughchen [Tue, 3 Apr 2018 08:15:03 +0000 (16:15 +0800)]
Implement previously connected device UI
* Move save device group to "Previously connected devices"
Bug:
74134939
Test: make -j60 RunSettingsRoboTests
Change-Id: Iff7894033df402d42dcc0ccaea6db3106edb7013
Merged-In: Iff7894033df402d42dcc0ccaea6db3106edb7013
Lei Yu [Tue, 10 Apr 2018 21:38:46 +0000 (14:38 -0700)]
Add method to check if app has launcher activity
This method should only used for system apps.
Change-Id: Id4109d8e223933269b8dae3aaa91b8a9186c527c
Fixes:
77477987
Test: RunSettingsRoboTests
TreeHugger Robot [Thu, 12 Apr 2018 10:13:20 +0000 (10:13 +0000)]
Merge "Update the action for early warning tip." into pi-dev
Victor Chang [Thu, 12 Apr 2018 09:36:38 +0000 (09:36 +0000)]
Merge "Shorten the strings in time zone picker menu" into pi-dev
CY Cheng [Mon, 26 Mar 2018 10:38:59 +0000 (18:38 +0800)]
Refactor airplane mode preference controller.
- Convert inheritance from AbstractPreferenceController to
TogglePreferenceController.
- Register AirplaneModePreferenceController in XML.
- Decouple AirplaneModeEnabler with preference, leave the UI be
controled by PreferenceController.
- Add RoboTests test cases for AirplaneModePreferenceController.
Fixes:
67997339
Test: RunSettingsRoboTests
Change-Id: I7398943ed51345e014ee7aa774bfae1ca28632f1
TreeHugger Robot [Thu, 12 Apr 2018 03:22:43 +0000 (03:22 +0000)]
Merge "Update battery settings strings" into pi-dev
Fan Zhang [Wed, 11 Apr 2018 20:59:12 +0000 (13:59 -0700)]
Switch from SI to IEC unit when formatting data usage bytes
- Created a new helper method DataUsageUtils.formatDataUsage() to
format data usage bytes using IEC formatting.
- Switch from Formatter.formatFileSize() to DataUsageUtils.formatDataUsage()
everywhere in datausage package.
Change-Id: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2
Merged-In: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2
Fixes:
76159924
Test: robotests
Lei Yu [Tue, 10 Apr 2018 17:54:33 +0000 (10:54 -0700)]
Add system app check for anomaly detection.
In this CL, don't blame system app in anomaly detection and also
add log for it.
Following CL will update it to also check whether this system app
has launch entry.
Bug:
77477987
Test: RunSettingsRoboTests
Change-Id: I97490b32bc42ec2f8e03ec2d82f7c8bf89f9c66f
Matthew Fritze [Tue, 10 Apr 2018 19:35:09 +0000 (12:35 -0700)]
Uniquely identify Slice intents
PendingIntents were being cached because they had the same
targets and would not differentiate on extras - thus all Slice
intents would go to the same destination as the first intent fired.
Adding the data stops the system from caching the intents.
Change-Id: Ifccab72ed482e22750422c5c36aa6d205c20ae3d
Fixes:
77650727
Test: robotests
Lei Yu [Mon, 9 Apr 2018 21:35:12 +0000 (14:35 -0700)]
Update battery settings strings
1. Change "screenTime" to "lastFullChargeTime" in high usage dialog
2. Update "Background restriction" strings
3. Update footer string
Bug:
73018395
Test: RunSettingsRoboTests
Change-Id: I07c149123c4ee1a69dd81c9a9e6eaa5df69b60b4
TreeHugger Robot [Thu, 12 Apr 2018 00:24:31 +0000 (00:24 +0000)]
Merge "Add ui tests for restrict app tips" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 23:43:54 +0000 (23:43 +0000)]
Merge "Fix landscape pattern enroll crash" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 23:07:40 +0000 (23:07 +0000)]
Merge "Add disabled checkbox preference" into pi-dev
Lei Yu [Wed, 11 Apr 2018 22:10:36 +0000 (15:10 -0700)]
Update the action for early warning tip.
Add action to open the battery saver page when it shows "battery saver
is on".
Change-Id: Ia0536e7ef73271aefbd95e938d6f91f359a116d2
Fixes:
77874407
Test: RunSettingsRoboTests
Mehdi Alizadeh [Thu, 5 Apr 2018 00:28:55 +0000 (17:28 -0700)]
Adds video to swipe up gesture
Bug:
77549883
Test: Manual test
Change-Id: I818a5952864cd1a7b62501bb23ed15b4c9fabd27
TreeHugger Robot [Wed, 11 Apr 2018 22:01:25 +0000 (22:01 +0000)]
Merge "Add more slices to settings" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 21:05:50 +0000 (21:05 +0000)]
Merge "Update mSortOrder when changed to frequent" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 19:37:25 +0000 (19:37 +0000)]
Merge "String changes for suppressing ambient display" into pi-dev
Fan Zhang [Wed, 11 Apr 2018 19:21:20 +0000 (19:21 +0000)]
Merge "Stop logging hotspot password change in logcat." into pi-dev
Mehdi Alizadeh [Wed, 11 Apr 2018 19:07:31 +0000 (19:07 +0000)]
Merge "Adds the Swipe Up settings page under gestures" into pi-dev
Beverly [Tue, 10 Apr 2018 20:29:40 +0000 (16:29 -0400)]
Update mSortOrder when changed to frequent
Update mSortOrder so when the activity is resumed, the
apps are sorted how the user wants
Test: make ROBOTEST_FILTER=ManageApplicationsTest RunSettingsRoboTests
Change-Id: I422846aada29ee254996b2e94da27af7ed935a0b
Fixes:
77691626
TreeHugger Robot [Wed, 11 Apr 2018 18:16:29 +0000 (18:16 +0000)]
Merge "Badge the icon properly in policy transparency dialog" into pi-dev
Jason Monk [Tue, 3 Apr 2018 18:43:25 +0000 (14:43 -0400)]
Add more slices to settings
Test: open settings
Bug:
74555610
Change-Id: I061685342f61a6a43670b7f3378d2a6918bcf495
Mehdi Alizadeh [Wed, 4 Apr 2018 01:51:07 +0000 (18:51 -0700)]
Adds the Swipe Up settings page under gestures
The illusteration video is not included yet.
Merged-In: I7f2b2f3251a795dfd74dbbb442692e42a5a2966e
Bug:
77549883
Test: Unit tests and Manual test
Change-Id: I04f01f0814f16e4e006291e61ddb07cea8e7c0d6
Lei Yu [Wed, 11 Apr 2018 17:38:04 +0000 (10:38 -0700)]
Add ui tests for restrict app tips
Add anomaly data to database then check whether it shows correct
data in settings UI.
We can also use this test to trigger anomalies and test it manually.
Change-Id: Ic4bbe3de1e828415b9b3f1180cbb41c737b43232
Fixes:
77477035
Test: atest SettingsUnitTest
Julia Reynolds [Wed, 11 Apr 2018 13:49:52 +0000 (09:49 -0400)]
Add disabled checkbox preference
A checkbox preference that users can't change, but with non-disabled
test for legibilty.
Test: make -j RunSettingsRoboTests
Bug:
77657376
Change-Id: Iea9bbcc5efbf80cbc380fb8d5a360fe8386889a0
Fan Zhang [Wed, 11 Apr 2018 17:32:16 +0000 (10:32 -0700)]
Stop logging hotspot password change in logcat.
Change-Id: I705ec6413cef8e8435c9020d8b7434f8e641b0d4
Fixes:
77880733
Test: rebuild
TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
Victor Chang [Wed, 11 Apr 2018 16:52:01 +0000 (17:52 +0100)]
Shorten the strings in time zone picker menu
Bug:
77641819
Test: manual
Change-Id: Ie87e83cf0b04f5c4fb8cfb999b2842209dc13e3e
TreeHugger Robot [Wed, 11 Apr 2018 16:00:59 +0000 (16:00 +0000)]
Merge "Do not set separate challenge flag before clearing lock" into pi-dev
Tony Mak [Wed, 11 Apr 2018 11:40:08 +0000 (12:40 +0100)]
Badge the icon properly in policy transparency dialog
Following the pattern used within the Settings app to badge the icon.
For location setting, the dialog is shown in work profile user.
Thus ai.loadIcon badged the icon for the first time and
getUserBadgedIcon baged the second time.
Fixes:
77844928
Test: adb shell wm density 560 -> suspend an app -> launch the app ->
observe the dialog. Repeat the test with original density.
Change-Id: Ie79c3d9aa7b1a155edc74816850b1349fbd2d606
Julia Reynolds [Wed, 11 Apr 2018 13:27:30 +0000 (09:27 -0400)]
String changes for suppressing ambient display
Test: make
Bug:
77657376
Change-Id: I7c2795291a82a885a26a0af598bdafb96842d998
TreeHugger Robot [Wed, 11 Apr 2018 13:17:26 +0000 (13:17 +0000)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
Rubin Xu [Wed, 11 Apr 2018 10:43:18 +0000 (11:43 +0100)]
Do not set separate challenge flag before clearing lock
This step is redundant since clearLock() would set the flag internally anyway.
In fact setting the flag before calling clearLock() is wrong since it will
lead LockSettingsService.setLockCredential() to think that the target profile
does not have a unified challenge, causing it to use an incorrect existing
credential for password change, leading to untrusted credential change.
Bug:
77892111
Test: Create profile; set separate empty work challenge; observe no crash
Change-Id: I4d76b20706a796654f9389f31ae8c46d51d7adac
TreeHugger Robot [Wed, 11 Apr 2018 03:11:06 +0000 (03:11 +0000)]
Merge "[Settings] Align volume slider with other preference" into pi-dev
Maurice Lam [Wed, 11 Apr 2018 02:53:41 +0000 (19:53 -0700)]
Fix landscape pattern enroll crash
Test: atest SetupChooseLockPatternTest.java
Bug:
77878150
Change-Id: Ie54286765ea0d766bcc9e2c8e56cfbda919d5fd7
TreeHugger Robot [Wed, 11 Apr 2018 01:28:33 +0000 (01:28 +0000)]
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:24:08 +0000 (01:24 +0000)]
Merge "Change string" into pi-dev
Bookatz [Wed, 11 Apr 2018 00:40:42 +0000 (17:40 -0700)]
Fuelgauge handle StatsManager Exception API
StatsManager now returns Exceptions for certain errors, instead of
returning a boolean. Thus Fuelgauge needs to be updated.
Bug:
77648233
Test: make ROBOTEST_FILTER=AnomalyConfigJobServiceTest RunSettingsRoboTests
Change-Id: I7160ac01141c673c90e33423220dc888a2710340
TreeHugger Robot [Tue, 10 Apr 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Prevent ringing updates" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:49:18 +0000 (22:49 +0000)]
Merge "Protect against invalid authority in account sync pref." into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:16:35 +0000 (22:16 +0000)]
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:00:34 +0000 (22:00 +0000)]
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
Julia Reynolds [Tue, 10 Apr 2018 15:04:23 +0000 (11:04 -0400)]
Prevent ringing updates
- Add video
- Update text
- Link from Sound settings
- Inherit from BasePreferenceController
Test: make -j RunSettingsRoboTests
Change-Id: If8cd9efd4e6034e6f6864a142a86cbc23bf59dc3
Fixes:
76832936
Fixes:
74410634
Fan Zhang [Tue, 10 Apr 2018 20:08:22 +0000 (13:08 -0700)]
Convert auto-brightness switch to a full screen UI.
Change-Id: Id5e5ec959201102a7c60372a441dc6813ceedbae
Merged-In: Id5e5ec959201102a7c60372a441dc6813ceedbae
Fixes:
69795935
Test: Existing conformance tests still pass (CodeInspectionTest,
UniquePreferenceTest, manual search test)
Lei Yu [Tue, 10 Apr 2018 20:44:11 +0000 (20:44 +0000)]
Merge "Add test flags for battery tips." into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:31:03 +0000 (19:31 +0000)]
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
Beverly [Tue, 10 Apr 2018 19:28:17 +0000 (15:28 -0400)]
Set parent for auto zen rules to be zen rule page
Clicking the back button on an automatic zen rule
will now go back to the automatic rule page instead
of the generic Settings page
Change-Id: I5902e01b641ec3e4d0c8b4b4a5b16a0385cbd0ff
Fixes:
77833624
Test: manual
TreeHugger Robot [Tue, 10 Apr 2018 18:30:26 +0000 (18:30 +0000)]
Merge "Hide preference when no app restricted" into pi-dev
Daniel Solomon [Tue, 10 Apr 2018 17:59:26 +0000 (17:59 +0000)]
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
Lei Yu [Tue, 10 Apr 2018 17:39:08 +0000 (17:39 +0000)]
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
Jason Monk [Tue, 10 Apr 2018 17:10:29 +0000 (17:10 +0000)]
Merge "Update slice constant reference" into pi-dev
Jason Monk [Tue, 10 Apr 2018 13:04:53 +0000 (09:04 -0400)]
Update slice constant reference
Test: build
Bug:
73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe
TreeHugger Robot [Tue, 10 Apr 2018 14:35:44 +0000 (14:35 +0000)]
Merge "Add zen onboarding screen" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 13:51:22 +0000 (13:51 +0000)]
Merge "Notification settings updates" into pi-dev
Julia Reynolds [Mon, 9 Apr 2018 19:24:55 +0000 (15:24 -0400)]
Add zen onboarding screen
Bug:
77658931
Test: make -j RunSettingsRoboTests
Change-Id: Ifc886148ed742d72b5606a9ce7eb19d0da234c9e
hughchen [Tue, 10 Apr 2018 09:10:45 +0000 (17:10 +0800)]
Change string
* Change "Available media devices" to "Available devices"
Bug:
77607383
Test: build
Change-Id: I49cb6c3269eb3847a92403184e2691f7334df96e
timhypeng [Sun, 8 Apr 2018 05:53:46 +0000 (13:53 +0800)]
Rename onProfileAudioStateChanged() to onAudioModeChanged()
Bug:
74134939
Test: Build
Change-Id: I85895238b6ee16fec85d0cf3dd0242c9ba17a3bd
TreeHugger Robot [Tue, 10 Apr 2018 04:24:16 +0000 (04:24 +0000)]
Merge "Add new string for audio switcher" into pi-dev
Daniel Solomon [Mon, 9 Apr 2018 22:09:13 +0000 (15:09 -0700)]
Hide color mode preference depending on Accessibility settings
Currently, when certain Accessibility color transforms are enabled, the
color mode preference radio buttons are disabled. To avoid confusing
users, hide the color mode preference entirely. If the color mode
settings screen is already open when the Accessibility transforms are
enabled, return the user back to the previous screen.
Bug:
77695840
Test: make ROBOTEST_FILTER=ColorModePreferenceFragmentTest
RunSettingsRoboTests -j40
Change-Id: I44812713bdc739b843e5806711d25ea950aa6250
Doris Ling [Tue, 10 Apr 2018 01:03:20 +0000 (18:03 -0700)]
Fix robotest failure for ChartDataUsagePreferenceTest.
- the chart usage data is computed using difference between current time
and the timestamp from the usage data. In the test, we are using actual
current time and mock usage data. As the current time varies the test
computating sometimes results in some negative data, and makes the
comparison unpredictable. Change to use a fix "current" time in the test
so that the time difference in computation will be constant.
Fixes:
77824818
Test: make RunSettingsRoboTests
Change-Id: I2d8c166839775469d30015317afdc04eb3d9a2b4
Matthew Fritze [Fri, 6 Apr 2018 17:20:05 +0000 (10:20 -0700)]
Unavailable Slices includes DISABLED_DEPENDENT settings
In the change to mark disabled_dependent as available,
it did not change the check in SliceBuilderUtils for the
unavailable Slices. In the case of DISABLED_DEPENDENT, the
setting is available but the Slice is not.
Though it is a simple change, we can now properly test the contents
of Slices, so this change includes tests which should have been in
place earlier and would have caught this bug - duh.
Bug:
71640747
Test: Robotests
Change-Id: I8db5bc80edb337cbf907ce3669aa2bfd9c72f74a
Jeff Sharkey [Mon, 9 Apr 2018 23:58:34 +0000 (23:58 +0000)]
Merge "Update storage wizard to latest UX mocks." into pi-dev
Salvador Martinez [Mon, 9 Apr 2018 23:30:35 +0000 (23:30 +0000)]
Merge "Make it possible to have open tether network" into pi-dev
Salvador Martinez [Mon, 9 Apr 2018 22:27:02 +0000 (15:27 -0700)]
Remove provisioning dialog from wifi-tethering
We no longer want this dialog to show when a user toggles tethering.
Failures to set up the AP will still be handled correctly.
Test: robotests pass
Bug:
62629055
Change-Id: Id3d0bf9694a1c8b6ae353bfd6634dd0b56813497
Lei Yu [Mon, 9 Apr 2018 17:10:15 +0000 (10:10 -0700)]
Update field for ACTION_ANOMALY_TRIGGERED
Use new field FIELD_ANOMALY_TYPE
Bug:
75976625
Test: RunSettingsRoboTests
Change-Id: Ifb67c687d25e1e35afaadb05f2e9883e8dcf8049
Julia Reynolds [Fri, 30 Mar 2018 18:04:55 +0000 (14:04 -0400)]
Notification settings updates
- smaller icons
- text update
- fx header
- fix category header
Test: make -j RunSettingsRoboTests
Change-Id: If822d6db31a8dccf20ee88182cda1aee34aa7675
Fixes:
77325154
Fixes:
77323406
Fixes:
77324677
Fixes:
74408368
Christine Franks [Mon, 9 Apr 2018 21:18:28 +0000 (21:18 +0000)]
Merge "Remove Automatic color mode option" into pi-dev
Hansong Zhang [Mon, 9 Apr 2018 21:10:21 +0000 (14:10 -0700)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev am:
d59b0eddae am:
3f2dbb7cc9
am:
e934ea80a6
Change-Id: I17aa86fa2a02f1a80e9ec8aaa557c3488dd32c21
Hansong Zhang [Mon, 9 Apr 2018 21:08:48 +0000 (14:08 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1 am:
41be25548e skipped:
74ff24d1c6 am:
c4127072f4 am:
1b7566cd07
am:
af077f8d4c -s ours
Change-Id: I834e60da9920199756dce2206042e4a1ba0c20b9
Hansong Zhang [Mon, 9 Apr 2018 20:54:58 +0000 (13:54 -0700)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev am:
d59b0eddae
am:
3f2dbb7cc9
Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f
Hansong Zhang [Mon, 9 Apr 2018 20:53:41 +0000 (13:53 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1 am:
41be25548e skipped:
74ff24d1c6 am:
c4127072f4
am:
1b7566cd07
Change-Id: I10c2d233f05ddf566ac38afb7c2cdc5a8e61df25
Hansong Zhang [Mon, 9 Apr 2018 20:44:07 +0000 (13:44 -0700)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev
am:
d59b0eddae
Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd
Hansong Zhang [Mon, 9 Apr 2018 20:43:04 +0000 (13:43 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1 am:
41be25548e skipped:
74ff24d1c6
am:
c4127072f4
Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2