Lei Yu
1ad1a29d88
Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
...
am: 5b8c6c39e9
2018-03-31 03:34:11 +00: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
Lei Yu
824bd92a16
Merge "Update battery strings" into pi-dev am: 7bbc11e87d
...
am: ab4ebab76c
2018-03-31 00:21:58 +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
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
Rubin Xu
228246d47f
Merge "Remove password blacklist check" into pi-dev am: 48283ec44c
...
am: d982a37476
2018-03-30 18:24:21 +00: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
TreeHugger Robot
e06a4abb5c
Merge "Update channel DND setting" into pi-dev
2018-03-30 04:03:28 +00:00
Fan Zhang
5d97dfab5c
Merge "Remove wrapper for EUICCManager" into pi-dev am: 2cb0425ded
...
am: f97264ce15
2018-03-30 03:38:17 +00:00
Fan Zhang
de57e7d195
Merge "Register most app info related controllers in xml" into pi-dev am: 4ae4cd5c8d
...
am: a166a70218
2018-03-30 03:35:55 +00:00
Fan Zhang
f97264ce15
Merge "Remove wrapper for EUICCManager" into pi-dev
...
am: 2cb0425ded
2018-03-30 03:28:11 +00:00
Fan Zhang
a166a70218
Merge "Register most app info related controllers in xml" into pi-dev
...
am: 4ae4cd5c8d
2018-03-30 03:27:25 +00:00
LexHuang
cb82c2d6db
Support Screen Rotate in the Universal Settings API am: 78df73f00a
...
am: d6209750b4
2018-03-30 03:25:51 +00:00
TreeHugger Robot
2cb0425ded
Merge "Remove wrapper for EUICCManager" into pi-dev
2018-03-30 03:21:37 +00:00
Doris Ling
cb521bdd39
Merge "Increase touch target for suggestion close button." into pi-dev am: d483041078
...
am: 2a9fe0e91d
2018-03-30 03:21:18 +00:00
TreeHugger Robot
4ae4cd5c8d
Merge "Register most app info related controllers in xml" into pi-dev
2018-03-30 03:17:45 +00:00
LexHuang
d6209750b4
Support Screen Rotate in the Universal Settings API
...
am: 78df73f00a
2018-03-30 02:45:39 +00:00
LexHuang
78df73f00a
Support Screen Rotate in the Universal Settings API
...
Change extend from AbstractPreferenceController to TogglePreferenceControllear
Bug: 67997439
Test: make RunSettingsRoboTests
Change-Id: I86e59d00384fb131f2f2b92186e8536324db2e1b
2018-03-30 02:32:36 +00:00
Fan Zhang
ffb6e93128
Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54
...
am: 4663e6e52a
2018-03-30 02:26:45 +00:00
Doris Ling
2a9fe0e91d
Merge "Increase touch target for suggestion close button." into pi-dev
...
am: d483041078
2018-03-30 02:07:07 +00:00
TreeHugger Robot
d483041078
Merge "Increase touch target for suggestion close button." into pi-dev
2018-03-30 01:55:54 +00:00
Fan Zhang
24ebab4565
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev am: 9af6688a92
...
am: 1b176e3332
2018-03-30 01:42:40 +00:00
Doris Ling
8c62a83811
Merge "Fix visibility issue with fingerprint icon." into pi-dev am: 108c5452b5
...
am: 7acf9a574b
2018-03-30 01:41:56 +00:00
