Salvador Martinez
a90332397b
Merge "Make metered wifi controller resilient to null config" into pi-dev am: 861bf93502
...
am: 0ec10e6a43
2018-03-31 07:29:21 +00:00
TreeHugger Robot
94bc86c12a
Merge "Use colorPrimary for EntityHeader's background."
2018-03-31 06:15:37 +00:00
Daniel Nishi
1a509e4af9
Merge "Polish the About Phone page." into pi-dev am: e645558049
...
am: 45a587441f
2018-03-31 04:18:08 +00:00
Lei Yu
4e5ec9a9c1
Merge "Remove the obsolete bluetooth code" into pi-dev am: fa150fca3c
...
am: a5a338dff6
2018-03-31 03:35:30 +00:00
Fan Zhang
62b5000647
Merge "Remove networkScorer wrapper" into pi-dev am: 272d3b5096
...
am: 0cad854925
2018-03-31 03:34:46 +00:00
Lei Yu
1ad1a29d88
Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
...
am: 5b8c6c39e9
2018-03-31 03:34:11 +00:00
Shaotang Li
aab7756f08
Use colorPrimary for EntityHeader's background.
...
Bug: 76219670
Test: check color from screen manually.
Change-Id: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
2018-03-31 11:09:30 +08:00
Lei Yu
f1e1fe26e1
Merge "Refine the update process of battery tip" into pi-dev am: 227f056c8b
...
am: 5072234808
2018-03-31 02:04:46 +00:00
Salvador Martinez
0ec10e6a43
Merge "Make metered wifi controller resilient to null config" into pi-dev
...
am: 861bf93502
2018-03-31 01:55:35 +00:00
Lei Yu
824bd92a16
Merge "Update battery strings" into pi-dev am: 7bbc11e87d
...
am: ab4ebab76c
2018-03-31 00:21:58 +00:00
Daniel Nishi
45a587441f
Merge "Polish the About Phone page." into pi-dev
...
am: e645558049
2018-03-30 23:56:52 +00:00
Lei Yu
a5a338dff6
Merge "Remove the obsolete bluetooth code" into pi-dev
...
am: fa150fca3c
2018-03-30 23:19:52 +00:00
Fan Zhang
0cad854925
Merge "Remove networkScorer wrapper" into pi-dev
...
am: 272d3b5096
2018-03-30 23:18:37 +00:00
Lei Yu
5b8c6c39e9
Merge "Update the battery saver summary" into pi-dev
...
am: 97dd3c9aac
2018-03-30 23:17:40 +00:00
Lei Yu
5072234808
Merge "Refine the update process of battery tip" into pi-dev
...
am: 227f056c8b
2018-03-30 23:17:01 +00:00
Lei Yu
ab4ebab76c
Merge "Update battery strings" into pi-dev
...
am: 7bbc11e87d
2018-03-30 22:46:42 +00:00
Victor Chang
34e0883317
Merge "Remove dead code in time zone picker" into pi-dev am: 93b5d0d3f0
...
am: 78d61aff2d
2018-03-30 21:40:51 +00:00
Jyun LuoLai
56d3c705ee
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev am: 11174d3ced
...
am: b02f7f71a5
2018-03-30 21:30:44 +00:00
Pengquan Meng
ae49fee55c
[automerger skipped] Merge "Add apn data structure" into pi-dev am: dbf8a678ae
...
am: 89918e3209
2018-03-30 21:10:35 +00:00
TreeHugger Robot
861bf93502
Merge "Make metered wifi controller resilient to null config" into pi-dev
2018-03-30 20:50:25 +00:00
Daniel Nishi
e645558049
Merge "Polish the About Phone page." into pi-dev
2018-03-30 20:24:58 +00:00
Lei Yu
fa150fca3c
Merge "Remove the obsolete bluetooth code" into pi-dev
2018-03-30 20:24:01 +00:00
TreeHugger Robot
272d3b5096
Merge "Remove networkScorer wrapper" into pi-dev
2018-03-30 20:16:06 +00:00
Lei Yu
97dd3c9aac
Merge "Update the battery saver summary" into pi-dev
2018-03-30 20:01:50 +00:00
Lei Yu
227f056c8b
Merge "Refine the update process of battery tip" into pi-dev
2018-03-30 19:56:46 +00:00
Victor Chang
78d61aff2d
Merge "Remove dead code in time zone picker" into pi-dev
...
am: 93b5d0d3f0
2018-03-30 19:17:47 +00:00
Lei Yu
7bbc11e87d
Merge "Update battery strings" into pi-dev
2018-03-30 19:12:41 +00:00
Jyun LuoLai
b02f7f71a5
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev
...
am: 11174d3ced
2018-03-30 19:02:21 +00:00
Pengquan Meng
89918e3209
Merge "Add apn data structure" into pi-dev
...
am: dbf8a678ae
2018-03-30 18:56:22 +00:00
Victor Chang
93b5d0d3f0
Merge "Remove dead code in time zone picker" into pi-dev
2018-03-30 18:35:52 +00:00
Lei Yu
dec7a719d1
Remove the obsolete bluetooth code
...
Also update the shortcut:
1. Change the name to "Devices"
2. Change it point to "Connected device" page
Bug: 74806595
Fixes: 69926683
Test: robo test still pass
Change-Id: Ic57756fc955dc622cc22d0be64f02b5ae07a2915
2018-03-30 11:24:26 -07:00
Rubin Xu
228246d47f
Merge "Remove password blacklist check" into pi-dev am: 48283ec44c
...
am: d982a37476
2018-03-30 18:24:21 +00:00
Fan Zhang
368c81e97b
Remove networkScorer wrapper
...
Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily
Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590
2018-03-30 11:06:30 -07:00
TreeHugger Robot
11174d3ced
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev
2018-03-30 17:23:51 +00:00
Pengquan Meng
dbf8a678ae
Merge "Add apn data structure" into pi-dev
2018-03-30 17:00:35 +00:00
Rubin Xu
d982a37476
Merge "Remove password blacklist check" into pi-dev
...
am: 48283ec44c
2018-03-30 13:50:19 +00:00
Rubin Xu
48283ec44c
Merge "Remove password blacklist check" into pi-dev
2018-03-30 13:38:31 +00:00
Beverly
ffddcf0c95
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev am: efa1cde042
...
am: 84b51371a9
2018-03-30 13:37:26 +00:00
Beverly
84b51371a9
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev
...
am: efa1cde042
2018-03-30 13:27:52 +00:00
TreeHugger Robot
efa1cde042
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev
2018-03-30 13:16:25 +00:00
Andreas Terzis
9b6736181c
Top line should show "Primary data" for users with > 1 plans. am: ca9bf3b7ed
...
am: 72bc4088f8
2018-03-30 08:27:07 +00:00
Andreas Terzis
72bc4088f8
Top line should show "Primary data" for users with > 1 plans.
...
am: ca9bf3b7ed
2018-03-30 08:21:57 +00:00
Andreas Terzis
ca9bf3b7ed
Top line should show "Primary data" for users with > 1 plans.
...
When the platform receives data plan information and the
user has more than one data plans, the top line under
Settings -> Network & Internet -> Data Usage should read
"Primary data" instead of "Current data".
Bug: 77295381
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ia9d9d04919c28b163979c70f91eb7d72cdebcb89
2018-03-30 01:09:04 -07:00
Dieter Hsu
1967396c09
Support AOD in the Universal Settings API am: beb89c3545
...
am: a52682fe2b
2018-03-30 08:01:29 +00:00
Dieter Hsu
a52682fe2b
Support AOD in the Universal Settings API
...
am: beb89c3545
2018-03-30 07:56:01 +00:00
Jyun LuoLai
e44b94c435
Modify AddDevicePreferenceController's constructor
...
For xml type controller, implements the constructor (Context, String)
would be better
Bug: 73960246
Test: Manual test & make RunSettingsRoboTests
Change-Id: I872a663947f14de5e83c596655b2ffb75f37f057
2018-03-30 14:00:03 +08:00
Yvan Hsueh
2f81209d0f
Retain the selected filter even after the device orientation change.
...
The selected filter should be retained displaying the list even after the device orientation change.
Bug: 36380176
Test: atest packages/apps/Settings/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java
Change-Id: I7830b525343ce597929771ad4db55a803f893432
2018-03-30 05:29:04 +00:00
Dieter Hsu
beb89c3545
Support AOD in the Universal Settings API
...
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I609ac74f70bf040bd9033f421b4bb7c02bf33440
2018-03-30 13:20:56 +08:00
Julia Reynolds
d3c75d8e37
Merge "Update channel DND setting" into pi-dev am: e06a4abb5c
...
am: 98be07d793
2018-03-30 04:16:40 +00:00
Julia Reynolds
98be07d793
Merge "Update channel DND setting" into pi-dev
...
am: e06a4abb5c
2018-03-30 04:11:03 +00:00
