OSDN Git Service
Sheng Wang [Fri, 2 Jun 2017 00:57:09 +0000 (00:57 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1 am:
9dbd34a3d9
am:
61a420df95
Change-Id: I0ed31e1c4e8b1a74a2aca2288876ca57f05ca79c
TreeHugger Robot [Fri, 2 Jun 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Don't index High usage summary"
TreeHugger Robot [Fri, 2 Jun 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Restart loader in onResume"
Sheng Wang [Fri, 2 Jun 2017 00:27:56 +0000 (00:27 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1
am:
9dbd34a3d9
Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
Sheng Wang [Fri, 2 Jun 2017 00:25:17 +0000 (00:25 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185
am:
161e3d14e1
Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
TreeHugger Robot [Thu, 1 Jun 2017 23:38:42 +0000 (23:38 +0000)]
Merge "Add strings in battery usage page"
TreeHugger Robot [Thu, 1 Jun 2017 22:57:25 +0000 (22:57 +0000)]
Merge "Add group name into channel summary, if applicable."
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug:
62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
TreeHugger Robot [Thu, 1 Jun 2017 22:46:11 +0000 (22:46 +0000)]
Merge "Update strings for anomaly detection"
Andrew Sapperstein [Thu, 1 Jun 2017 22:28:08 +0000 (22:28 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev am:
fbc9035bcd
am:
0a35757003 -s ours
Change-Id: Icad5a856745ddafc5f79aecd81eceed46aeabb29
Andrew Sapperstein [Thu, 1 Jun 2017 22:17:44 +0000 (22:17 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
am:
fbc9035bcd
Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
TreeHugger Robot [Thu, 1 Jun 2017 22:02:31 +0000 (22:02 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 21:41:38 +0000 (21:41 +0000)]
Merge "Hide saved network preference when there is none."
jackqdyulei [Thu, 1 Jun 2017 21:33:19 +0000 (14:33 -0700)]
Add strings in battery usage page
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time
Bug:
37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27
Matthew Fritze [Thu, 1 Jun 2017 21:29:35 +0000 (21:29 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev am:
7a148b9e09
am:
752b18191b -s ours
Change-Id: I05c487d4a8fc39944065a7f305afb87128e25400
Matthew Fritze [Thu, 1 Jun 2017 21:24:36 +0000 (21:24 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
am:
7a148b9e09
Change-Id: I9ea047489b44bc538033343a6350a5abb8afef63
TreeHugger Robot [Thu, 1 Jun 2017 21:12:10 +0000 (21:12 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
Alison Cichowlas [Tue, 30 May 2017 12:48:59 +0000 (08:48 -0400)]
Add group name into channel summary, if applicable.
Bug:
36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.
Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
Fan Zhang [Thu, 1 Jun 2017 20:34:53 +0000 (20:34 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev am:
e12790e34f
am:
7d190dd69d -s ours
Change-Id: Ib535478ef6de2a75d8675553d0f350f636d12e63
Andrew Sapperstein [Thu, 1 Jun 2017 20:28:37 +0000 (20:28 +0000)]
Merge "Initial search bar implementation." into oc-dev am:
91fe76263f
am:
9448f68171 -s ours
Change-Id: I45f0f3381052d2a57612134cf0ffe45711f50311
Fan Zhang [Thu, 1 Jun 2017 20:28:34 +0000 (20:28 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
am:
e12790e34f
Change-Id: I4a5223a27c98f7ae9422fb017f4206721080890a
TreeHugger Robot [Thu, 1 Jun 2017 20:24:05 +0000 (20:24 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Move BatteryInfo to settings from settingslib"
xudiwen [Thu, 1 Jun 2017 20:02:14 +0000 (20:02 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01 am:
957c4d7720 am:
0ff0487b51
am:
ecfbe17684
Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
Andrew Sapperstein [Thu, 1 Jun 2017 20:01:49 +0000 (20:01 +0000)]
Merge "Initial search bar implementation." into oc-dev
am:
91fe76263f
Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
jackqdyulei [Thu, 1 Jun 2017 20:01:42 +0000 (20:01 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev am:
d4991dc24d
am:
42790ccd84 -s ours
Change-Id: I09c4fdc402133470177817ca4fd713c372be2015
TreeHugger Robot [Thu, 1 Jun 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Add search bar to SearchActivity."
Andrew Sapperstein [Thu, 1 Jun 2017 19:52:06 +0000 (19:52 +0000)]
Merge "Initial search bar implementation." into oc-dev
Fan Zhang [Thu, 1 Jun 2017 19:23:11 +0000 (12:23 -0700)]
Hide saved network preference when there is none.
We already do this when wifi is enabled. This change brings same
behavior when wifi is off.
Change-Id: I44301fe46a6183735f8be71c80cfe719ad0e82b4
Fix:
62094681
Test: runtest --path tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
TreeHugger Robot [Thu, 1 Jun 2017 19:33:27 +0000 (19:33 +0000)]
Merge "Pass component name into SuggestionFeatureProvider"
xudiwen [Thu, 1 Jun 2017 19:09:25 +0000 (19:09 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01 am:
957c4d7720
am:
0ff0487b51
Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
jackqdyulei [Thu, 1 Jun 2017 19:05:44 +0000 (19:05 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
am:
d4991dc24d
Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
xudiwen [Thu, 1 Jun 2017 19:05:23 +0000 (19:05 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01
am:
957c4d7720
Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
TreeHugger Robot [Thu, 1 Jun 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Bluetooth string changes"
xudiwen [Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
am:
2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
TreeHugger Robot [Thu, 1 Jun 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
Treehugger Robot [Thu, 1 Jun 2017 18:51:43 +0000 (18:51 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
Salvador Martinez [Thu, 1 Jun 2017 00:18:23 +0000 (17:18 -0700)]
Move BatteryInfo to settings from settingslib
This CL simply moves BatteryInfo from settingslib to settings and
makes sure the tests still pass. No other changes are made other than
imports or minor changes needed to make sure existing code does not
break.
Test: Robotests still pass
Bug:
38399275
Bug:
38398949
Bug:
38399654
Change-Id: I59803348e2780b7676ccc6c43234a586c184d71f
jackqdyulei [Wed, 31 May 2017 17:22:11 +0000 (10:22 -0700)]
Don't index High usage summary
Because the strings inside are dynamic
Bug:
62069270
Test: RunSettingsRoboTests still pass
Change-Id: I744179bef89cfaff403f9ce65fcfc0f03c04350b
jackqdyulei [Tue, 30 May 2017 21:54:52 +0000 (14:54 -0700)]
Update strings for anomaly detection
Bug:
62069270
Test: Build
Change-Id: I7f5a00cfd39d85a08054e334ace76ebf7898850c
Matthew Fritze [Tue, 30 May 2017 15:36:52 +0000 (08:36 -0700)]
Prevent crash when removing duplicates
The method that crashes is removed in O-DR, and thus
does not need to be merged down.
Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes:
62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Daniel Nishi [Thu, 1 Jun 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev am:
7035a41715
am:
0a8b12a30a
Change-Id: I3f17e10a9aaf011aee587dbe0e36d18a3a27c42f
Daniel Nishi [Thu, 1 Jun 2017 17:42:55 +0000 (17:42 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
am:
7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
Daniel Nishi [Thu, 1 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
Antony Sargent [Thu, 1 Jun 2017 04:23:30 +0000 (21:23 -0700)]
Bluetooth string changes
This includes:
-Title string for device details page
-MAC address string for device details page
Bug:
35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
TreeHugger Robot [Thu, 1 Jun 2017 17:03:04 +0000 (17:03 +0000)]
Merge "Add search index for support dashboard activity."
TreeHugger Robot [Thu, 1 Jun 2017 08:40:39 +0000 (08:40 +0000)]
Merge "Use a common style for custom preference icon layouts"
Kevin Chyn [Thu, 1 Jun 2017 08:25:07 +0000 (08:25 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am:
98b67a4e94
am:
618467daff
Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c
Kevin Chyn [Thu, 1 Jun 2017 08:17:06 +0000 (08:17 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am:
98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 07:25:58 +0000 (07:25 +0000)]
Merge "Update bluetooth strings"
TreeHugger Robot [Thu, 1 Jun 2017 07:11:36 +0000 (07:11 +0000)]
Merge "Add method to calculate last full charge time"
TreeHugger Robot [Thu, 1 Jun 2017 06:45:13 +0000 (06:45 +0000)]
Merge "Remove night display headers and change strings"
TreeHugger Robot [Thu, 1 Jun 2017 06:43:21 +0000 (06:43 +0000)]
Merge "Initial search bar implementation."
Daniel Sheng [Thu, 1 Jun 2017 05:39:00 +0000 (05:39 +0000)]
Merge "Added strings for gesture suggestions"
Kevin Chyn [Thu, 1 Jun 2017 00:11:03 +0000 (17:11 -0700)]
Add onResume to FingerprintEnrollEnrolling
Fixes:
62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/
38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
Fan Zhang [Wed, 31 May 2017 22:40:02 +0000 (15:40 -0700)]
Use a common style for custom preference icon layouts
Change-Id: Ief3bc54f700cb891041adf92846149c6f41caad0
Fix:
35961001
Test: instrumentation test
jackqdyulei [Wed, 31 May 2017 23:17:51 +0000 (16:17 -0700)]
Update bluetooth strings
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string
Bug:
35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
Christine Franks [Wed, 31 May 2017 22:54:31 +0000 (22:54 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev am:
9ef166a578
am:
d974ccb625
Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
Matthew Fritze [Wed, 31 May 2017 22:52:58 +0000 (22:52 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev am:
564d90faf0
am:
6a50c4555c
Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
Christine Franks [Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
am:
9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
Doris Ling [Wed, 31 May 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add new strings to highlight gestures in settings."
Christine Franks [Wed, 31 May 2017 22:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
Matthew Fritze [Wed, 31 May 2017 22:47:27 +0000 (22:47 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
am:
564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
TreeHugger Robot [Wed, 31 May 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
Maurice Lam [Wed, 31 May 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Center align icon and title in choose lock pattern"
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
TreeHugger Robot [Wed, 31 May 2017 21:46:35 +0000 (21:46 +0000)]
Merge "Add method to disable "disable" button in installed app UI"
TreeHugger Robot [Wed, 31 May 2017 21:39:42 +0000 (21:39 +0000)]
Merge "Update user string for battery"
Fan Zhang [Wed, 31 May 2017 19:43:48 +0000 (12:43 -0700)]
Add search index for support dashboard activity.
Change-Id: Ie9cf20316f94454a3d41f76d05b662e398c2c2ea
Fix:
36005923
Test: make RunSettingsRoboTests
TreeHugger Robot [Wed, 31 May 2017 21:14:30 +0000 (21:14 +0000)]
Merge "Update bluetooth strings in settings"
Daniel Sheng [Wed, 31 May 2017 19:16:56 +0000 (12:16 -0700)]
Added strings for gesture suggestions
Bug:
62225100
Test: N/A
Change-Id: I77a328746782a02df7a33c720b4d8f2a193419b3
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug:
37477506
Test: make RunSettingsRoboTests
Maurice Lam [Wed, 31 May 2017 20:30:51 +0000 (13:30 -0700)]
Center align icon and title in choose lock pattern
Test: Manual
Bug:
62225461
Change-Id: I62eb76597f5be7165e0e1047d87d99dbd6f2e33d
Joe Onorato [Wed, 31 May 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev am:
37eb1c580b
am:
98952ced4f
Change-Id: I14df97cb60643605ae0f34642aedc91abb68c475
Doris Ling [Wed, 31 May 2017 18:59:20 +0000 (11:59 -0700)]
Add new strings to highlight gestures in settings.
- add new title and summary strings for language & input settings.
Bug:
62219660
Test: build
Change-Id: I52a62dad73e2468e7acd3ef47b241cfea6046ad8
Joe Onorato [Wed, 31 May 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
am:
37eb1c580b
Change-Id: Ia794a4e1d51a6a0a28b65f9ade1530ca2c79cf90
TreeHugger Robot [Wed, 31 May 2017 19:32:32 +0000 (19:32 +0000)]
Merge "Update updateEmptyView"
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
jackqdyulei [Fri, 26 May 2017 21:38:08 +0000 (14:38 -0700)]
Update bluetooth strings in settings
This cl contains strings used in bluetooth main page and
pairing page
Bug:
35876580
Test: RunSettingsRoboTests
Change-Id: Ied514e50fc2dcf4b5d9ece49159c9e13def1b0f3
Fan Zhang [Wed, 31 May 2017 17:42:19 +0000 (10:42 -0700)]
Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.
Change-Id: I8ea431b52e50e424be55946f70175db5412e2f4a
Merged-In: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix:
38250742
Test: make RunSettingsRoboTests
TreeHugger Robot [Wed, 31 May 2017 19:09:35 +0000 (19:09 +0000)]
Merge "Update summary for Hotspot & Tethering."
Christine Franks [Sat, 27 May 2017 01:23:38 +0000 (18:23 -0700)]
Allow FR in carrier demo mode
Bug:
62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.
Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc
Christine Franks [Thu, 25 May 2017 23:22:00 +0000 (16:22 -0700)]
Remove night display headers and change strings
Bug:
38362741
Test: manual - looks like what was expected
Change-Id: Ied5ebd2b13a23e799488a476cc08d8f5db4c9ff5
Bill Yi [Wed, 31 May 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
76e9bd72f9 -s ours
am:
d8d031701b -s ours
Change-Id: Ie1d77e8c529ff7409f7169cdeb6c3d7511cd8a0b
Fan Zhang [Wed, 31 May 2017 17:42:19 +0000 (10:42 -0700)]
Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.
Change-Id: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix:
38250742
Test: make RunSettingsRoboTests
Bill Yi [Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
76e9bd72f9 -s ours
Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
TreeHugger Robot [Wed, 31 May 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 18:05:15 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Nishi [Wed, 31 May 2017 17:59:04 +0000 (10:59 -0700)]
Fix a bug where cache was double-counted.
Cache was being counted as cache and also as data in the app info page.
This is due to a faulty assumption I made that getDataBytes() and
getCacheBytes() measured distinct areas of storage (in actuality,
getCacheBytes() is a subset of getDataBytes()). This improper assumption
also led to the unit test being incorrect.
Change-Id: I4144d50800f82feaecb7a0a8dff26be3e4f14da8
Fixes:
62182151
Test: Settings robotest & manual
Matthew Fritze [Wed, 31 May 2017 16:38:02 +0000 (09:38 -0700)]
Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes:
36101902
Test: builds :)
Jeff Sharkey [Wed, 31 May 2017 15:07:18 +0000 (15:07 +0000)]
Jeff Sharkey [Wed, 31 May 2017 15:05:30 +0000 (09:05 -0600)]
Merge commit '
47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit
Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13
TreeHugger Robot [Wed, 31 May 2017 14:55:30 +0000 (14:55 +0000)]
Merge "Add related assist-gesture keywords"
Jeff Sharkey [Wed, 31 May 2017 14:48:43 +0000 (14:48 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
am:
552e3c4dba
Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
Bill Yi [Wed, 31 May 2017 14:24:59 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import