Antoan Angelov
7e866d903e
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev am: 84a4dd0bde
...
am: 3f0b96cd18
2018-03-23 14:26:03 +00:00
Antoan Angelov
3f0b96cd18
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
...
am: 84a4dd0bde
2018-03-23 14:19:30 +00:00
Antoan Angelov
84a4dd0bde
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
2018-03-23 14:10:29 +00:00
Julia Reynolds
9865aaa3fc
Merge "Add manage notifications screen" into pi-dev am: 2c1de66c58
...
am: e76a12526b
2018-03-23 05:21:05 +00:00
Christine Franks
614485a700
Merge "Allow developer options in retail mode" into pi-dev am: 265981f394
...
am: b9dc49a612
2018-03-23 04:23:54 +00:00
Julia Reynolds
e76a12526b
Merge "Add manage notifications screen" into pi-dev
...
am: 2c1de66c58
2018-03-23 03:37:57 +00:00
Jyun LuoLai
4ab36ffef1
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev am: 644c707590
...
am: 76b91184db
2018-03-23 03:03:38 +00:00
Christine Franks
b9dc49a612
Merge "Allow developer options in retail mode" into pi-dev
...
am: 265981f394
2018-03-23 02:54:47 +00:00
Jyun LuoLai
76b91184db
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
...
am: 644c707590
2018-03-23 02:44:38 +00:00
TreeHugger Robot
2c1de66c58
Merge "Add manage notifications screen" into pi-dev
2018-03-23 02:06:38 +00:00
Matthew Fritze
e1194dfaa6
Merge "Add Slider template for Slices" into pi-dev am: 2f137b4bac
...
am: 4cd1d84f7e
2018-03-23 01:48:21 +00:00
Christine Franks
265981f394
Merge "Allow developer options in retail mode" into pi-dev
2018-03-23 01:11:23 +00:00
Julia Reynolds
58edda1230
Merge "Add a setting for the volume hush gesture" into pi-dev am: 395345c0ad
...
am: a7af991f37
2018-03-23 01:09:14 +00:00
Lei Yu
1ec3d85dda
Merge "Update the toggle state in constructor." into pi-dev am: 5cafb0b553
...
am: b6b1ee9abb
2018-03-23 01:08:15 +00:00
Fan Zhang
da8e3cddaa
Merge "Misc string updates" into pi-dev am: 4aa9d5d2b4
...
am: 015c57a38e
2018-03-23 01:07:28 +00:00
Jyun LuoLai
644c707590
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
2018-03-23 00:56:00 +00:00
Matthew Fritze
4cd1d84f7e
Merge "Add Slider template for Slices" into pi-dev
...
am: 2f137b4bac
2018-03-23 00:42:27 +00:00
Julia Reynolds
a7af991f37
Merge "Add a setting for the volume hush gesture" into pi-dev
...
am: 395345c0ad
2018-03-23 00:01:07 +00:00
Lei Yu
b6b1ee9abb
Merge "Update the toggle state in constructor." into pi-dev
...
am: 5cafb0b553
2018-03-23 00:00:04 +00:00
Fan Zhang
015c57a38e
Merge "Misc string updates" into pi-dev
...
am: 4aa9d5d2b4
2018-03-22 23:59:09 +00:00
Julia Reynolds
ff9500d0f9
Add manage notifications screen
...
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: I1c872c976677ee38f7d9d9523d18fc8ca03fa547
Add manage notifications screen
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: Ia3626e9f69e8b91b1a2bba9ef549c775972e749a
2018-03-22 19:57:09 -04:00
Sean Callanan
4b2d7a3780
Merge "[Settings] Add strings for Natural and Automatic color modes"
2018-03-22 23:53:11 +00:00
Maurice Lam
fd3d72e48f
Merge "Make GLIF theme default for confirm lock screen" into pi-dev am: a82183849d
...
am: 731b049e32
2018-03-22 23:11:11 +00:00
TreeHugger Robot
2f137b4bac
Merge "Add Slider template for Slices" into pi-dev
2018-03-22 22:08:54 +00:00
Julia Reynolds
395345c0ad
Merge "Add a setting for the volume hush gesture" into pi-dev
2018-03-22 22:03:48 +00:00
TreeHugger Robot
5cafb0b553
Merge "Update the toggle state in constructor." into pi-dev
2018-03-22 21:43:52 +00:00
TreeHugger Robot
4aa9d5d2b4
Merge "Misc string updates" into pi-dev
2018-03-22 21:33:54 +00:00
Maurice Lam
731b049e32
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
...
am: a82183849d
2018-03-22 21:29:20 +00:00
Maurice Lam
a82183849d
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
2018-03-22 21:04:17 +00:00
Sean Callanan
e8f9bf5f68
[Settings] Add strings for Natural and Automatic color modes
...
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
2018-03-22 13:05:32 -07:00
arangelov
16a945aca4
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev am: edfdeebfe4
...
am: b23bf13e72
2018-03-22 19:53:01 +00:00
Fan Zhang
c1a0cb2aec
Misc string updates
...
Bug: 76022431
Fixes: 17822183
Test: visual
Change-Id: I952e04ca8f5d45612f0088729c2691c60cf3afab
2018-03-22 12:45:58 -07:00
Lei Yu
7c734ec32e
Merge "Add log for AnomalyDetectionJobService" into pi-dev am: b4b2a6260a
...
am: 3f25e3e004
2018-03-22 19:43:13 +00:00
arangelov
b23bf13e72
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev
...
am: edfdeebfe4
2018-03-22 19:17:15 +00:00
Lei Yu
3f25e3e004
Merge "Add log for AnomalyDetectionJobService" into pi-dev
...
am: b4b2a6260a
2018-03-22 19:13:54 +00:00
Matthew Fritze
ad6678f9fc
Add Slider template for Slices
...
Add the Seekbar preference equivalent
to the TwoStatePreference (toggle) preference
controller abstract controller.
Change-Id: I6ff91f2f72a7f72c18ddbc27b2b1fda4b6ce6ca9
Fixes: 67996707
Test: Robotests
2018-03-22 11:46:47 -07:00
TreeHugger Robot
edfdeebfe4
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev
2018-03-22 18:38:30 +00:00
Lei Yu
592faf364d
Update the toggle state in constructor.
...
Before this cl, the update of toggle depends on BroadcastReceiver.
However it is not called when toggle is inited, which make the toggle in
broken state sometimes.
This cl make it execute the update method in constructor, so toggle can
get the correct state when it is created.
Fixes: 73718975
Test: RunSettingsRoboTests
Change-Id: Icb798afaff0bdeedad3a966315441712be2e2523
2018-03-22 11:18:43 -07:00
Lei Yu
b4b2a6260a
Merge "Add log for AnomalyDetectionJobService" into pi-dev
2018-03-22 17:53:17 +00:00
arangelov
737d469b78
Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen.
...
Bug: 75322399
Test: Manually pressed the button and verified the Settings app does not crash.
Change-Id: Ibd2b985ed898ccaa4e78c0ecf5dc667af6bc8cba
2018-03-22 16:18:49 +00:00
Søren Gjesse
6734daaa66
Merge "Revert "Revert "Disable R8 for Settings"""
2018-03-22 09:28:11 +00:00
Søren Gjesse
6f21dfa213
Revert "Revert "Disable R8 for Settings""
...
This reverts commit f38d78bf09https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/3769994 lands.
Exempt-From-Owner-Approval: ccross@ made the requested change
Change-Id: I81dcb8c23974d3f3a8c11c39140d17266b4ae18a
2018-03-22 09:27:57 +00:00
Fan Zhang
4a4afa1de7
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev am: f88dcfadbb
...
am: 60790e883c
2018-03-22 07:36:08 +00:00
Antony Sargent
458053b543
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev am: baea1c87f5
...
am: a3e36f8e50
2018-03-22 07:30:31 +00:00
Fan Zhang
60790e883c
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev
...
am: f88dcfadbb
2018-03-22 07:29:16 +00:00
TreeHugger Robot
f88dcfadbb
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev
2018-03-22 07:24:23 +00:00
Antony Sargent
a3e36f8e50
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev
...
am: baea1c87f5
2018-03-22 07:22:44 +00:00
TreeHugger Robot
baea1c87f5
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev
2018-03-22 07:17:17 +00:00
Doris Ling
175d61a01e
Merge "Fix crash when pausing DndCondition." into pi-dev am: e119601136
...
am: d8b61c21a0
2018-03-22 05:39:07 +00:00
anitalin
8debb12ed0
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev am: 721c58deb4
...
am: a396fdb580
2018-03-22 05:34:31 +00:00
