Commit Graph

14576 Commits

Author SHA1 Message Date
Lei Yu
1ad1a29d88 Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
am: 5b8c6c39e9

Change-Id: I6584692ea03b6f1c8bea8ceda4693d48d057e9e1
2018-03-31 03:34:11 +00:00
Lei Yu
824bd92a16 Merge "Update battery strings" into pi-dev am: 7bbc11e87d
am: ab4ebab76c

Change-Id: Ic7bd7ff889bf921cdf3123d5df7a73795f3b734a
2018-03-31 00:21:58 +00:00
Lei Yu
5b8c6c39e9 Merge "Update the battery saver summary" into pi-dev
am: 97dd3c9aac

Change-Id: I9773a5c7fafcad6bbb840949a88f8341812222d1
2018-03-30 23:17:40 +00:00
Lei Yu
ab4ebab76c Merge "Update battery strings" into pi-dev
am: 7bbc11e87d

Change-Id: Iaf0055a9082e3e13314107a290e2bddc0329d2dd
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

Change-Id: I567b56244cee9c72fe6bf17b0a2db4c14d4d244e
2018-03-30 21:40:51 +00:00
Lei Yu
97dd3c9aac Merge "Update the battery saver summary" into pi-dev 2018-03-30 20:01:50 +00:00
Victor Chang
78d61aff2d Merge "Remove dead code in time zone picker" into pi-dev
am: 93b5d0d3f0

Change-Id: Icc46d77ae3a4ba1d4f3ad2d5bcba0a1e0a3c289a
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
Victor Chang
93b5d0d3f0 Merge "Remove dead code in time zone picker" into pi-dev 2018-03-30 18:35:52 +00:00
Andreas Terzis
9b6736181c Top line should show "Primary data" for users with > 1 plans. am: ca9bf3b7ed
am: 72bc4088f8

Change-Id: Iea4a2696eac87ac3160cf74e87c5b76142609245
2018-03-30 08:27:07 +00:00
Andreas Terzis
72bc4088f8 Top line should show "Primary data" for users with > 1 plans.
am: ca9bf3b7ed

Change-Id: I5b8590c3a3b76ffa58ca25f8ee6242aa8f1ba1a7
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

Change-Id: I1a26d7aef5238ee532bedf24aaf26ff9d2d6d0b8
2018-03-30 08:01:29 +00:00
Dieter Hsu
a52682fe2b Support AOD in the Universal Settings API
am: beb89c3545

Change-Id: Ia651c8ffa20b47671d1eb772bfc09d4a4137bb5d
2018-03-30 07:56:01 +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

Change-Id: Iba9f10aa37541d29fa83c817dd728c588f55f352
2018-03-30 04:16:40 +00:00
Julia Reynolds
98be07d793 Merge "Update channel DND setting" into pi-dev
am: e06a4abb5c

Change-Id: If31bb46ded7c9130dcd2d9df988d2163e054e0fe
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
de57e7d195 Merge "Register most app info related controllers in xml" into pi-dev am: 4ae4cd5c8d
am: a166a70218

Change-Id: Id5bbbd56766fa3daa6f942834accb2708c88b7f9
2018-03-30 03:35:55 +00:00
Fan Zhang
a166a70218 Merge "Register most app info related controllers in xml" into pi-dev
am: 4ae4cd5c8d

Change-Id: Ic4dedd363a3dd1ec8ad244d38f9831a0373f7cb2
2018-03-30 03:27:25 +00:00
LexHuang
cb82c2d6db Support Screen Rotate in the Universal Settings API am: 78df73f00a
am: d6209750b4

Change-Id: If605a7eb94e8ded5879dac96eda0f5c1a16b57a3
2018-03-30 03:25:51 +00:00
Doris Ling
cb521bdd39 Merge "Increase touch target for suggestion close button." into pi-dev am: d483041078
am: 2a9fe0e91d

Change-Id: I6d1ee50345ae45ab48162b017197e1556621fcaa
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

Change-Id: I0e657faf410974170aa6a282c01135e60c60b62e
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

Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff
2018-03-30 02:26:45 +00:00
Doris Ling
2a9fe0e91d Merge "Increase touch target for suggestion close button." into pi-dev
am: d483041078

Change-Id: I89697a7b998f29b79d6dc6288d60fcead5908e72
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

