hughchen
a05d1fc769
Implement previously connected device UI
...
* For fix the conflicts in pi-dev, cherry pick the commit 86d3e58c8d in
master and merge the conflict.
* Add @SearchIndexable in
PreviouslyConnectedDeviceDashboardFragment.java
* Move save device group to "Previously connected devices" preference
Bug: 74134939
Test: make -j60 RunSettingsRoboTests
Change-Id: Iff7894033df402d42dcc0ccaea6db3106edb7013
Merged-In: Iff7894033df402d42dcc0ccaea6db3106edb7013
2018-04-12 09:57:08 +08:00
Fan Zhang
2bc5851953
[automerger skipped] Merge "Convert auto-brightness switch to a full screen UI." into pi-dev am: 16594545ff
...
am: 4837cd8bdd
2018-04-10 18:52:23 -07:00
hughchen
9725b80e54
Merge "Change string" into pi-dev am: 30d3c49329
...
am: 01ebb7ba47
2018-04-10 18:51:39 -07:00
Fan Zhang
4837cd8bdd
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
...
am: 16594545ff
2018-04-10 18:41:36 -07:00
hughchen
01ebb7ba47
Merge "Change string" into pi-dev
...
am: 30d3c49329
2018-04-10 18:40:46 -07:00
TreeHugger Robot
16594545ff
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
2018-04-11 01:28:33 +00:00
TreeHugger Robot
30d3c49329
Merge "Change string" into pi-dev
2018-04-11 01:24:08 +00:00
TreeHugger Robot
d628116e2f
Merge "Convert auto-brightness switch to a full screen UI."
2018-04-10 23:49:23 +00:00
Julia Reynolds
a660cf1176
Merge "Prevent ringing updates" into pi-dev am: dbffb1812d
...
am: 8176af9610
2018-04-10 16:15:11 -07:00
Fan Zhang
3b3e951b6f
Merge "Protect against invalid authority in account sync pref." into pi-dev am: 2c15909bfc
...
am: 2e49b6fdac
2018-04-10 16:13:33 -07:00
Julia Reynolds
8176af9610
Merge "Prevent ringing updates" into pi-dev
...
am: dbffb1812d
2018-04-10 16:00:22 -07:00
Fan Zhang
2e49b6fdac
Merge "Protect against invalid authority in account sync pref." into pi-dev
...
am: 2c15909bfc
2018-04-10 15:59:23 -07:00
TreeHugger Robot
dbffb1812d
Merge "Prevent ringing updates" into pi-dev
2018-04-10 22:52:10 +00:00
TreeHugger Robot
2c15909bfc
Merge "Protect against invalid authority in account sync pref." into pi-dev
2018-04-10 22:49:18 +00:00
Salvador Martinez
5a4e5cbef4
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev am: 4eeb88ab8a
...
am: 0b889da802
2018-04-10 15:30:08 -07:00
Beverly
060283f2de
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev am: 45fe0bb6a0
...
am: 752824221d
2018-04-10 15:29:15 -07:00
Patrick Baumann
c32f896d65
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev am: 0c532181ab
...
am: f575445171
2018-04-10 15:27:47 -07:00
Salvador Martinez
0b889da802
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
...
am: 4eeb88ab8a
2018-04-10 15:22:13 -07:00
Beverly
752824221d
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
...
am: 45fe0bb6a0
2018-04-10 15:18:51 -07:00
Patrick Baumann
f575445171
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
...
am: 0c532181ab
2018-04-10 15:17:41 -07:00
TreeHugger Robot
4eeb88ab8a
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
2018-04-10 22:16:35 +00:00
TreeHugger Robot
45fe0bb6a0
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
2018-04-10 22:09:34 +00:00
TreeHugger Robot
0c532181ab
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
2018-04-10 22:00:34 +00:00
Julia Reynolds
584aba1f2b
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
2018-04-10 17:32:06 -04:00
Fan Zhang
89f668ce29
Convert auto-brightness switch to a full screen UI.
...
Change-Id: Id5e5ec959201102a7c60372a441dc6813ceedbae
Bug: 69795935
Test: Existing conformance tests still pass (CodeInspectionTest,
UniquePreferenceTest, manual search test)
2018-04-10 21:25:09 +00:00
Fan Zhang
3dfcb3b326
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)
2018-04-10 14:21:00 -07:00
Lei Yu
6afd882210
Merge "Add test flags for battery tips." into pi-dev am: 93ff833316
...
am: de4199e3db
2018-04-10 14:13:33 -07:00
Lei Yu
de4199e3db
Merge "Add test flags for battery tips." into pi-dev
...
am: 93ff833316
2018-04-10 14:02:10 -07:00
Lei Yu
93ff833316
Merge "Add test flags for battery tips." into pi-dev
2018-04-10 20:44:11 +00:00
TreeHugger Robot
0104c4c6a7
Merge "Stack fingerprint buttons on small screens"
2018-04-10 20:13:29 +00:00
Matthew Fritze
a1df08c426
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev am: 3ec0e4851c
...
am: ea52f72840
2018-04-10 13:03:49 -07:00
Matthew Fritze
ea52f72840
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
...
am: 3ec0e4851c
2018-04-10 12:38:28 -07:00
TreeHugger Robot
3ec0e4851c
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
2018-04-10 19:31:03 +00:00
Beverly
7b09d2cebb
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
2018-04-10 15:28:17 -04:00
Lei Yu
1af677903a
Merge "Hide preference when no app restricted" into pi-dev am: 1f02712e7a
...
am: 1b82df6906
2018-04-10 12:13:43 -07:00
Lei Yu
1b82df6906
Merge "Hide preference when no app restricted" into pi-dev
...
am: 1f02712e7a
2018-04-10 12:03:56 -07:00
Maurice Lam
c11abbcd65
Stack fingerprint buttons on small screens
...
Test: Manual
Bug: 77827590
Change-Id: Icfe34d3740af2566be019c329b96b12033d33959
2018-04-10 18:56:28 +00:00
TreeHugger Robot
1f02712e7a
Merge "Hide preference when no app restricted" into pi-dev
2018-04-10 18:30:26 +00:00
Daniel Solomon
f414f5ab2d
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev am: e96b57a5fb
...
am: c767f493d8
2018-04-10 11:27:58 -07:00
Lei Yu
67956894e7
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev am: fa447e698d
...
am: 44f6508070
2018-04-10 11:24:10 -07:00
Daniel Solomon
c767f493d8
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
...
am: e96b57a5fb
2018-04-10 11:02:04 -07:00
Lei Yu
44f6508070
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
...
am: fa447e698d
2018-04-10 10:59:59 -07:00
Daniel Solomon
e96b57a5fb
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
2018-04-10 17:59:26 +00:00
Jason Monk
e802f713bb
Merge "Update slice constant reference" into pi-dev am: 5a974c6335
...
am: fd1be7d153
2018-04-10 10:39:28 -07:00
Lei Yu
fa447e698d
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
2018-04-10 17:39:08 +00:00
Jason Monk
fd1be7d153
Merge "Update slice constant reference" into pi-dev
...
am: 5a974c6335
2018-04-10 10:21:21 -07:00
Jason Monk
5a974c6335
Merge "Update slice constant reference" into pi-dev
2018-04-10 17:10:29 +00:00
Julia Reynolds
84dc27b829
Merge "Add zen onboarding screen" into pi-dev am: 34a593db65
...
am: a87381e9a8
2018-04-10 08:00:17 -07:00
Jason Monk
9b555bf515
Update slice constant reference
...
Test: build
Bug: 73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe
2018-04-10 10:56:32 -04:00
Julia Reynolds
a87381e9a8
Merge "Add zen onboarding screen" into pi-dev
...
am: 34a593db65
2018-04-10 07:50:30 -07:00
