Commit Graph

11706 Commits

Author SHA1 Message Date
Saige McVea
4d75b8812e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev am: ba7a4751a0
am: 8fb5b5fd0e

Change-Id: I1167930dd65752403876d462150a4c63dbb1dd84
2017-04-14 15:52:41 +00:00
TreeHugger Robot
4b1206b4b2 Merge "Add erase eSIMs choice into factory reset" 2017-04-14 02:03:57 +00:00
qingxi
072f28661d Add erase eSIMs choice into factory reset
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.

Bug: 37255419
Test: Included
Change-Id: Ic98974726a515b0a350b73a33093460a63c1fb8a
2017-04-13 15:28:45 -07:00
Saige McVea
8fb5b5fd0e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
am: ba7a4751a0

Change-Id: I9c9ca5d2584c923520f9d2d9986fdf28f7aae5d8
2017-04-13 19:18:29 +00:00
Saige McVea
ba7a4751a0 Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev 2017-04-13 19:07:33 +00:00
Daniel Nishi
f6e6991965 Merge "Add a movies & tv apps category to storage settings." into oc-dev
am: c365a8735c

Change-Id: I665759c8ce9c74d83a1167c5d04e5134ff697d08
2017-04-13 18:45:04 +00:00
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
Sundeep Ghuman
9143755b93 Merge "Update Wifi Preferences with custom icons." into oc-dev am: 43bd76d2d0
am: d840ac812d

Change-Id: Ie9dff375e599e9b83ec07fff20e0e65ce682d1f0
2017-04-13 18:04:04 +00:00
Anas Karbila
aaa31217d2 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913 am: 282a2317b9 am: 08cc4afc07
am: 97d884ad54

Change-Id: Iaaead338cce4638dd5318ef9d5dac3faec61c652
2017-04-13 18:03:46 +00:00
Sundeep Ghuman
d840ac812d Merge "Update Wifi Preferences with custom icons." into oc-dev
am: 43bd76d2d0

Change-Id: I3a37077a166051c85891904e154de2fbcfc3ef63
2017-04-13 17:46:02 +00:00
Anas Karbila
97d884ad54 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913 am: 282a2317b9
am: 08cc4afc07

Change-Id: Ia99a4cb7fcb06612b26a050081e731a535449194
2017-04-13 17:37:42 +00:00
Anas Karbila
08cc4afc07 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
am: 282a2317b9

Change-Id: I7775df15acf1cb74cad94e3e23dd6faf5d98412e
2017-04-13 17:27:36 +00:00
TreeHugger Robot
43bd76d2d0 Merge "Update Wifi Preferences with custom icons." into oc-dev 2017-04-13 17:08:25 +00:00
TreeHugger Robot
20099035ef Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:24:25 +00:00
Julia Reynolds
1c98369d96 Merge "Notification sound field updates" into oc-dev am: b40a459031
am: cd8f4fb614

Change-Id: I8f8b5674339b044911ef6ed630c2d432cb7277cf
2017-04-13 13:20:46 +00:00
Julia Reynolds
cd8f4fb614 Merge "Notification sound field updates" into oc-dev
am: b40a459031

Change-Id: Ie8b98d89f477c0d5cfc46946ea1bc14735b07c16
2017-04-13 13:13:18 +00:00
Anas Karbila
e17dc5eeb0 Settings: Fix wrong wifi drawable in screen zooming preview
We should use the same wifi drawable for the screen
zooming preview as the one the real settings menu
is using.

Change-Id: Ibb0d45b9f5aa431b52864aa826ea84c49b2d3fa0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-04-13 13:04:41 +00:00
Julia Reynolds
b40a459031 Merge "Notification sound field updates" into oc-dev 2017-04-13 13:01:52 +00:00
Bill Yi
5ac8caee5d Import translations. DO NOT MERGE
Change-Id: Ia49d34f5f431aad5bed7ecbdbda5fed2adf95534
Auto-generated-cl: translation import
2017-04-13 05:36:35 -07:00
Svet Ganov
985741ea1c Merge "Update the strings for the autofill enable dialog" into oc-dev am: 0770f85cdc
am: 6fa685e4da

Change-Id: Iac9a8bf0430652396809784598ed75f947b75426
2017-04-13 02:10:31 +00:00
Svet Ganov
6fa685e4da Merge "Update the strings for the autofill enable dialog" into oc-dev
am: 0770f85cdc

Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255
2017-04-13 02:04:32 +00:00
TreeHugger Robot
0770f85cdc Merge "Update the strings for the autofill enable dialog" into oc-dev 2017-04-13 01:56:06 +00:00
Sundeep Ghuman
6f22fb7dc1 Update Wifi Preferences with custom icons.
Bug: b/37281159
Test: Visual inspection of resource change only, see screenshot.
Change-Id: I1fb11667d9fe81873cc8e0a01db98890f106f1be
2017-04-12 17:17:49 -07:00
Stephen Chen
b8d2af244b Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev am: de50fff3c2
am: 6455544f6e

