Commit Graph

11740 Commits

Author SHA1 Message Date
Lei Yu
ce62cb0118 Merge "Update some battery string comments" into oc-dev am: 2721c8aa03
am: b783b2775d

Change-Id: I76d0efaae5ad72bd0bb38a2e3a5c710f18fb8de8
2017-04-14 20:41:17 +00:00
Lei Yu
b783b2775d Merge "Update some battery string comments" into oc-dev
am: 2721c8aa03

Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f
2017-04-14 20:33:48 +00:00
Daniel Nishi
99ebf72938 Merge "Shrink the progress bar on storage items." into oc-dev am: 53ea5701f4
am: ae3305e7bd

Change-Id: I1afdb37c921d9e4ea53d56e605794ba0401f807a
2017-04-14 20:28:02 +00:00
Lei Yu
2721c8aa03 Merge "Update some battery string comments" into oc-dev 2017-04-14 20:26:27 +00:00
Daniel Nishi
ae3305e7bd Merge "Shrink the progress bar on storage items." into oc-dev
am: 53ea5701f4

Change-Id: Ibd0a426630929dc3c5de7eb98fce692bd30d7729
2017-04-14 20:22:46 +00:00
Daniel Nishi
53ea5701f4 Merge "Shrink the progress bar on storage items." into oc-dev 2017-04-14 20:18:18 +00:00
Daniel Nishi
10cdecef13 Merge "Use the music note icon for the music files pref." into oc-dev am: fbaa29a4b1
am: b6afa7575a

Change-Id: Ia644597897ad020468bc1bf8c12ba84c76e8893c
2017-04-14 20:00:05 +00:00
Daniel Nishi
b6afa7575a Merge "Use the music note icon for the music files pref." into oc-dev
am: fbaa29a4b1

Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561
2017-04-14 19:56:45 +00:00
Daniel Nishi
fbaa29a4b1 Merge "Use the music note icon for the music files pref." into oc-dev 2017-04-14 19:50:31 +00:00
Fan Zhang
0d6cd5a902 Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev am: c8c066dedf
am: b7c880a709

Change-Id: I5c999a35fe83be87598b9c7374a0b13ae327130e
2017-04-14 18:48:18 +00:00
jackqdyulei
c238596912 Merge "Update summary when toggle background activity" into oc-dev am: 8d519f8281
am: 3fd3a348d3

Change-Id: I9983091fb9db2fc67ef699fd19dc7497119c7d34
2017-04-14 18:47:47 +00:00
Jesse Evans
3d9fc82734 Merge "Instant apps show supported links not open default" into oc-dev am: 0f34680fe0
am: ec9090782c

Change-Id: I0d92c8ccecec2e61c88d3f9617d9c70827d2ea90
2017-04-14 18:47:30 +00:00
Fan Zhang
b7c880a709 Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am: c8c066dedf

Change-Id: Icf250ff46ddfd48d3d213c86f0c5001547a1a4ec
2017-04-14 18:43:09 +00:00
TreeHugger Robot
c8c066dedf Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev 2017-04-14 18:30:13 +00:00
Daniel Nishi
c274a28660 Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes: 36900603
Test: Manual
2017-04-14 10:29:14 -07:00
Lei Yu
088d771aad Merge "Revamp battery Ui in low battery mode" into oc-dev am: c4f08120b1
am: aa03fd4c42

Change-Id: I17c195a961585d7cbb873b6b962ad9205e89808c
2017-04-14 16:18:36 +00:00
Jesse Evans
5d0c0fab8c Merge "Instant apps should not say App Installed by" into oc-dev am: 28371d9c9e
am: 774b759ef9

Change-Id: Id8e60764ee9e0dd20f73798b1cd8df706d1d70e9
2017-04-14 15:52:56 +00:00
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
jackqdyulei
3fd3a348d3 Merge "Update summary when toggle background activity" into oc-dev
am: 8d519f8281

Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33
2017-04-14 01:25:47 +00:00
TreeHugger Robot
8d519f8281 Merge "Update summary when toggle background activity" into oc-dev 2017-04-14 01:13:57 +00:00
jackqdyulei
7c7654b401 Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background

Fix: 36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
2017-04-13 17:54:48 -07:00
Jesse Evans
ec9090782c Merge "Instant apps show supported links not open default" into oc-dev
am: 0f34680fe0

Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640
2017-04-14 00:48:56 +00:00
TreeHugger Robot
0f34680fe0 Merge "Instant apps show supported links not open default" into oc-dev 2017-04-14 00:41:01 +00:00
jackqdyulei
60607da120 Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.

Bug: 37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350
2017-04-13 16:23:45 -07: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
Jesse Evans
edc5099e89 Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug: 36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
2017-04-13 15:17:41 -07:00
Lei Yu
aa03fd4c42 Merge "Revamp battery Ui in low battery mode" into oc-dev
am: c4f08120b1

Change-Id: I98dd93c678a3c71e0c19cb8a2f3979606d7075af
2017-04-13 21:52:49 +00:00
Fan Zhang
2bc3e47953 Get rid of the extra divider lines in memory usage UI
Change-Id: I991f74ed3139f6119188a446fbf12bef23189988
Fix: 37211922
Test: visual
2017-04-13 14:46:00 -07:00
Lei Yu
c4f08120b1 Merge "Revamp battery Ui in low battery mode" into oc-dev 2017-04-13 21:43:38 +00:00
Daniel Nishi
0cce538bb0 Shrink the progress bar on storage items.
Change-Id: I4c9161de01236f7ac7ab633162a806888006fc1f
Fixes: 37283130
Test: Manual
2017-04-13 14:15:29 -07:00
Jesse Evans
774b759ef9 Merge "Instant apps should not say App Installed by" into oc-dev
am: 28371d9c9e

Change-Id: I17c5ee53f16d26e9e01a54e717e1dcc10051650d
2017-04-13 20:03:43 +00:00
Jack He
ee720c000a Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev 2017-04-13 19:43:55 +00:00
TreeHugger Robot
28371d9c9e Merge "Instant apps should not say App Installed by" into oc-dev 2017-04-13 19:36:53 +00: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