hughchen
5694e855b5
[automerger skipped] Merge "Implement previously connected device UI" into pi-dev am: 3e644756c3
...
am: 67110f471e
2018-04-12 13:53:25 -07:00
CY Cheng
f7e01e1294
Merge "Refactor airplane mode preference controller." into pi-dev am: 0375bbc709
...
am: 3d3e2609bc
2018-04-12 13:40:34 -07:00
hughchen
67110f471e
Merge "Implement previously connected device UI" into pi-dev
...
am: 3e644756c3
2018-04-12 13:40:02 -07:00
Matthew Fritze
bcb5bdf06c
Merge "Uniquely identify Slice intents" into pi-dev am: 45b6a9498c
...
am: 2fbb71614c
2018-04-12 13:31:55 -07:00
CY Cheng
3d3e2609bc
Merge "Refactor airplane mode preference controller." into pi-dev
...
am: 0375bbc709
2018-04-12 12:09:34 -07:00
TreeHugger Robot
3e644756c3
Merge "Implement previously connected device UI" into pi-dev
2018-04-12 18:23:58 +00:00
Matthew Fritze
2fbb71614c
Merge "Uniquely identify Slice intents" into pi-dev
...
am: 45b6a9498c
2018-04-12 10:55:15 -07:00
TreeHugger Robot
0375bbc709
Merge "Refactor airplane mode preference controller." into pi-dev
2018-04-12 17:44:04 +00:00
TreeHugger Robot
45b6a9498c
Merge "Uniquely identify Slice intents" into pi-dev
2018-04-12 17:38:52 +00:00
hughchen
aa31bd43a3
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
2018-04-12 17:10:40 +00:00
TreeHugger Robot
f57f6aa9c7
Merge "Implement previously connected device UI"
2018-04-12 17:00:25 +00:00
Jason Chang
a29ed7ef71
Merge "[SettingsLib] Update Utils APIs usage"
2018-04-12 12:44:04 +00:00
Lei Yu
a28b67ad81
Merge "Update the action for early warning tip." into pi-dev am: e6750d6c2d
...
am: ecf2de4624
2018-04-12 03:28:22 -07:00
Lei Yu
ecf2de4624
Merge "Update the action for early warning tip." into pi-dev
...
am: e6750d6c2d
2018-04-12 03:18:30 -07:00
TreeHugger Robot
e6750d6c2d
Merge "Update the action for early warning tip." into pi-dev
2018-04-12 10:13:20 +00:00
Victor Chang
11d3c3a3de
Merge "Shorten the strings in time zone picker menu" into pi-dev am: ee0679bb35
...
am: 1ad2205407
2018-04-12 02:51:36 -07:00
Victor Chang
1ad2205407
Merge "Shorten the strings in time zone picker menu" into pi-dev
...
am: ee0679bb35
2018-04-12 02:46:59 -07:00
Victor Chang
ee0679bb35
Merge "Shorten the strings in time zone picker menu" into pi-dev
2018-04-12 09:36:38 +00:00
CY Cheng
fee4807dc0
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
2018-04-12 14:10:35 +08:00
Lei Yu
2aa48e18f1
Merge "Update battery settings strings" into pi-dev am: 17a463130e
...
am: 118f29591a
2018-04-11 20:38:23 -07:00
Lei Yu
118f29591a
Merge "Update battery settings strings" into pi-dev
...
am: 17a463130e
2018-04-11 20:33:21 -07:00
TreeHugger Robot
17a463130e
Merge "Update battery settings strings" into pi-dev
2018-04-12 03:22:43 +00:00
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
Lei Yu
689ac2e67d
Merge "Add ui tests for restrict app tips" into pi-dev am: 79580c94a7
...
am: 48aac7f5d1
2018-04-11 18:21:39 -07:00
Lei Yu
48aac7f5d1
Merge "Add ui tests for restrict app tips" into pi-dev
...
am: 79580c94a7
2018-04-11 18:08:59 -07:00
Matthew Fritze
59e2d1fff9
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
2018-04-11 17:54:41 -07:00
Lei Yu
40bb1e8488
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
2018-04-11 17:50:30 -07:00
TreeHugger Robot
79580c94a7
Merge "Add ui tests for restrict app tips" into pi-dev
2018-04-12 00:24:31 +00:00
Maurice Lam
8780cc8451
Merge "Fix landscape pattern enroll crash" into pi-dev am: e20f8934c9
...
am: f927d21d4c
2018-04-11 17:21:52 -07:00
Julia Reynolds
6c52f0b757
Merge "Add disabled checkbox preference" into pi-dev am: ccdecc664c
...
am: c57bb42dde
2018-04-11 17:17:42 -07:00
Mehdi Alizadeh
c768d05e1b
Adds video to swipe up gesture am: a37c5b26a2
...
am: 899b915222
2018-04-11 17:09:21 -07:00
Maurice Lam
f927d21d4c
Merge "Fix landscape pattern enroll crash" into pi-dev
...
am: e20f8934c9
2018-04-11 16:56:21 -07:00
TreeHugger Robot
e20f8934c9
Merge "Fix landscape pattern enroll crash" into pi-dev
2018-04-11 23:43:54 +00:00
Julia Reynolds
c57bb42dde
Merge "Add disabled checkbox preference" into pi-dev
...
am: ccdecc664c
2018-04-11 16:20:49 -07:00
Mehdi Alizadeh
899b915222
Adds video to swipe up gesture
...
am: a37c5b26a2
2018-04-11 16:10:06 -07:00
TreeHugger Robot
ccdecc664c
Merge "Add disabled checkbox preference" into pi-dev
2018-04-11 23:07:40 +00:00
Lei Yu
2162a68a43
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
2018-04-11 15:49:04 -07:00
Mehdi Alizadeh
a37c5b26a2
Adds video to swipe up gesture
...
Bug: 77549883
Test: Manual test
Change-Id: I818a5952864cd1a7b62501bb23ed15b4c9fabd27
2018-04-11 22:46:41 +00:00
Jason Monk
a6684b558b
Merge "Add more slices to settings" into pi-dev am: 6be11cc48b
...
am: c8a0024453
2018-04-11 15:39:18 -07:00
Jason Monk
c8a0024453
Merge "Add more slices to settings" into pi-dev
...
am: 6be11cc48b
2018-04-11 15:29:52 -07:00
TreeHugger Robot
6be11cc48b
Merge "Add more slices to settings" into pi-dev
2018-04-11 22:01:25 +00:00
Beverly
0e90651dc2
Merge "Update mSortOrder when changed to frequent" into pi-dev am: 50fdc109ff
...
am: 5ad550aec4
2018-04-11 14:28:16 -07:00
Beverly
5ad550aec4
Merge "Update mSortOrder when changed to frequent" into pi-dev
...
am: 50fdc109ff
2018-04-11 14:15:10 -07:00
TreeHugger Robot
50fdc109ff
Merge "Update mSortOrder when changed to frequent" into pi-dev
2018-04-11 21:05:50 +00:00
Julia Reynolds
bbc14ae725
Merge "String changes for suppressing ambient display" into pi-dev am: eaccf907e7
...
am: d0c1acc874
2018-04-11 13:37:54 -07:00
Fan Zhang
7403e87a03
Merge "Stop logging hotspot password change in logcat." into pi-dev am: 3441c3b073
...
am: 88f5943c1e
2018-04-11 13:26:39 -07:00
Mehdi Alizadeh
aa61ab12c2
[automerger skipped] Merge "Adds the Swipe Up settings page under gestures" into pi-dev am: cb5899f72e
...
am: a413eb3672
2018-04-11 13:22:36 -07:00
Julia Reynolds
d0c1acc874
Merge "String changes for suppressing ambient display" into pi-dev
...
am: eaccf907e7
2018-04-11 12:57:35 -07:00
Fan Zhang
88f5943c1e
Merge "Stop logging hotspot password change in logcat." into pi-dev
...
am: 3441c3b073
2018-04-11 12:47:04 -07:00
Mehdi Alizadeh
a413eb3672
Merge "Adds the Swipe Up settings page under gestures" into pi-dev
...
am: cb5899f72e
2018-04-11 12:45:47 -07:00