Change-Id: I62689c3716e34c1c9faa4c0b56235c2a699552c1
2017-04-12 22:35:52 +00:00
Svet Ganov
4fafa4e403 Update the strings for the autofill enable dialog
Test: manual

bug:37244333

Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e
2017-04-12 15:17:53 -07:00
Stephen Chen
6455544f6e Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
am: de50fff3c2

Change-Id: I500d13e65b8aa63b62e5eacb750ed2a6a1ffc163
2017-04-12 20:37:15 +00:00
TreeHugger Robot
de50fff3c2 Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev 2017-04-12 20:24:22 +00:00
Saige McVea
672cb2edc6 Added generic icon and magnification icon to a11y Settings.
Test: Manual

Bug: 36895362

Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
2017-04-12 12:52:21 -07:00
Doris Ling
943b6af1fc Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
am: c6f5261619

Change-Id: I388c45690f8eb59db2d1d590268319ee8b72b983
2017-04-12 18:41:50 +00:00
TreeHugger Robot
ec7ebc3f72 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-12 18:37:23 +00:00
Doris Ling
c6f5261619 Merge "Allow settings preference title to span over multiple lines." into oc-dev
am: d09c7e61f4

Change-Id: I81b0285f59195911e3b98ca6f4bf8333da9b23a4
2017-04-12 18:10:41 +00:00
Christine Franks
594d15386c Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be
am: c783d634a3

Change-Id: I09962c3046fbb833cf08455593f73ab3ffa761d1
2017-04-12 18:04:59 +00:00
TreeHugger Robot
d09c7e61f4 Merge "Allow settings preference title to span over multiple lines." into oc-dev 2017-04-12 17:57:28 +00:00
Christine Franks
c783d634a3 Merge "Use correct title when opening from notification" into oc-dev
am: f61d4f38be

Change-Id: I671f893935c908f00464fb97612dd7486c5b3438
2017-04-12 17:33:29 +00:00
Christine Franks
f61d4f38be Merge "Use correct title when opening from notification" into oc-dev 2017-04-12 17:19:40 +00:00
Charles He
c879dfc11f Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev am: 2371009a22
am: 38752c4f48

Change-Id: Ibb7cd0531b98515a86c33487643a587de75f1678
2017-04-12 11:28:15 +00:00
Charles He
38752c4f48 Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
am: 2371009a22

Change-Id: Ifcdac1ef4c6fee959aab46ca2025d2c71a2e657d
2017-04-12 11:22:47 +00:00
Niels Egberts
0b51491a46 Remove unused xml file.
am: 07e3f619eb

Change-Id: If5ab7a6c492d9ad02620ce61a52ddde59829d48b
2017-04-12 11:22:31 +00:00
TreeHugger Robot
2371009a22 Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev 2017-04-12 11:20:09 +00:00
Niels Egberts
07e3f619eb Remove unused xml file.
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d)
2017-04-12 08:55:21 +00:00
Amin Shaikh
27ea581cbe Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
am: 35caf331df

Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
Amin Shaikh
35caf331df Merge "Wi-Fi network details page fixes." into oc-dev
am: 52cf25d03d

Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46
2017-04-12 04:50:14 +00:00
TreeHugger Robot
52cf25d03d Merge "Wi-Fi network details page fixes." into oc-dev 2017-04-12 04:40:11 +00:00
Fan Zhang
752f902c2a Merge "Add placeholder summary to stablize app info pref height" into oc-dev
am: 0bc2aaea70

Change-Id: I5164fc54604abb057e8679d10965e9e0670da084
2017-04-12 02:45:56 +00:00
TreeHugger Robot
0bc2aaea70 Merge "Add placeholder summary to stablize app info pref height" into oc-dev 2017-04-12 02:36:12 +00:00
Tony Mantler
61492e99d7 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0
am: d9200e5ba4

Change-Id: I4c125d7c62b94a351544a7b64547add0a774db3e
2017-04-11 23:56:08 +00:00
Fan Zhang
57c1ce4980 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev am: fd29aada6b
am: 668dae22e7

Change-Id: Ib618566f6078793be3460070e65bd78b9d0f0a59
2017-04-11 23:48:37 +00:00
Tony Mantler
d9200e5ba4 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
2017-04-11 23:48:17 +00:00
TreeHugger Robot
69faf046c0 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev 2017-04-11 23:43:27 +00:00
Fan Zhang
668dae22e7 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e
2017-04-11 23:42:46 +00:00