OSDN Git Service
Bill Yi [Tue, 11 Apr 2017 01:52:23 +0000 (18:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a5c7e15111d3ba93e697b8be910230b5cf58751
Auto-generated-cl: translation import
Matthew Fritze [Tue, 11 Apr 2017 00:37:41 +0000 (00:37 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev am:
f84c8d3480
am:
5bb64aeb59
Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094
Matthew Fritze [Tue, 11 Apr 2017 00:19:36 +0000 (00:19 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev
am:
f84c8d3480
Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0
TreeHugger Robot [Mon, 10 Apr 2017 23:54:54 +0000 (23:54 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev
Honglu Yin [Mon, 10 Apr 2017 23:35:51 +0000 (23:35 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am:
7d9146e10a am:
4604741c51 am:
b9b563d243
am:
381570cda2
Change-Id: Ifd8fbcfa5a4d0e5aa8598fb26b4158b01db230c3
Jack He [Mon, 10 Apr 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am:
3d08bedba2 am:
9e1e430f06 am:
336a7ccca7
am:
075ee6109f
Change-Id: I6f525a905f9472aae6f227de3f3b1dd1eac5fcaa
Honglu Yin [Mon, 10 Apr 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am:
7d9146e10a am:
4604741c51
am:
b9b563d243
Change-Id: Id276fbc68b12985074393454f729f950612685ed
Honglu Yin [Mon, 10 Apr 2017 23:22:49 +0000 (23:22 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am:
7d9146e10a
am:
4604741c51
Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
Jack He [Mon, 10 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am:
3d08bedba2 am:
9e1e430f06
am:
336a7ccca7
Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f
Jack He [Mon, 10 Apr 2017 23:11:42 +0000 (23:11 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am:
3d08bedba2
am:
9e1e430f06
Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
Honglu Yin [Mon, 10 Apr 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Title is different after tapping "Memory used by apps""
am:
7d9146e10a
Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
Jack He [Mon, 10 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
am:
3d08bedba2
Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
Treehugger Robot [Mon, 10 Apr 2017 22:53:07 +0000 (22:53 +0000)]
Merge "Title is different after tapping "Memory used by apps""
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
Matthew Fritze [Mon, 3 Apr 2017 18:35:48 +0000 (11:35 -0700)]
Reindex on OTA and locale change
When the user gets an OTA or changes language, settings
will clear the database and reindex it.
Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes:
36859162
Garfield Tan [Mon, 10 Apr 2017 21:05:13 +0000 (21:05 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev am:
66871d8531
am:
cea8a43a92
Change-Id: I29826b9af0264fd087a5cde19b9da7e26a9f8c3f
Garfield Tan [Mon, 10 Apr 2017 20:41:47 +0000 (20:41 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev
am:
66871d8531
Change-Id: I6b082e06a434a9d1ea098458e665c19a4975fb84
Garfield Tan [Mon, 10 Apr 2017 20:24:19 +0000 (20:24 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev
TreeHugger Robot [Mon, 10 Apr 2017 19:10:29 +0000 (19:10 +0000)]
Merge "Use InstrumentedFragment for EncryptionInterstitial"
Daniel Nishi [Mon, 10 Apr 2017 17:37:54 +0000 (17:37 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev am:
b1c336de5f
am:
f4af2774ee
Change-Id: I1ff26ce55a3b1ade531745e091e5c6e2de243593
Daniel Nishi [Mon, 10 Apr 2017 17:32:27 +0000 (17:32 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev
am:
b1c336de5f
Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b
Daniel Nishi [Mon, 10 Apr 2017 17:27:24 +0000 (17:27 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev
Lei Yu [Mon, 10 Apr 2017 17:17:52 +0000 (17:17 +0000)]
Merge "Add log for BatteryUtils" into oc-dev am:
27dc9b69ac
am:
964de0d7be
Change-Id: I11d8232ca7b1d96625cec881d085269fb81e8322
Lei Yu [Mon, 10 Apr 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Add log for BatteryUtils" into oc-dev
am:
27dc9b69ac
Change-Id: I5bad76814ac4b6346c634498e0a5952f5d539f17
Lei Yu [Mon, 10 Apr 2017 17:06:44 +0000 (17:06 +0000)]
Merge "Add log for BatteryUtils" into oc-dev
Bill Yi [Sat, 8 Apr 2017 08:27:35 +0000 (08:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4c4f2a7c4c -s ours
am:
dc41538fcc -s ours
Change-Id: If667e6caee86a65849a2b57c7d5d979987304c6a
Bill Yi [Sat, 8 Apr 2017 08:19:51 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4c4f2a7c4c -s ours
Change-Id: Ibcdcd69068104c8db306d0b5d02276fd351064e6
TreeHugger Robot [Sat, 8 Apr 2017 08:19:00 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 8 Apr 2017 08:06:36 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Garfield Tan [Sat, 8 Apr 2017 01:42:32 +0000 (18:42 -0700)]
Fix the intent to launch storage details.
Test: Manual tests & robo tests.
Bug:
37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
Daniel Nishi [Fri, 24 Mar 2017 19:23:27 +0000 (12:23 -0700)]
Add user icon to the other user preferences.
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.
Fixes:
36252572
Test: Robotest
Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
Lei Yu [Fri, 7 Apr 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Extend the translation limit to 60" into oc-dev am:
2a3a92b513
am:
451964a124
Change-Id: I1aa65f1f4a9ec03ba61bfd981ec5386c5d38f631
Kevin Chyn [Fri, 7 Apr 2017 21:09:04 +0000 (21:09 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev am:
78dce02079
am:
e359c21f71
Change-Id: I0fe1e293124db87f786b4da93c59586eac75fa4d
Lei Yu [Fri, 7 Apr 2017 21:08:11 +0000 (21:08 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
am:
2a3a92b513
Change-Id: Iba43130a4d300ad62e775d6167aa888b4de9a437
Lei Yu [Fri, 7 Apr 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
Kevin Chyn [Fri, 7 Apr 2017 21:01:09 +0000 (21:01 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am:
78dce02079
Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
Doris Ling [Fri, 7 Apr 2017 20:12:28 +0000 (20:12 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev am:
a258e424a2
am:
f8dead2f40
Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
Doris Ling [Fri, 7 Apr 2017 20:07:55 +0000 (20:07 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
am:
a258e424a2
Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
Andrew Sapperstein [Fri, 7 Apr 2017 20:06:36 +0000 (20:06 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev am:
a9acbd924a
am:
e6db78a2f1
Change-Id: I6123d1c36204bc87276d4170850a1c7d318c7eea
TreeHugger Robot [Fri, 7 Apr 2017 20:03:35 +0000 (20:03 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
Andrew Sapperstein [Fri, 7 Apr 2017 20:02:37 +0000 (20:02 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
am:
a9acbd924a
Change-Id: Ie7dea50e40606b39d29247740f7fb659738684a3
TreeHugger Robot [Fri, 7 Apr 2017 19:55:53 +0000 (19:55 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:50:05 +0000 (19:50 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev am:
7badf46542
am:
af587b0cfc
Change-Id: Icec5b8d5118497a7e4af21cc1c262400695b75e1
Daniel Nishi [Fri, 7 Apr 2017 19:46:05 +0000 (19:46 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
am:
7badf46542
Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
Daniel Nishi [Fri, 7 Apr 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:34:57 +0000 (19:34 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared."
TreeHugger Robot [Fri, 7 Apr 2017 19:17:47 +0000 (19:17 +0000)]
Merge "Fix encryption interstitial string"
Kevin Chyn [Thu, 6 Apr 2017 18:11:57 +0000 (11:11 -0700)]
renaming/removing fingerprints should be reflected in UI immediately
Fixes
30252265
Test: manual
Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
jackqdyulei [Wed, 5 Apr 2017 22:21:36 +0000 (15:21 -0700)]
Add log for BatteryUtils
This cl add logs to get more data for app usage time.
Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.
Bug:
36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
Doris Ling [Thu, 6 Apr 2017 23:01:37 +0000 (16:01 -0700)]
Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.
Bug:
36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
Lei Yu [Fri, 7 Apr 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Remove misc data in battery main page." into oc-dev am:
abde170529
am:
52e096284f
Change-Id: I7f1665ea0864ff726a2964952c43fbb69d95e6f1
Lei Yu [Fri, 7 Apr 2017 17:51:50 +0000 (17:51 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
am:
abde170529
Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f
Lei Yu [Fri, 7 Apr 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
Maurice Lam [Fri, 7 Apr 2017 17:35:39 +0000 (10:35 -0700)]
Fix encryption interstitial string
Test: Manual
Bug:
36801908
Change-Id: Ib5a06cc557458a451a6aec645e8331e75850cb2e
jackqdyulei [Fri, 7 Apr 2017 17:29:58 +0000 (10:29 -0700)]
Extend the translation limit to 60
Bug:
36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
Andrew Sapperstein [Thu, 6 Apr 2017 19:46:00 +0000 (12:46 -0700)]
Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes:
37014409
Test: string change
Bill Yi [Fri, 7 Apr 2017 16:27:04 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
Bill Yi [Fri, 7 Apr 2017 16:10:36 +0000 (09:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa73edb3d34b6be32ce3d4e905883ea8dbd167cd
Auto-generated-cl: translation import
Filip Pavlis [Fri, 7 Apr 2017 10:45:07 +0000 (10:45 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am:
f023f50787
am:
7ae53e7df7
Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de
Filip Pavlis [Fri, 7 Apr 2017 10:38:54 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am:
f023f50787
Change-Id: I5209009c77680828d57b2178e3209b20c37f029d
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Phil Weaver [Fri, 7 Apr 2017 05:55:19 +0000 (05:55 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am:
0b9cd1b40e
am:
ba98033945
Change-Id: I81533c721182e0e118bc2ed6eea7800c62b5be69
Phil Weaver [Fri, 7 Apr 2017 05:50:42 +0000 (05:50 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
am:
0b9cd1b40e
Change-Id: Ie4987e836593709c52a7afbedf826501180e1299
TreeHugger Robot [Fri, 7 Apr 2017 05:47:32 +0000 (05:47 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
Jim Miller [Fri, 7 Apr 2017 04:55:39 +0000 (04:55 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am:
b8aaaf82a2
am:
9e6345e1b9
Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5
Jim Miller [Fri, 7 Apr 2017 04:51:09 +0000 (04:51 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
am:
b8aaaf82a2
Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
TreeHugger Robot [Fri, 7 Apr 2017 04:47:59 +0000 (04:47 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 03:56:25 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Doris Ling [Fri, 7 Apr 2017 02:55:03 +0000 (02:55 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev am:
65682e7fa5
am:
64c8244524
Change-Id: I5eec7aab71e3990d6f132a6f807f006a918f4c78
Doris Ling [Fri, 7 Apr 2017 02:47:53 +0000 (02:47 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev
am:
65682e7fa5
Change-Id: I47fa8dffba03f8666972843046537dcbededef9c
TreeHugger Robot [Fri, 7 Apr 2017 02:40:12 +0000 (02:40 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:37:13 +0000 (02:37 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev am:
43146c4972
am:
272d65c0bc
Change-Id: I5dc16b17576273d7b3e43bae69e8bc60f29ccd5d
Doris Ling [Fri, 7 Apr 2017 02:36:58 +0000 (02:36 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev am:
e94ba3b55f
am:
8f3be96ba8
Change-Id: I6b8a83881fae1fea4cd1776fa28b354cae67dae9
Doris Ling [Fri, 7 Apr 2017 02:33:17 +0000 (02:33 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
am:
43146c4972
Change-Id: I4ae3d7fcd5680af78dd2538399368ad34ecef319
Doris Ling [Fri, 7 Apr 2017 02:33:01 +0000 (02:33 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
am:
e94ba3b55f
Change-Id: I19479c26fd00d7e356ff109a089c6605261af870
TreeHugger Robot [Fri, 7 Apr 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:27:54 +0000 (02:27 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:21:17 +0000 (02:21 +0000)]
Merge "Update summary text for Trust agent." into oc-dev am:
b9a54bae08
am:
4e33cc1279
Change-Id: I71cebb56677c1cc9f502c1578f2de3fbcfa88f26
Doris Ling [Fri, 7 Apr 2017 02:17:22 +0000 (02:17 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
am:
b9a54bae08
Change-Id: I16a2423d405c34afe1cd589f9007a4b4dafb6925
TreeHugger Robot [Fri, 7 Apr 2017 02:09:35 +0000 (02:09 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:03:00 +0000 (02:03 +0000)]
Merge "Add subtext to Default apps." into oc-dev am:
1e775c117a
am:
3da90f7f1c
Change-Id: Id89a509fa97edc1a31223bc25225a75f166e3f9c
Doris Ling [Fri, 7 Apr 2017 01:54:46 +0000 (01:54 +0000)]
Merge "Add subtext to Default apps." into oc-dev
am:
1e775c117a
Change-Id: I5e06cdb4513bbc8e2ee23592e5d90f1a9481f994
Lei Yu [Fri, 7 Apr 2017 01:47:09 +0000 (01:47 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev am:
bde7097fb9
am:
20dcdfe2cf
Change-Id: I612907ccce829d6ac590c5826bc6a1710b5b27dc
TreeHugger Robot [Fri, 7 Apr 2017 01:41:50 +0000 (01:41 +0000)]
Merge "Add subtext to Default apps." into oc-dev
Lei Yu [Fri, 7 Apr 2017 01:39:25 +0000 (01:39 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
am:
bde7097fb9
Change-Id: If609c5e9814bd2a18f3a8981937b407b2e94de61
Lei Yu [Fri, 7 Apr 2017 01:34:36 +0000 (01:34 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
Jim Miller [Fri, 7 Apr 2017 01:08:10 +0000 (18:08 -0700)]
Don't crash if we get a onRemove() callback from Fingerprint
Before this fix, it was possible to get a callback after the activity
finishes. This just ensures the operation is a no-op.
Fixes bug
37106041
Test: remove all but last fingerprint and hit back while rotating; check that
Settings doesn't crash.
Change-Id: I99df4f7c06e345d1ed6041a75606b0cc43edb300
Marie Janssen [Fri, 7 Apr 2017 00:58:22 +0000 (00:58 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev am:
b26584cf1a
am:
6f17c0dada
Change-Id: I5eb687e3d5b2c7794157b1bc8503a90f53ced76c
Andrew Zeng [Fri, 7 Apr 2017 00:52:01 +0000 (00:52 +0000)]
Merge "Use MIN_LOCK_PASSWORD_SIZE as min password length."
Marie Janssen [Fri, 7 Apr 2017 00:50:54 +0000 (00:50 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
am:
b26584cf1a
Change-Id: Ifc514b4f3e26f784db246f3fe03fb6ca7eee1cd2
TreeHugger Robot [Fri, 7 Apr 2017 00:42:04 +0000 (00:42 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
Doris Ling [Thu, 6 Apr 2017 21:22:18 +0000 (14:22 -0700)]
Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.
Bug:
36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
Doris Ling [Wed, 5 Apr 2017 23:03:02 +0000 (16:03 -0700)]
Add subtext to Default apps.
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
Daniel Nishi [Thu, 6 Apr 2017 23:46:03 +0000 (23:46 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev am:
b52a341914
am:
11bd2c3084
Change-Id: Ia8ed6a3bbc62bc8ffdaa38d6d5decaf3ba4836a0
Doris Ling [Thu, 6 Apr 2017 23:31:02 +0000 (16:31 -0700)]
Add summary text for Encryption & credential.
Add the static summary to the preference in the xml.
Bug:
36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
Daniel Nishi [Thu, 6 Apr 2017 23:25:10 +0000 (23:25 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
am:
b52a341914
Change-Id: Ie0df09915c2bc3e8c8926e2cec81835a37a7c7b0
Daniel Nishi [Thu, 6 Apr 2017 23:19:17 +0000 (23:19 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 23:18:12 +0000 (23:18 +0000)]
Merge "Move the app_info_storage_title string."
Daniel Nishi [Thu, 6 Apr 2017 23:17:15 +0000 (23:17 +0000)]
Merge "Re-add the option to migrate data back." into oc-dev am:
c660755348
am:
54cadd92d9 -s ours
Change-Id: I16223f007c500dca9fb723d306c337976ad579fa
OSDN Git Service
