OSDN Git Service
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
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
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
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
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
Bill Yi [Fri, 23 Jun 2017 08:39:20 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 08:33:27 +0000 (01:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
daqi [Sat, 17 Jun 2017 07:24:44 +0000 (15:24 +0800)]
Fix PremiumSmsAccess memory leak
[Cause of Defect]
PremiumSmsAccess forget to invoke Session and AppStateSmsPremBridge
release method in the onDestroy callback.
And that would lead to the leak of activity context.
Test: 1. Settings - Apps - Advanced - Special access - Premium SMS access
2. adb shell dumpsys meminfo com.android.settings
3. observe activity object number
4. back to the last page
5. use AS trigger Settings gc several times
6. adb shell dumpsys meminfo com.android.settings
7. observe activity object number to check if the activity number decrease
Change-Id: I359900c16fa866fba94d187a61cf6bebbdd1ed0b
Signed-off-by: daqi <daqi@xiaomi.com>
Android Build Merger (Role) [Fri, 23 Jun 2017 04:30:14 +0000 (04:30 +0000)]
Merge "Count cache in storage categories. am:
b22b85b593 am:
b57a71fe08" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 23 Jun 2017 04:28:49 +0000 (04:28 +0000)]
Count cache in storage categories. am:
b22b85b593
am:
5837a9b98b
Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f
Daniel Nishi [Fri, 23 Jun 2017 04:28:43 +0000 (04:28 +0000)]
Count cache in storage categories. am:
b22b85b593
am:
b57a71fe08
Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128
Daniel Nishi [Fri, 23 Jun 2017 04:19:19 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
Daniel Nishi [Fri, 23 Jun 2017 04:19:16 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
Daniel Nishi [Fri, 23 Jun 2017 00:09:59 +0000 (17:09 -0700)]
Count cache in storage categories.
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).
Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes:
62623731
Test: Settings Unit Test
Fan Zhang [Fri, 23 Jun 2017 01:43:15 +0000 (01:43 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
am:
f964e8c3b2
Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a
TreeHugger Robot [Fri, 23 Jun 2017 01:37:45 +0000 (01:37 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 00:27:26 +0000 (00:27 +0000)]
Merge "Bluetooth: Make notifications local-only am:
1138397336 am:
493a76e087" into oc-dr1-dev-plus-aosp
Marie Janssen [Fri, 23 Jun 2017 00:26:59 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am:
1138397336
am:
493a76e087
Change-Id: Ife7f54253c73bdff35a8ee988d51be8bd4c7ebe1
Marie Janssen [Fri, 23 Jun 2017 00:26:53 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am:
1138397336
am:
0efa2b3427
Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3
Marie Janssen [Fri, 23 Jun 2017 00:22:24 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
Marie Janssen [Fri, 23 Jun 2017 00:22:23 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
Maurice Lam [Thu, 22 Jun 2017 21:44:22 +0000 (21:44 +0000)]
Merge "Tint suggestion icons" into oc-dr1-dev
am:
c1ab582fae
Change-Id: I8ad6d1c3ccd3c759981472cb7119dbb50dc90e99
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Tint suggestion icons" into oc-dr1-dev
Fan Zhang [Tue, 20 Jun 2017 21:53:49 +0000 (14:53 -0700)]
Load regulatory info from /data/misc
Bug:
62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
Fan Zhang [Thu, 22 Jun 2017 19:44:31 +0000 (12:44 -0700)]
Add a flag to enable/disable new device suggestion
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix:
62907886
Test: make RunSettingsRoboTests
Maurice Lam [Thu, 22 Jun 2017 20:02:48 +0000 (20:02 +0000)]
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
am:
cf3130338c
Change-Id: I5ee371963f73c8f645618a12949f545c2f88ca82
TreeHugger Robot [Thu, 22 Jun 2017 19:58:49 +0000 (19:58 +0000)]
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 19:58:02 +0000 (19:58 +0000)]
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
am:
e1eae4f05f
Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6
Doris Ling [Thu, 22 Jun 2017 19:57:20 +0000 (19:57 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev
am:
d7fc071f48
Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc
Maurice Lam [Thu, 22 Jun 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 19:39:08 +0000 (19:39 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev
Salvador Martinez [Thu, 22 Jun 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
am:
ed66c5fcdf
Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584
TreeHugger Robot [Thu, 22 Jun 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 23:14:36 +0000 (16:14 -0700)]
Tint suggestion icons
If the suggestion is marked as isIconTintable, tint the icon with
colorControlNormal.
Test: cd tests/robotests && mma
Bug:
62258845
Change-Id: I2a76181d9b8b4d9fbf496a8fc605cb762bba87c0
Salvador Martinez [Mon, 19 Jun 2017 23:04:17 +0000 (16:04 -0700)]
Fix BatteryInfo using enhanced estimate for charge time
Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.
Test: robotest
Bug:
62738028
Bug:
62873396
Bug:
62784575
Bug:
62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug:
34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit
426903d155a0e9089666736e784d498e6a016845)
Marie Janssen [Thu, 22 Jun 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa am:
620fe71520
am:
3cc4522cbc
Change-Id: I74688eb24e40c7c1a370a9b36dec09b876047011
Marie Janssen [Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa
am:
620fe71520
Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
Marie Janssen [Thu, 22 Jun 2017 15:37:28 +0000 (15:37 +0000)]
Merge "Bluetooth: Make notifications local-only"
am:
348a7085fa
Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
Treehugger Robot [Thu, 22 Jun 2017 15:31:37 +0000 (15:31 +0000)]
Merge "Bluetooth: Make notifications local-only"
Juan Lang [Thu, 22 Jun 2017 14:17:37 +0000 (14:17 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
am:
d392a9bfbb
Change-Id: I5696ba7e3fceb0ef81ea8609b573581b047bb3b7
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 03:17:41 +0000 (20:17 -0700)]
Update CHAR LIMIT for fingerprint dialog
Test: Existing tests pass
Bug:
62401478
Change-Id: I6baf88007c3f61b88603f4d5c1ee52e66e9d54dc
Doris Ling [Thu, 22 Jun 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
am:
ee947e9a31
Change-Id: Iee52408640206b365546614e5e8e6642a0a0d96d
TreeHugger Robot [Thu, 22 Jun 2017 01:33:22 +0000 (01:33 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
Maurice Lam [Wed, 21 Jun 2017 03:00:54 +0000 (20:00 -0700)]
Create add more fingerprint suggestion for setup
Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.
Test: cd tests/robotests && mma
Bug:
62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
Doris Ling [Thu, 22 Jun 2017 00:13:57 +0000 (00:13 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
am:
053e3dcf9f
Change-Id: I833262facb7c027e26fd0507f9bd4f471a11e280
TreeHugger Robot [Wed, 21 Jun 2017 23:59:38 +0000 (23:59 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
Doris Ling [Wed, 21 Jun 2017 18:40:37 +0000 (11:40 -0700)]
Refresh the dashboard UI when swiping away the only suggestion.
In the new suggestion UI, the suggestions are listed inside the
suggestion container instead of individual dashboard items. When there
is only a single suggestion shown, and that is being swiped away, the
actual list for the suggestions will handle the swipe and remove that
list item from the list. However, the top level container will remain
until next time the dashboard list is being refreshed. Explicitly set
the suggestions to null to force refreshing of the dashboard UI.
Change-Id: I37f8c8f5a813a5c56f4f2f46103fdbb66ce97fcd
Fix:
62639824
Test: make RunSettingsRoboTests
Juan Lang [Thu, 11 May 2017 00:26:02 +0000 (17:26 -0700)]
Use SettingsLib's versions of Custom* classes.
Bug:
30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
Bill Yi [Wed, 21 Jun 2017 20:29:57 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours
am:
f6e125b46d -s ours
Change-Id: I4329c03e80a2f9234e8b23a926ecb39e1a3c56bf
Bill Yi [Wed, 21 Jun 2017 20:26:57 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours
am:
a3821d019a -s ours
Change-Id: I2fdc4eb1a34ad7a16a3325cbee96d61434da5f6f
Bill Yi [Wed, 21 Jun 2017 20:23:16 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ibd2297385f91e2bf12e90f4933c785104aa6e153
Bill Yi [Wed, 21 Jun 2017 20:21:34 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
jackqdyulei [Wed, 21 Jun 2017 20:12:53 +0000 (20:12 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
am:
88163b7215
Change-Id: I79b61d5b028dbcf22d8369cef7b92463fd90b498
Doris Ling [Wed, 21 Jun 2017 20:12:41 +0000 (13:12 -0700)]
Add summary text for account sync.
Bug:
62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba
TreeHugger Robot [Wed, 21 Jun 2017 19:55:50 +0000 (19:55 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
Bill Yi [Wed, 21 Jun 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ce043d0f98 -s ours
Change-Id: Ic700813442af82b979b645e465b2d5ac28ac4a74
TreeHugger Robot [Wed, 21 Jun 2017 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Daniel Nishi [Wed, 21 Jun 2017 18:26:22 +0000 (18:26 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev
am:
648e31c283
Change-Id: If1c7ba281f0a959a9efc1e8c04b1cad8260b7020
Daniel Nishi [Wed, 21 Jun 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev
jackqdyulei [Wed, 21 Jun 2017 17:28:35 +0000 (10:28 -0700)]
Increase char limit for "Disconnect"
Bug:
62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf
Lei Yu [Wed, 21 Jun 2017 17:49:50 +0000 (17:49 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
am:
2e34b94817
Change-Id: I986039cb676054b31b41ce54ab3c9c034297721f
Lei Yu [Wed, 21 Jun 2017 17:44:42 +0000 (17:44 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
Matthew Fritze [Wed, 21 Jun 2017 17:42:48 +0000 (17:42 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev
am:
bea9a5d739
Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214
TreeHugger Robot [Wed, 21 Jun 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev
Salvador Martinez [Wed, 21 Jun 2017 17:06:35 +0000 (17:06 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
am:
94d0a9c554
Change-Id: If9b2ac97f41d55cf93dc33bbf129d56dfd9de225