OSDN Git Service
Android Build Merger (Role) [Tue, 1 Aug 2017 18:18:27 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE am:
2f525fbdc5 -s ours am:
f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 1 Aug 2017 18:18:06 +0000 (18:18 +0000)]
Import translations. DO NOT MERGE am:
2f525fbdc5 -s ours
am:
f8c9a63ca6 -s ours
Change-Id: Ia4847676d5300b253b85a91c4f743ee105294065
Bill Yi [Tue, 1 Aug 2017 18:18:03 +0000 (18:18 +0000)]
Import translations. DO NOT MERGE am:
2f525fbdc5 -s ours
am:
23e79be08d -s ours
Change-Id: I16e397981fcc9478506ee08737ae77f1269e20ec
Bill Yi [Tue, 1 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Import translations. DO NOT MERGE
am:
2f525fbdc5 -s ours
Change-Id: Ie4d8ae83b68daefb3f38ee59fa961f8c127e3227
Bill Yi [Tue, 1 Aug 2017 18:14:01 +0000 (18:14 +0000)]
Import translations. DO NOT MERGE
am:
2f525fbdc5 -s ours
Change-Id: I3b6a4cfd61e7757b660657e9d2da7fe521dbf413
Bill Yi [Tue, 1 Aug 2017 18:03:31 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64073208
Change-Id: I9ff6c2aa7d4a499617610046f74bb60b9f58a399
Geoffrey Pitsch [Tue, 1 Aug 2017 14:23:20 +0000 (14:23 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am:
6d62355313
am:
cf83f9dd12
Change-Id: I4ffacf5d6d372659e5d2d5d2a24322a8a58804b9
Geoffrey Pitsch [Tue, 1 Aug 2017 14:16:59 +0000 (14:16 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am:
6d62355313
am:
07052239fd
Change-Id: Id42693f5c0ba902f57c5c30a69ca19dba1d9e340
Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:10 +0000 (14:08 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am:
6d62355313
Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
Geoffrey Pitsch [Tue, 1 Aug 2017 14:07:37 +0000 (14:07 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am:
6d62355313
Change-Id: Iad2c8b60c899314b5089d28b3697f7bfed9013b3
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:18 +0000 (14:00 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 02:48:04 +0000 (02:48 +0000)]
Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am:
0782535daf am:
26e7518f76 -s ours" into oc-mr1-dev-plus-aosp
jackqdyulei [Tue, 1 Aug 2017 02:47:35 +0000 (02:47 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev am:
0782535daf -s ours
am:
72054d6db3 -s ours
Change-Id: Iba1f261e54ea5f47c99f7f29b507d9f8beec3262
jackqdyulei [Tue, 1 Aug 2017 02:47:35 +0000 (02:47 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev am:
0782535daf
am:
26e7518f76 -s ours
Change-Id: I818465ad778f1e4d1ef96f226590889cf9d2aae7
jackqdyulei [Tue, 1 Aug 2017 02:44:11 +0000 (02:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev
am:
0782535daf
Change-Id: I9f9337b3abc97652a1105c001fbe41d15b3e262d
jackqdyulei [Tue, 1 Aug 2017 02:44:09 +0000 (02:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev
am:
0782535daf -s ours
Change-Id: Ic4e422d73f822b6f0a11ad624bd67e79ac1b9d73
Jeff Davidson [Tue, 1 Aug 2017 02:40:48 +0000 (02:40 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am:
cd4fbd90e7
am:
470c87cfea
Change-Id: I0e8b1593be90aedbe54d8f04bf39cc6d537756fb
TreeHugger Robot [Tue, 1 Aug 2017 02:37:37 +0000 (02:37 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev
Jeff Davidson [Tue, 1 Aug 2017 02:35:01 +0000 (02:35 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am:
cd4fbd90e7
am:
cebb6a4f9c
Change-Id: I083d1356461b78dec175a770643a1d52949f93e4
Jeff Davidson [Tue, 1 Aug 2017 02:32:04 +0000 (02:32 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am:
cd4fbd90e7
Change-Id: I65f2baef41c86ebcc4d6f427fa806441123621f0
Jeff Davidson [Tue, 1 Aug 2017 02:32:04 +0000 (02:32 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am:
cd4fbd90e7
Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
TreeHugger Robot [Tue, 1 Aug 2017 02:25:02 +0000 (02:25 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
Fan Zhang [Tue, 1 Aug 2017 01:23:27 +0000 (01:23 +0000)]
Merge "Update icons to match quick setting" into oc-mr1-dev
am:
687cdfb5ee
Change-Id: I2e986c8c5b1cfbdd3ee71016f46fd3084d9c35f1
TreeHugger Robot [Tue, 1 Aug 2017 01:14:35 +0000 (01:14 +0000)]
Merge "Update icons to match quick setting" into oc-mr1-dev
Matthew Fritze [Tue, 1 Aug 2017 01:01:35 +0000 (01:01 +0000)]
Merge "Revert "resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
am:
21b22f0154
Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
Matthew Fritze [Tue, 1 Aug 2017 01:01:12 +0000 (01:01 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am:
57992394bf -s ours
am:
da3462e366 -s ours
Change-Id: Idddc9f0586e7f7ab625087bb4e4a0ab39f9296bc
Matthew Fritze [Tue, 1 Aug 2017 00:59:44 +0000 (00:59 +0000)]
Merge "Revert "resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
Matthew Fritze [Tue, 1 Aug 2017 00:56:47 +0000 (00:56 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am:
57992394bf
am:
9245af8ce5 -s ours
Change-Id: I096949f7c7122b1aa2ca6b9ae6f556447c2ac59d
Matthew Fritze [Tue, 1 Aug 2017 00:51:34 +0000 (00:51 +0000)]
Revert "resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev"
This reverts commit
a504291eefc8b5d4d8fa5dd4416aa6e5118f3f60.
Reason for revert: <Build breaking>
Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
Matthew Fritze [Tue, 1 Aug 2017 00:45:29 +0000 (00:45 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am:
57992394bf
Change-Id: Ifedaad6a1a9fd628daef1d369009b3ddad2acee5
Matthew Fritze [Tue, 1 Aug 2017 00:45:29 +0000 (00:45 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am:
57992394bf -s ours
Change-Id: I0e4e476dc7fb83b962ba2511ccc68a0c54d54a33
Fan Zhang [Tue, 1 Aug 2017 00:41:26 +0000 (00:41 +0000)]
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
am:
5e9b138691
Change-Id: Ie4577a62d3bd9219dd80cd22857b2eccdd9b410f
TreeHugger Robot [Tue, 1 Aug 2017 00:38:45 +0000 (00:38 +0000)]
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 00:37:26 +0000 (00:37 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
Matthew Fritze [Tue, 1 Aug 2017 00:35:20 +0000 (00:35 +0000)]
resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev
am:
a504291eef
Change-Id: Ia3de4132ddd615ee5f148d1871f170cb36023eda
Matthew Fritze [Tue, 1 Aug 2017 00:28:57 +0000 (00:28 +0000)]
Merge "resolve merge conflicts of
a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
jackqdyulei [Tue, 25 Jul 2017 00:43:23 +0000 (17:43 -0700)]
Add shadow and wrapper classes
These classes are used for accessibility service. Also
add a new Availablity type.
Bug:
62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
Merged-In: Ia2ff72dd04fd99b17809822907746c2411cecb62
Matthew Fritze [Tue, 1 Aug 2017 00:24:17 +0000 (17:24 -0700)]
resolve merge conflicts of
a03a707f74 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
Eric Schwarzenbach [Tue, 1 Aug 2017 00:17:31 +0000 (00:17 +0000)]
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
am:
5e888ad7b6
Change-Id: I8e6852561bba50ed44d17f52099ebf82becd5433
Matthew Fritze [Tue, 1 Aug 2017 00:10:24 +0000 (17:10 -0700)]
resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
TreeHugger Robot [Tue, 1 Aug 2017 00:02:38 +0000 (00:02 +0000)]
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 23:52:47 +0000 (23:52 +0000)]
Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b am:
c65e873d3e -s ours" into oc-mr1-dev-plus-aosp
jackqdyulei [Mon, 31 Jul 2017 23:52:23 +0000 (23:52 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b -s ours
am:
f1dfb105cd -s ours
Change-Id: I08f20e90020bfc6b3a1f85b104f8c800c9336c87
jackqdyulei [Mon, 31 Jul 2017 23:52:23 +0000 (23:52 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b
am:
c65e873d3e -s ours
Change-Id: If907662fdbfa21593960b0cd2910271df14766ed
Matthew Fritze [Mon, 31 Jul 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
am:
9feab7a8a5
Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5
jackqdyulei [Mon, 31 Jul 2017 23:49:11 +0000 (23:49 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
am:
ca24d0435b -s ours
Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e
jackqdyulei [Mon, 31 Jul 2017 23:49:07 +0000 (23:49 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
am:
ca24d0435b
Change-Id: Idfa84fd3c07b228ddc689244b7d33ca66463d25f
jackqdyulei [Mon, 31 Jul 2017 23:48:51 +0000 (23:48 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev
am:
1b2408433a
Change-Id: If0839d6ae74defedaa3c8dcf20fb80c1cccab46e
TreeHugger Robot [Mon, 31 Jul 2017 23:48:02 +0000 (23:48 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
Matthew Fritze [Mon, 31 Jul 2017 23:45:31 +0000 (23:45 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
am:
2972b5c992
Change-Id: I3936a622769dbb315c9f191982cd5b74ae1c7564
TreeHugger Robot [Mon, 31 Jul 2017 23:44:43 +0000 (23:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:42:49 +0000 (23:42 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:35:29 +0000 (23:35 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
Matthew Fritze [Mon, 31 Jul 2017 16:44:57 +0000 (09:44 -0700)]
Fix DataUsageSummary non-indexable keys
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Manual merge for: ag/
2631595
Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes:
64193449
Test: robotests
Matthew Fritze [Mon, 31 Jul 2017 16:44:57 +0000 (09:44 -0700)]
Fix DataUsageSummary non-indexable keys
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Change-Id: I2097a3ac4ffd714b60299c07b29c81f246e414eb
Merged-In: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes:
64193449
Test: robotests
Fan Zhang [Mon, 31 Jul 2017 19:06:31 +0000 (12:06 -0700)]
Update icons to match quick setting
Change-Id: I704fd31cfb48a32530644ceafdd750bbc9adbd0e
Fix:
62658839
Test: visual
Android Build Merger (Role) [Mon, 31 Jul 2017 19:34:15 +0000 (19:34 +0000)]
Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e am:
e9216ccbd3" into oc-mr1-dev-plus-aosp
Alex Kulesza [Mon, 31 Jul 2017 19:33:57 +0000 (19:33 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e
am:
e9216ccbd3
Change-Id: I97720a853f9d5fde41c2920ced45bbd4079bae68
Alex Kulesza [Mon, 31 Jul 2017 19:33:55 +0000 (19:33 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e
am:
b76fe783e0
Change-Id: I1f56ef0bd997293c0f1912abc2c5fc193c060684
jackqdyulei [Thu, 27 Jul 2017 21:44:58 +0000 (14:44 -0700)]
Use package from sipper if default is null
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.
This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null
Bug:
64127162
Test: RunSettingsRoboTests
Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
Merged-In: I5d21afca17f177817976758c28ed86b3a10e95eb
Alex Kulesza [Mon, 31 Jul 2017 19:30:16 +0000 (19:30 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am:
8fd9c28b7e
Change-Id: I8a24c0d388524c34d19a2f1bfd0e8f53b6c9304c
Alex Kulesza [Mon, 31 Jul 2017 19:30:16 +0000 (19:30 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am:
8fd9c28b7e
Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:51 +0000 (19:28 +0000)]
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7 am:
56538f1775" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:45 +0000 (19:28 +0000)]
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7 am:
1b62cfb973" into oc-mr1-dev-plus-aosp
Fan Zhang [Mon, 31 Jul 2017 19:28:33 +0000 (19:28 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7
am:
56538f1775
Change-Id: Id3e5d86f60da922dcdbfa83e042b8442a674f0c7
Fan Zhang [Mon, 31 Jul 2017 19:28:28 +0000 (19:28 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7
am:
1b62cfb973
Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:26 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
b3a488c40c" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:21 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
68af5f3a5d" into oc-mr1-dev-plus-aosp
jackqdyulei [Mon, 31 Jul 2017 19:27:56 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
b3a488c40c
Change-Id: Iced9212fa792abc6d24c68e3177babb8c61b9bbb
jackqdyulei [Mon, 31 Jul 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
68af5f3a5d
Change-Id: I24a1e496688277428b680eaa0a66dd12e0eac3d3
jackqdyulei [Mon, 31 Jul 2017 19:27:34 +0000 (19:27 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
am:
8be9d6519f
Change-Id: I6755b14b62b9ec8958ce2aa7e99b3faa4fbb7aa7
Fan Zhang [Mon, 31 Jul 2017 19:27:13 +0000 (19:27 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
am:
48d54ff2f6
Change-Id: Ieb1c678c66781341c5ab703ed66412508006afe3
TreeHugger Robot [Mon, 31 Jul 2017 19:19:03 +0000 (19:19 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
Fan Zhang [Mon, 31 Jul 2017 19:12:11 +0000 (19:12 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am:
9064072ed7
Change-Id: Ic4bb153fc670441f3f1a04be40e56d59d31f4275
jackqdyulei [Mon, 31 Jul 2017 19:11:31 +0000 (19:11 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: I9dcac73b1360471f4357ef75201b49c6d5031033
Fan Zhang [Mon, 31 Jul 2017 19:09:10 +0000 (19:09 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am:
9064072ed7
Change-Id: I8aec2dc4de1ec18375ce3af177f1c9769499f8e3
jackqdyulei [Mon, 31 Jul 2017 19:08:31 +0000 (19:08 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: Id708356c38b10789974e35193c1d71dc0c9fdf34
TreeHugger Robot [Mon, 31 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:56:02 +0000 (18:56 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:55:40 +0000 (18:55 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
Ajay Nadathur [Mon, 31 Jul 2017 18:30:57 +0000 (18:30 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
am:
9b89fb0080
Change-Id: I76719d69ebf0fa79e047da425de297422693f512
Ajay Nadathur [Mon, 31 Jul 2017 18:19:12 +0000 (18:19 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
Geoffrey Pitsch [Fri, 28 Jul 2017 19:09:51 +0000 (15:09 -0400)]
AOD setting availability depends on other user settings
Bug:
62918778
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Change-Id: Id6f1ad580cf5caace82a1bfa85e85b98f134f9d6
Android Build Merger (Role) [Mon, 31 Jul 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
5faa5ab6ea" into oc-mr1-dev-plus-aosp
Maurice Lam [Mon, 31 Jul 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
5faa5ab6ea
Change-Id: Id18996a7427d2aedce6b24494e84adf5468dd496
Maurice Lam [Mon, 31 Jul 2017 17:44:35 +0000 (17:44 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
7c5fc6737c
Change-Id: Ic27b1772351d5e893b2c8ebd3ada4fe2a2bb1e20
Maurice Lam [Mon, 31 Jul 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617
Maurice Lam [Mon, 31 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3
Maurice Lam [Mon, 31 Jul 2017 17:35:07 +0000 (17:35 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
Pankaj Kanwar [Mon, 31 Jul 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
am:
492c9f4d16
Change-Id: I3d05092be28d9fc527e882464e117837242143b3
Pankaj Kanwar [Mon, 31 Jul 2017 17:09:00 +0000 (17:09 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
Matthew Fritze [Mon, 31 Jul 2017 15:18:20 +0000 (08:18 -0700)]
Add INTENT_ONLY as a ResultPayload Availibility
Test: robotests
Bug:
64165583
Change-Id: I1bb8fd3f331c8b8aabda55afe329471a9c5ef0c9
Alex Kulesza [Sun, 30 Jul 2017 22:11:24 +0000 (18:11 -0400)]
Fixing bug in UsageGraph rendering.
The calculateLocalPaths() method of UsageGraph converts a set of paths
in (milliseconds, percent) coordinates into the actual pixel values that
will be used for drawing. For the most part this is a one to one
process, but not always: input points that are too closely spaced to
draw accurately are skipped. The last point in the path, however, is
never skipped, in order to ensure that the graph ends at the correct
location.
The previous implementation of this method had a bug: the y-coordinates
of points that were skipped would be stored indefinitely (in the local
variable pendingYLoc) and then added back at the very end of the path
(under the condition i == mPaths.size() - 1 && pendingYLoc !=
PATH_DELIM). Under the right conditions, this led to the strange uptick
at the end of the graph seen in the associated bug.
This CL fixes the problem and attempts to make the logic slightly
clearer. It also adds tests, one of which (_similarPointMiddle) fails
for the previous code.
In more detail, previously pendingXLoc was used to hold the last x
coordinate seen, while pendingYLoc was used to hold the last *skipped* y
coordinate, or PATH_DELIM otherwise. The difference between these was
somewhat subtle and hard to understand from a quick read of the code,
and there was a bug: pendingYLoc never got reset to PATH_DELIM even if
later points were added. In this CL I have removed the pendingLoc
variables in favor of a single lx/ly pair, which always holds the local
coordinates of the most recent point, and I added an explicit boolean
skippedLastPoint to track whether the point (lx, ly) has already been
added or was skipped.
Bug:
64065296
Test: make RunSettingsRoboTests
Change-Id: I45ccffea1280d851bfae5143c2e84d188e133731
Fan Zhang [Sat, 29 Jul 2017 00:21:49 +0000 (00:21 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
d58a499c02
Change-Id: Ia15be666f61be4cb3a2ba503242343384b037484
Fan Zhang [Sat, 29 Jul 2017 00:20:50 +0000 (00:20 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
4d5172bfeb
Change-Id: I8fec7ef3502df99ccf08731ad7a5547f13e643ea
Fan Zhang [Sat, 29 Jul 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: Idf6df51c8c2b4f765b370f70c8f427a261d4d1bb
Fan Zhang [Sat, 29 Jul 2017 00:16:22 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5
Fan Zhang [Sat, 29 Jul 2017 00:10:10 +0000 (00:10 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
jackqdyulei [Tue, 25 Jul 2017 00:43:23 +0000 (17:43 -0700)]
Add shadow and wrapper classes
These classes are used for accessibility service. Also
add a new Availablity type.
Bug:
62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
OSDN Git Service
