OSDN Git Service
jackqdyulei [Wed, 28 Jun 2017 19:45:17 +0000 (19:45 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev
am:
9a30ceab83
Change-Id: I3e1b14434ae00357f0193bb917469319a212b155
jackqdyulei [Wed, 28 Jun 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev
am:
923f50fce6
Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e
TreeHugger Robot [Wed, 28 Jun 2017 19:38:20 +0000 (19:38 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 19:37:40 +0000 (19:37 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 18:05:34 +0000 (18:05 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev
am:
a6b24388fc
Change-Id: I2f1e1b65a5d7583ff76d77d3923df5ad7e1e652e
jackqdyulei [Wed, 28 Jun 2017 17:57:48 +0000 (17:57 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
am:
d6df3b3d00
Change-Id: I3ca5d821c33860f35d7fd37c0ddb92516095d099
Lei Yu [Wed, 28 Jun 2017 17:54:59 +0000 (17:54 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:54:20 +0000 (17:54 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am:
451b7edfd7
Change-Id: I609e926c481e991d4039e42d0872ebcfd218679b
TreeHugger Robot [Wed, 28 Jun 2017 17:53:30 +0000 (17:53 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 17:44:16 +0000 (17:44 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev
am:
b365594242
Change-Id: I86d464edb6c4cf00e8e5062ef42b2717947f747a
TreeHugger Robot [Wed, 28 Jun 2017 17:39:08 +0000 (17:39 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev
jackqdyulei [Tue, 27 Jun 2017 01:40:49 +0000 (18:40 -0700)]
Update the UI for battery header
1. Make battery icon align to the end and make text layout
take all the other space.
2. Update the spec based on red line.
Bug:
63037934
Test: Screenshot
Change-Id: I1adbf5ce3e54712cbdc276db2357c7a24b48fe65
jackqdyulei [Wed, 28 Jun 2017 17:16:34 +0000 (17:16 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
am:
7ea8ecdae1
Change-Id: Ie6b814cf75ab555a94f2eb204499d10ae7a4cb0e
TreeHugger Robot [Wed, 28 Jun 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 15:38:23 +0000 (08:38 -0700)]
Update string: Gesture setting title
Change-Id: Ib73e300cb4b809dcc1da594ac6f84d9d020aeac9
Fix:
36685646
Test: visual
Doris Ling [Wed, 28 Jun 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
am:
c074c1c8fe
Change-Id: Ibe3d07e72916fd45c1959e4dc194040b5bed3d17
TreeHugger Robot [Wed, 28 Jun 2017 01:41:32 +0000 (01:41 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev
am:
a2c3828ede
Change-Id: I169e01d0fbcbe5fa85710daec366e6025e890098
jackqdyulei [Wed, 28 Jun 2017 00:31:09 +0000 (17:31 -0700)]
Hide the IDLE in "app list"
Also don't smear it.
Bug:
62423075
Test: RunSettingsRoboTests
Change-Id: I74072f9dde0dcf7b9a4abb05b86fe2102b618d6a
Kevin Chyn [Wed, 28 Jun 2017 00:29:36 +0000 (00:29 +0000)]
Assist gesture settings should reflect assistant eligibility/preferences
am:
1b44a87987
Change-Id: Ifebce52e57590839770e2ea46eadb9e99abe5673
TreeHugger Robot [Wed, 28 Jun 2017 00:28:58 +0000 (00:28 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev
jackqdyulei [Tue, 27 Jun 2017 22:59:35 +0000 (15:59 -0700)]
Fix the getForegroundActivityTotalTimeMs
It should return milliseconds, not microseconds time
Bug:
63073847
Test: RunSettingsRoboTests
Change-Id: Ib7ddb947646062fc50a40d300829389e0ac401ee
jackqdyulei [Tue, 20 Jun 2017 17:09:04 +0000 (10:09 -0700)]
Add location check action for bt anomaly
This cl adds action to turn off location permission for both
ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION by using API
in RuntimePermissionPresenter
Bug:
36921532
Test: runtest -x LocationCheckActionTest
Change-Id: Ibe1e2908bd745a137d92a70a8432e9f866c1be61
Kevin Chyn [Sat, 24 Jun 2017 01:01:06 +0000 (18:01 -0700)]
Assist gesture settings should reflect assistant eligibility/preferences
Fixes:
37707753
Fixes:
62843146
Test: manual testing of settings && make -j RunSettingsRoboTests
Change-Id: I5e606686a03960e5cfe1df2f77c48d6ece9c363a
Doris Ling [Tue, 27 Jun 2017 20:56:32 +0000 (13:56 -0700)]
Fix crash when initializing Settings suggestions.
The dashboard spacer has been removed, but the remaining indexing is not
modified correspondingly, which results in mismatched dashboard types.
Set the dashboard header position back to 0.
Change-Id: I732c4ada556d5d4325e357b8325f66ded5cbe952
Fix:
63052534
Test: make RunSettingsRoboTests
jackqdyulei [Tue, 27 Jun 2017 20:49:17 +0000 (13:49 -0700)]
Hide the summary for app in PowerUsageAdvanced
Bug:
62032053
Test: RunSettingsRoboTests
Change-Id: I83fdd20ef040d102b5d5210a10a810c119f5cf44
jackqdyulei [Tue, 27 Jun 2017 00:54:09 +0000 (17:54 -0700)]
Add quickUpdate method to BatteryHeaderPrefCtrl
This cl adds a method called quickUpdateHeaderPreference, which will
update the following items immediately without waiting for the
BatteryInfo:
1. Battery level
2. Battery charging status(whether to show lighting bolt)
3. Clear the charging summary
Note: this cl doesn't optimize the BatteryInfo loading time.
This cl also rename "TimeText" to "BatteryPercentText" because in
new UI that textview is used to display battery percentage.
Bug:
63029231
Test: RunSettingsRoboTests
Change-Id: I8cc886b35e937d73b46e47e303ff0994ccdcb61c
Bill Yi [Tue, 27 Jun 2017 20:21:25 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE am:
8e132ce53c -s ours
am:
38b7d50a49 -s ours
Change-Id: I9f2d7d683482701ef2a26cf2d03be8bdba8fa079
Bill Yi [Tue, 27 Jun 2017 20:15:40 +0000 (20:15 +0000)]
Import translations. DO NOT MERGE am:
8e132ce53c -s ours
am:
7c952faa77 -s ours
Change-Id: Ib5bf7b801f9c5df19fd8c7ae070f4fe760356a3f
Bill Yi [Tue, 27 Jun 2017 20:08:19 +0000 (20:08 +0000)]
Import translations. DO NOT MERGE
am:
8e132ce53c -s ours
Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac
Bill Yi [Tue, 27 Jun 2017 20:06:53 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
98bbb157a9 -s ours
Change-Id: I65f40eb6eacfc157266ce57420bc9a1b6f508a6d
Bill Yi [Tue, 27 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am:
8e132ce53c -s ours
Change-Id: I1546d616bc8d0344d9538cdb0c5fb80b3454105a
TreeHugger Robot [Tue, 27 Jun 2017 19:52:22 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Tue, 27 Jun 2017 19:47:06 +0000 (12:47 -0700)]
Trim search query when initializing installed app searcher.
Change-Id: I502185d4b497b2edac32e4a8368be76d13b68259
Fix:
62885439
Test: make RunSettingsRoboTests
Sean Stout [Tue, 27 Jun 2017 18:10:15 +0000 (18:10 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev
am:
2b0ea1c710
Change-Id: I1431c67495c1c49dd727241a9a0993b78b053960
Sean Stout [Tue, 27 Jun 2017 18:04:28 +0000 (18:04 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev
Andrew Sapperstein [Tue, 27 Jun 2017 17:02:58 +0000 (17:02 +0000)]
Merge "Search results page polish" into oc-dr1-dev
am:
692a4b5514
Change-Id: I9953971cfaa2c78b2be9fbd027f7cdb029bbb9c1
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Search results page polish" into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 07:26:26 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
Bill Yi [Tue, 27 Jun 2017 07:20:56 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I032ef2ee9e18202c2b114497577e8fd770ec6775
Auto-generated-cl: translation import
Kevin Chyn [Tue, 27 Jun 2017 03:34:30 +0000 (03:34 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev
am:
63e36128e6
Change-Id: I05d1d9129892ebf1049f771ebc2404bafee4d60a
TreeHugger Robot [Tue, 27 Jun 2017 03:28:41 +0000 (03:28 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev
Andrew Sapperstein [Tue, 27 Jun 2017 02:35:15 +0000 (02:35 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev
am:
3b7ed7ae65
Change-Id: I85a67a54a79123db510cebdbc04e06cb6dfb420e
TreeHugger Robot [Tue, 27 Jun 2017 02:28:24 +0000 (02:28 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
am:
fbfca43e6e
Change-Id: Ia7de9aba909a00bb2bf9acd01d897fcedcdfb4c2
Maurice Lam [Tue, 27 Jun 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
am:
b97f91c971
Change-Id: Iea6dc3f9e7777b750203c36997b75c524f3699ea
Maurice Lam [Tue, 27 Jun 2017 01:16:46 +0000 (01:16 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
am:
624212f43c
Change-Id: I90b4d7d57a7dc3bca86f46b34b0f9af2b78ea574
Maurice Lam [Tue, 27 Jun 2017 01:16:16 +0000 (01:16 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
am:
a102714c19
Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b
Maurice Lam [Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:36 +0000 (01:10 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:22 +0000 (01:10 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:09 +0000 (01:10 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
Andrew Sapperstein [Mon, 26 Jun 2017 01:55:57 +0000 (18:55 -0700)]
Search results page polish
Changes made:
- up button added and in correct place
- text color correct when entering query
- query text aligned with results
- grey background around searchbar
Fixes:
37477506
Test: robotests
Change-Id: Ieb135f81f684032f3d5e4102304e617088c88117
Fan Zhang [Mon, 26 Jun 2017 22:22:30 +0000 (22:22 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev
am:
124232d6fa
Change-Id: I0d5f9f945437312a82a9ced59988d8b653088d6c
daqi [Mon, 26 Jun 2017 22:20:53 +0000 (22:20 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours am:
34fe9136c6
am:
96e566a68c
Change-Id: I9bff0585afa8cf2675479356edaf40b4bc81794a
daqi [Mon, 26 Jun 2017 22:18:38 +0000 (22:18 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours
am:
34fe9136c6
Change-Id: I01c8d25555d6a71e552137d74a0b500d79df7e87
TreeHugger Robot [Mon, 26 Jun 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev
daqi [Mon, 26 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
am:
31a2f413f8 -s ours
Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912
Treehugger Robot [Mon, 26 Jun 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
Kevin Chyn [Mon, 26 Jun 2017 20:30:56 +0000 (20:30 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
am:
0e393d4163
Change-Id: I3bc791c4d31d78de761eda608c26450d9940f11d
jackqdyulei [Mon, 26 Jun 2017 20:30:26 +0000 (20:30 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
am:
1eb2f15339
Change-Id: I9a1e1f78b34e989a1e56a0e43bf2f40df10a35eb
TreeHugger Robot [Mon, 26 Jun 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 20:22:25 +0000 (20:22 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
jackqdyulei [Mon, 26 Jun 2017 20:01:22 +0000 (20:01 +0000)]
Merge "Hide misc in battery settings" into oc-dr1-dev
am:
da45ba8c9e
Change-Id: Idb9d205dec2db148c4832266716da565eaf3cf73
TreeHugger Robot [Mon, 26 Jun 2017 19:52:53 +0000 (19:52 +0000)]
Merge "Hide misc in battery settings" into oc-dr1-dev
Antony Sargent [Mon, 26 Jun 2017 19:49:16 +0000 (19:49 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
am:
ee55927bd4
Change-Id: Ibc1dbef4dac9d5830aee7cc1a70ccb70333d32cf
TreeHugger Robot [Mon, 26 Jun 2017 19:35:04 +0000 (19:35 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
Fan Zhang [Mon, 26 Jun 2017 18:37:12 +0000 (11:37 -0700)]
Update icon for language settings
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix:
37929875
Test: visual
jackqdyulei [Mon, 26 Jun 2017 17:36:05 +0000 (10:36 -0700)]
Hide misc in battery settings
Hide it in any condition:
1. both in app usage list and device usage list
2. in all targets(i.e. user, userdebug..)
Bug:
62422405
Test: RunSettingsRoboTests
Change-Id: I36bd043942ce7e2353163868bf6d86f422f8e7ee
Andrew Sapperstein [Sun, 25 Jun 2017 22:18:46 +0000 (15:18 -0700)]
Dashboard search bar polish
Various tweaks to match redlines:
- background is now grey all the time
- the search icon is aligned with the other icons
- the title text is primary colored instead of accent colored
- the background of search bar doesn't scroll anymore
Deletes a bunch of logic to add an initial view that would be
colored based on the first view. It never quite worked right.
Now it's consistent and never moves.
Bug:
37477506
Fixes:
62267378
Fixes:
62379978
Fixes:
62361213
Test: robotests
Change-Id: Iddfd45a64a0a8d0365397a207889d7225d1ebb70
Merged-In: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
Antony Sargent [Fri, 16 Jun 2017 20:17:39 +0000 (13:17 -0700)]
Add a rename dialog for paired Bluetooth devices
This adds an icon to the paired device details page which users can
click on to bring up a dialog for changing the display name for that
device.
We already had a dialog for changing the advertised name of the local
Bluetooth adapter that's used on the main Bluetooth settings page, so
I've made that abstract and created two new subclasses to encapsulate
the slight differences for this use case.
Bug:
62535241
Test: make RunSettingsRoboTests
Change-Id: I1c407f276e12aedf066a336e24b4ccd16d67c4df
Andrew Sapperstein [Sun, 25 Jun 2017 23:12:44 +0000 (23:12 +0000)]
Remove logic for adding a search icon to action bar.
am:
a2dd9978d4
Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c
Andrew Sapperstein [Sun, 25 Jun 2017 20:51:08 +0000 (13:51 -0700)]
Remove logic for adding a search icon to action bar.
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.
Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes:
62230804
Bug:
37477506
Test: robotests
Kevin Chyn [Sat, 24 Jun 2017 21:16:47 +0000 (14:16 -0700)]
Remove unnecessary functions from AssistGestureFeatureProvider
Fixes:
62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
Andrew Sapperstein [Sat, 24 Jun 2017 04:54:51 +0000 (04:54 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
am:
74a350f9c9
Change-Id: I5f90f5dc56765ab16e9bc6879fe84d3fe31ce0df
Jack Yu [Sat, 24 Jun 2017 04:47:53 +0000 (04:47 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
am:
698dc94151
Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38
Kevin Chyn [Wed, 21 Jun 2017 01:33:40 +0000 (18:33 -0700)]
Fix assist gesture settings summary
Fixes:
62841640
Test: make -j RunSettingsRoboTests && manual testing of settings
Merged-In: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Maurice Lam [Sat, 24 Jun 2017 02:15:06 +0000 (19:15 -0700)]
Rename buttons in lock screen setup
- "Continue" in choose lock flows are renamed to "Next"
- "Done" in fingerprint enroll finish screen is renamed to "Next"
during setup flow.
Test: Manual
Bug:
62839648
Change-Id: I3ea77b759b654d7c1da1f7b545781c9dfd74caa3
Maurice Lam [Sat, 24 Jun 2017 01:55:50 +0000 (18:55 -0700)]
Update skip button label to "Do it later"
Test: Manual
Bug:
62839648
Change-Id: I3616fb8095eb1ca77798d45730a1ffcda8f542a4
Maurice Lam [Sat, 24 Jun 2017 01:48:13 +0000 (18:48 -0700)]
Add skip button to fingerprint enrolling screen
Test: Manual
Bug:
62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
Maurice Lam [Sat, 24 Jun 2017 00:47:23 +0000 (17:47 -0700)]
Update buttons in FP find sensor
Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.
Test: cd tests/robotests && mma
Bug:
62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
TreeHugger Robot [Fri, 23 Jun 2017 23:44:47 +0000 (23:44 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
Jack Yu [Fri, 23 Jun 2017 23:13:50 +0000 (23:13 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
jackqdyulei [Fri, 23 Jun 2017 21:33:02 +0000 (21:33 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
am:
9463219048
Change-Id: Iab042eb8275c05f4a9cb6c222c3bfe3279582669
Andrew Sapperstein [Fri, 23 Jun 2017 21:32:22 +0000 (14:32 -0700)]
Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
Instead, this decision is being handled via AnomalyDetectionPolicy.
Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes:
62871629
Test: robotests
TreeHugger Robot [Fri, 23 Jun 2017 21:28:32 +0000 (21:28 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
jackqdyulei [Fri, 23 Jun 2017 20:52:36 +0000 (13:52 -0700)]
Update the chargeLabel when battery level is full
Before this cl, it will show "100% - charging", which doesn't make
sense. This cl removes "- charging", and only show "100%" in this
case
Bug:
62559153
Test: RunSettingsRoboTests
Change-Id: Id124fe4098e21b4a69c4a7d3d522fa227faab65d
Maurice Lam [Fri, 23 Jun 2017 20:48:45 +0000 (20:48 +0000)]
Add fingerprint backup message
am:
d793590678
Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e
Maurice Lam [Thu, 22 Jun 2017 00:09:33 +0000 (17:09 -0700)]
Add fingerprint backup message
Test: Manual
Bug:
62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
jackqdyulei [Thu, 22 Jun 2017 17:24:27 +0000 (10:24 -0700)]
Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);
Bug:
62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
Fan Zhang [Fri, 23 Jun 2017 17:34:00 +0000 (17:34 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
am:
e28599049e
Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c
TreeHugger Robot [Fri, 23 Jun 2017 17:27:57 +0000 (17:27 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 13:00:52 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours
am:
bbeaae705d -s ours
Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824
Bill Yi [Fri, 23 Jun 2017 13:00:07 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6300674d27 -s ours
Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c
Bill Yi [Fri, 23 Jun 2017 12:48:51 +0000 (12:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours
am:
5386943cf2 -s ours
Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab
Bill Yi [Fri, 23 Jun 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
TreeHugger Robot [Fri, 23 Jun 2017 12:32:31 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 12:29:05 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
TreeHugger Robot [Fri, 23 Jun 2017 12:23:14 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
OSDN Git Service
