Maurice Lam
2f4745d402
Merge "Separate skip and clear button in pattern screen" into pi-dev am: 59b25d0043
...
am: f95ec59cbf
Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87
2018-03-24 07:58:42 +00:00
Lei Yu
3f49c24d3f
Merge "Add callback when tethering fails" into pi-dev am: 1682085feb
...
am: 7fcde4490c
Change-Id: Ie1e512ffa61b138769b25bf0c54bc459940f91fc
2018-03-24 07:56:32 +00:00
Fan Zhang
d157f7c846
Merge "Add preference controller to launch app-time-spent UI." into pi-dev am: 30da391fa0
...
am: 490eaa1c8c
Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
2018-03-24 07:54:54 +00:00
TreeHugger Robot
362ba01789
Merge "Return back-up slices for unavailable settings" into pi-dev
2018-03-24 07:04:47 +00:00
TreeHugger Robot
59b25d0043
Merge "Separate skip and clear button in pattern screen" into pi-dev
2018-03-24 05:46:35 +00:00
TreeHugger Robot
1682085feb
Merge "Add callback when tethering fails" into pi-dev
2018-03-24 05:24:09 +00:00
TreeHugger Robot
30da391fa0
Merge "Add preference controller to launch app-time-spent UI." into pi-dev
2018-03-24 05:14:32 +00:00
Fan Zhang
64a8f70a7f
Add preference controller to launch app-time-spent UI.
...
Bug: 74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833
2018-03-23 14:13:57 -07:00
Lei Yu
18994382d5
Merge "Hide password for wifi tether" into pi-dev am: 9bb2efa0ff
...
am: 1684f605f7
Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4
2018-03-23 20:10:15 +00:00
Sean Callanan
504cc266d8
[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
(cherry picked from commit e8f9bf5f68
)
2018-03-23 20:06:25 +00:00
Fan Zhang
2e1d9e802a
Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
...
am: 7e75de29b1
Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
2018-03-23 20:03:54 +00:00
Neil Fuller
8f5a7f2001
Merge "Show time zone used in or after 2018 only" into pi-dev am: cbaa984cde
...
am: 790a55fc97
Change-Id: Ibc62444b70c819f613df9e5c947cb6ec703af065
2018-03-23 19:48:40 +00:00
Matthew Fritze
fcdfc2d83f
Return back-up slices for unavailable settings
...
When an inline slice is requested, and the setting is unavailable,
we should present more useful information to the user. This CL handles:
- Unsupported: return intent slice to Settings home page
- Disabled for user: intent to the setting page
- Unknown reason: intent to setting page
- Disabled dependency: Create intent-based Slice rather
than the requested inline slice.
Bug: 71640747
Test: robotests
Change-Id: I9c1a0ee36119d4f9f3b205e0824c251f4356db55
2018-03-23 12:47:36 -07:00
TreeHugger Robot
9bb2efa0ff
Merge "Hide password for wifi tether" into pi-dev
2018-03-23 17:37:23 +00:00
TreeHugger Robot
dd5977901d
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
* changes:
Get rid of UserPackageWrapper util.
Get rid of extra whitespace under divider lines
2018-03-23 17:36:54 +00:00
Neil Fuller
cbaa984cde
Merge "Show time zone used in or after 2018 only" into pi-dev
2018-03-23 17:18:36 +00:00
Jason Monk
fb9b6077c4
Merge "Add option for settings to push to a device index" into pi-dev am: f9c6bc59ae
...
am: 5411c21dde
Change-Id: I48ecc5d6e892a8662d5f0ad019579d6d2396c18a
2018-03-23 17:08:10 +00:00
Jason Monk
f9c6bc59ae
Merge "Add option for settings to push to a device index" into pi-dev
2018-03-23 16:52:24 +00:00
Antoan Angelov
7e866d903e
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev am: 84a4dd0bde
...
am: 3f0b96cd18
Change-Id: I817a4aef7e1fbad8a6bccc9a455b32dabc13d96c
2018-03-23 14:26:03 +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
Jason Monk
f6edc7c80a
Add option for settings to push to a device index
...
The index implementation is optional and left up to the OEM.
Test: Open settings, see content in index
Test: robo tests
Bug: 68378569
Bug: 76102600
Change-Id: Idb8bb1e0cabbbe92e7a852e2eadbdcd8c2ab7d56
2018-03-23 09:36:57 -04:00
Victor Chang
490e46e01b
Show time zone used in or after 2018 only
...
- Year 2018 is picked as the new time zone data
for picker is introduced in 2018. I can be adjusted
in the future to show more merged time zones.
- Add test to ensure each region has at least
one time zone.
- Fix a issue not using a singleton of TimeZoneData
in commit 6c33caad4b
Bug: 72142943
Test: atest SettingsUnitTests:TimeZoneDataTest
Change-Id: I5eba7fbd59a2d3fd2e8062c9615946dc4bbb6314
2018-03-23 08:23:51 +00:00
Julia Reynolds
9865aaa3fc
Merge "Add manage notifications screen" into pi-dev am: 2c1de66c58
...
am: e76a12526b
Change-Id: I5866617ba35dc9f0ecc4f2ea237eae5f2a9576ae
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
Change-Id: Ibedd48f978cce4d2579dbe5c935b4d2d61b1c2f4
2018-03-23 04:23:54 +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
Change-Id: Iabe87f54ff76572fb7881985f4802b0b09011440
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
Change-Id: Idb486a1f3216e13624020b047954e4e899034a50
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
Change-Id: I669128fc84f26a19b4857c1833b9030d89773f95
2018-03-23 01:08:15 +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
Change-Id: Iaa2a51e585097b81a6f379f97fa5bfef84be4e62
2018-03-22 23:11:11 +00:00
Fan Zhang
5f9a348f7e
Get rid of UserPackageWrapper util.
...
Robolectric can support framework private classes now, so there is no
need to use wrappers.
Bug: 76167422
Test: robotests
Change-Id: I034a9f0a9856348bff491f2e9b2b1f7d682ab942
2018-03-22 15:28:46 -07: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
Maurice Lam
a82183849d
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
2018-03-22 21:04:17 +00:00
Lei Yu
0544fbd507
Add callback when tethering fails
...
Add real callback instead of using NoOpCallback. When it fails,
reset the switchbar.
Change-Id: I6f87d7cefa67ff8f9f59a815fd976940fb61c06c
Fixes: 72904303
Test: RunSettingsRoboTests
2018-03-22 13:07:59 -07: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
Lei Yu
7c734ec32e
Merge "Add log for AnomalyDetectionJobService" into pi-dev am: b4b2a6260a
...
am: 3f25e3e004
Change-Id: I14146fc91f84241c72256e5e8200627a6d4facb5
2018-03-22 19:43:13 +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
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
Benjamin Franz
00cc027534
Do not allow force stopping protected packages
...
Bug: 75997475
Test: make RunSettingsRoboTests
Test: manual
Change-Id: I0670f6f0afbc603d8ac61711cfefec2b1fc4b43b
2018-03-22 11:16:07 +00:00
Fan Zhang
4a4afa1de7
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev am: f88dcfadbb
...
am: 60790e883c
Change-Id: I96b028d028a213f882558ad766b2b0cd1a994d8f
2018-03-22 07:36:08 +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
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
Change-Id: I7743c5d984e76c4223e88899311e60565c8ebb83
2018-03-22 05:39:07 +00:00
TreeHugger Robot
e119601136
Merge "Fix crash when pausing DndCondition." into pi-dev
2018-03-22 05:06:15 +00:00
Lei Yu
2eb69b56ed
Merge "Only show restricted apps that belong to the user." into pi-dev am: 5464549257
...
am: ad1549b54d
Change-Id: I34c2fc249d821521c6ce9333e9b9815a51c373cd
2018-03-22 04:42:34 +00:00