Change-Id: I5d15b83e4dce008fea16961e80593180cff45057
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

Change-Id: I816c482c1ecdb057b2c8d1d9da86cc3891b486d3
2018-03-30 01:41:56 +00:00
Fan Zhang
b5c651c939 Register most app info related controllers in xml
Bug: 77216595
Test: robotests
Change-Id: I79afa38820b7518d8b3112148802797ebcf6d184
2018-03-29 17:55:41 -07:00
Fan Zhang
4663e6e52a Merge changes I0fde4f80,Iea1cff48 into pi-dev
am: 0ae4204f54

Change-Id: I9f27d240ff5f4d2dcf0dbde6733730da294e9f4e
2018-03-30 00:54:21 +00:00
Fan Zhang
1b176e3332 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
am: 9af6688a92

Change-Id: Ide6383302dd399a3c6eb1e1011fd88315bda948d
2018-03-29 23:58:03 +00:00
Doris Ling
39cd1d8f0d Increase touch target for suggestion close button.
- wrap the close button icon view in a bigger layout to increase the
overall touch area.

Fixes: 74220173
Test: manual

Change-Id: I45beadf3cfcc6ed1a8a16e6dcb9b8452e1edd78e
2018-03-29 16:56:47 -07:00
Doris Ling
7acf9a574b Merge "Fix visibility issue with fingerprint icon." into pi-dev
am: 108c5452b5

Change-Id: I2ef0e88b9599b2749e43dc1808d1e4c718c98adc
2018-03-29 23:52:26 +00:00
TreeHugger Robot
0ae4204f54 Merge changes I0fde4f80,Iea1cff48 into pi-dev
* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
2018-03-29 23:49:22 +00:00
TreeHugger Robot
9af6688a92 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev 2018-03-29 23:10:45 +00:00
Fan Zhang
65983f71d5 Update TimezoneInfoPrefController to register in xml
Test: robotest
Bug: 77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
2018-03-29 14:38:44 -07:00
Julia Reynolds
cb78269637 Update channel DND setting
... to reflect DND changes elsewhere in the system. Update the summary
and make the setting always available.

Test: make -j RunSettingsRoboTests
Change-Id: Ia51c349d863e1470e8a043293fa60f22632fa2df
Fixes: 76137346
2018-03-29 20:55:03 +00:00
Fan Zhang
f75edca09f Revert "Support AOD in the Universal Settings API"
This reverts commit 537c2cfc2c.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
2018-03-29 20:20:31 +00:00
Doris Ling
92268fd640 Fix visibility issue with fingerprint icon.
- set icon tint color to control normal. The icon fill color is white,
and without the tint color set, it is invisible on a white background.

Change-Id: I9cda0e9105701230256620bd4ea904c96d7bc166
Fixes: 77151365
Test: visual
2018-03-29 13:08:09 -07:00
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07:00
Victor Chang
4da3a7b5a8 Remove dead code in time zone picker
The codes are unused due to the UX changes in b/73952488

Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Bug: 72376227
Change-Id: I9562e97fe13a3c00f8c142f30af7ca350af10757
2018-03-29 19:01:26 +01:00
yuemingw
3005660476 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev am: cc65760354
am: 59b7244dcc

Change-Id: Iff817627897dee78d0f54a0f571703a495e944e9
2018-03-29 17:05:11 +00:00
yuemingw
59b7244dcc Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
am: cc65760354

Change-Id: I13c39e2857bc58f6062a5d74ad3c4e672200a029
2018-03-29 16:53:38 +00:00
TreeHugger Robot
cc65760354 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 2018-03-29 16:45:43 +00:00
Beverly
e711ea4afc Merge "Settings should use Oxford comma" into pi-dev am: 51646b5f07
am: 020117e9ba

Change-Id: I387368b20e038b9f2b920793b4b5e72064f27fd1
2018-03-29 16:32:07 +00:00
Beverly
020117e9ba Merge "Settings should use Oxford comma" into pi-dev
am: 51646b5f07

Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865
2018-03-29 16:09:50 +00:00
TreeHugger Robot
51646b5f07 Merge "Settings should use Oxford comma" into pi-dev 2018-03-29 15:41:21 +00:00
TreeHugger Robot
db29040d2a Merge "Import translations. DO NOT MERGE" 2018-03-29 15:11:32 +00:00