OSDN Git Service
Andrew Sapperstein [Thu, 29 Jun 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
db72caf3ea
am:
8e1c3b9b1b
Change-Id: I2990a108691e8123df1eeefc50f650d0b8d318a6
Andrew Sapperstein [Thu, 29 Jun 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
db72caf3ea
Change-Id: I8893ca932f1cfcb20d72609eaf994bc7ddb9f143
Andrew Sapperstein [Thu, 29 Jun 2017 23:27:24 +0000 (23:27 +0000)]
Merge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 22:38:55 +0000 (15:38 -0700)]
Fix robotests.
Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes:
63141368
Test: robotest
Fan Zhang [Thu, 29 Jun 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Change the way we generate stable id for DashboardSummary"
Lei Yu [Thu, 29 Jun 2017 22:17:33 +0000 (22:17 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev am:
2354fae941
am:
34c96fff5c
Change-Id: I254eb9ccac2190030bc0f920c053f93570b6ef2b
Lei Yu [Thu, 29 Jun 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev
am:
2354fae941
Change-Id: Ief85db7f1134036ced0eac6f07c0d6a15603ee73
Lei Yu [Thu, 29 Jun 2017 22:08:40 +0000 (22:08 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev
Fan Zhang [Thu, 29 Jun 2017 19:58:39 +0000 (12:58 -0700)]
Change the way we generate stable id for DashboardSummary
- The countItem() method generates id based on position of Tile. This is
not truely stable.
- Added stable id constants for static views, and use hash of title as
stable id for tiles.
Bug:
33861822
Test: robotests
Change-Id: Ibbc88c82655503dc3964cb0c430c779dc9c93d41
Shunta Sato [Thu, 29 Jun 2017 20:42:16 +0000 (20:42 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev am:
9638e020e5
am:
97419f8d52
Change-Id: I06a7a62ca94104bc0b108df1fa53660453a95375
Shunta Sato [Thu, 29 Jun 2017 20:38:03 +0000 (20:38 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
am:
9638e020e5
Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
TreeHugger Robot [Thu, 29 Jun 2017 20:31:18 +0000 (20:31 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
Doris Ling [Thu, 29 Jun 2017 19:05:56 +0000 (19:05 +0000)]
Merge "Add account sync summary." into oc-dr1-dev am:
5243d5dd85
am:
cf57e17791 -s ours
Change-Id: I58427cf57812c2b52b2f3106c6606f490bd49c39
Doris Ling [Thu, 29 Jun 2017 19:02:29 +0000 (19:02 +0000)]
Merge "Add account sync summary." into oc-dr1-dev
am:
5243d5dd85
Change-Id: I00eb5bae671c4e4427c8af04abb541b0f1e74d60
TreeHugger Robot [Thu, 29 Jun 2017 18:58:58 +0000 (18:58 +0000)]
Merge "Add account sync summary." into oc-dr1-dev
jackqdyulei [Thu, 29 Jun 2017 18:46:28 +0000 (18:46 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev am:
1498e86530
am:
595def292b
Change-Id: I7a84119fc64b37c8d6ed32ee05e644f9f860a62e
jackqdyulei [Thu, 29 Jun 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
am:
1498e86530
Change-Id: I4bd802fa60da314a7997addbe2920b394d0e4209
TreeHugger Robot [Thu, 29 Jun 2017 18:38:39 +0000 (18:38 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 17:12:36 +0000 (17:12 +0000)]
Merge "Add ordering attribute to sound setting preferences."
jackqdyulei [Wed, 28 Jun 2017 23:32:59 +0000 (16:32 -0700)]
Update strings for anomaly dialog
1. Add message for new force stop dialog, which is used for wakeup alarm
anomaly
2. Change message for background usage dialog by adding the force stop
action
Bug:
63037765
Test: screenshots
Change-Id: I8ecbf9c517eee7e31ae39509c9112b53ef1225c6
Andrew Sapperstein [Thu, 29 Jun 2017 16:49:31 +0000 (16:49 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev am:
05872fc1c7
am:
115f0603eb
Change-Id: I4a1c4b02311fbdbc9bf7ae7158c3f2060e5ba9c9
Andrew Sapperstein [Thu, 29 Jun 2017 16:38:16 +0000 (16:38 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev
am:
05872fc1c7
Change-Id: Ie8d19b8925328b296879179d4c88af217d66edaa
TreeHugger Robot [Thu, 29 Jun 2017 16:31:06 +0000 (16:31 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 04:52:32 +0000 (04:52 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am:
63c63ff640
am:
301dfdd8d1
Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
Andrew Sapperstein [Thu, 29 Jun 2017 04:48:30 +0000 (04:48 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
am:
63c63ff640
Change-Id: I165409df28685c85ca2edc22971e4471d9ff549f
TreeHugger Robot [Thu, 29 Jun 2017 04:38:44 +0000 (04:38 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
Shunta Sato [Mon, 19 Dec 2016 11:30:46 +0000 (19:30 +0800)]
Fix Wi-Fi list adds same AP repeatedly
When switch AP security mode, several same APs are shown.
To fix this issue, append security type to preference
key for avoiding different APs have same key.
git fetch
Cherrypick of:
https://partner-android-review.googlesource.com/#/c/799829/
Bug:
37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I39621636f14b29e45ba96ff76dc3c21a4996a136
Maurice Lam [Thu, 29 Jun 2017 02:07:19 +0000 (02:07 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev am:
864d5c96d7
am:
d3d1210fad
Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
Maurice Lam [Thu, 29 Jun 2017 02:00:33 +0000 (02:00 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev
am:
864d5c96d7
Change-Id: I5b70f7ac6ff0c4598f3f409d682c9ff2dec42471
TreeHugger Robot [Thu, 29 Jun 2017 01:55:52 +0000 (01:55 +0000)]
Merge "Disable SmartSuggestion conditionally"
Maurice Lam [Thu, 29 Jun 2017 01:47:14 +0000 (01:47 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev
jackqdyulei [Thu, 29 Jun 2017 01:19:16 +0000 (01:19 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev am:
43afb664e6
am:
b58333f46e
Change-Id: If798eac93947126cbdee7c02ee69a792d3032d18
jackqdyulei [Thu, 29 Jun 2017 01:15:33 +0000 (01:15 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev
am:
43afb664e6
Change-Id: I8cd38faa751b9fabbe9164d90b0e73199b28bf94
Doris Ling [Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am:
9df70249b9
am:
5d66fa4c94 -s ours
Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb
Fan Zhang [Thu, 29 Jun 2017 01:14:18 +0000 (18:14 -0700)]
Add ordering attribute to sound setting preferences.
The ordering helps injected settings show up before work profile
settings.
Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix:
62997256
Test: visual
Doris Ling [Thu, 29 Jun 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
am:
9df70249b9
Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
TreeHugger Robot [Thu, 29 Jun 2017 01:11:43 +0000 (01:11 +0000)]
Merge "Add account sync summary."
TreeHugger Robot [Thu, 29 Jun 2017 01:10:42 +0000 (01:10 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:04:58 +0000 (01:04 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 00:57:53 +0000 (17:57 -0700)]
Use proper title for support page.
Was using settings, now using "support & tips".
Change-Id: Ic79d256e841afb52048e9584279a111f6a121504
Fixes:
62903819
Test: manual
jackqdyulei [Thu, 29 Jun 2017 00:53:14 +0000 (00:53 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am:
33c9b7a111
am:
9d57855c96
Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
jackqdyulei [Thu, 29 Jun 2017 00:48:47 +0000 (00:48 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am:
33c9b7a111
Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
TreeHugger Robot [Thu, 29 Jun 2017 00:43:09 +0000 (00:43 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 00:16:57 +0000 (17:16 -0700)]
Reduce number of wallpaper results in search.
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.
Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes:
62793068
Test: manual, search wallpaper and observe results
Sundeep Ghuman [Wed, 28 Jun 2017 23:40:33 +0000 (23:40 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev am:
ea3d314a10
am:
9ff2435ebc
Change-Id: Ia9041ca6f1a3fcfc707b9e3f93a06a1612226606
Sundeep Ghuman [Wed, 28 Jun 2017 23:36:12 +0000 (23:36 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev
am:
ea3d314a10
Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
TreeHugger Robot [Wed, 28 Jun 2017 23:32:13 +0000 (23:32 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 22:10:44 +0000 (15:10 -0700)]
Change the type of "hours" from long to double
So we won't have the rounding issue here.
Bug:
63112264
Test: RunSettingsRoboTests
Change-Id: I85b3525781074294964a956dbe76f3b55f65704d
jackqdyulei [Wed, 21 Jun 2017 22:14:04 +0000 (15:14 -0700)]
Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.
Bug:
37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
Maurice Lam [Wed, 28 Jun 2017 22:06:09 +0000 (15:06 -0700)]
Read theme for lock screen flows
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.
Test: Manual
Bug:
62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
Fan Zhang [Wed, 28 Jun 2017 21:32:39 +0000 (14:32 -0700)]
Disable SmartSuggestion conditionally
The smart suggestion flag should be treated as false when dismissing
first impression type suggestions. Smart suggestion and first impression
suggestions have different dismiss rules.
Change-Id: Ia99d310ddea7baf58b6eadacee8ccda5bf33f311
Fix:
63094854
Test: robotests
TreeHugger Robot [Wed, 28 Jun 2017 21:24:55 +0000 (21:24 +0000)]
Merge "Fix preference title typo in saved network screen"
Daniel Nishi [Wed, 28 Jun 2017 21:07:26 +0000 (21:07 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev am:
2cbe278ad4
am:
7cc286bac7
Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c
Daniel Nishi [Wed, 28 Jun 2017 21:07:00 +0000 (21:07 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev am:
ff8312b36b
am:
e440fdb769
Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d
Daniel Nishi [Wed, 28 Jun 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev
am:
2cbe278ad4
Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
Daniel Nishi [Wed, 28 Jun 2017 20:59:31 +0000 (20:59 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
am:
ff8312b36b
Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
Daniel Nishi [Wed, 28 Jun 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev
Daniel Nishi [Wed, 28 Jun 2017 20:54:29 +0000 (20:54 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
Matthew Fritze [Wed, 28 Jun 2017 20:53:12 +0000 (20:53 +0000)]
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev am:
e2e54e17c7
am:
d4075ea983
Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a
Matthew Fritze [Wed, 28 Jun 2017 20:50:22 +0000 (20:50 +0000)]
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
am:
e2e54e17c7
Change-Id: Ib8b6696cc232ef492a75180c4ac18ee7685be047
TreeHugger Robot [Wed, 28 Jun 2017 20:44:13 +0000 (20:44 +0000)]
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
Matthew Fritze [Wed, 28 Jun 2017 20:40:42 +0000 (20:40 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev am:
e455c8f377
am:
46483a1a29
Change-Id: Ia2f55440571504c66b67276990e9fde19a1709fa
Doris Ling [Wed, 21 Jun 2017 21:43:48 +0000 (14:43 -0700)]
Add account sync summary.
- Check for the number of sync adapter that is enabled for the account and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.
Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix:
62862167
Test: make RunSettingsRoboTests
Matthew Fritze [Wed, 28 Jun 2017 20:33:36 +0000 (20:33 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev
am:
e455c8f377
Change-Id: I2b1e27042120dcb8121565ff58c21de0077837f3
TreeHugger Robot [Wed, 28 Jun 2017 20:27:27 +0000 (20:27 +0000)]
Merge "Change to use new suggestion/condition UI."
TreeHugger Robot [Wed, 28 Jun 2017 20:27:00 +0000 (20:27 +0000)]
Merge "Add list-select as an inline result" into oc-dr1-dev
Doris Ling [Wed, 28 Jun 2017 20:18:56 +0000 (13:18 -0700)]
Add account sync summary.
- Check for the number of sync adapter that is enabled for the account
and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.
Bug:
62862167
Test: make RunSettingsRoboTests
Change-Id: Ic333f62cce9aed0a72771324976ebe3d8e586287
jackqdyulei [Wed, 28 Jun 2017 19:48:46 +0000 (19:48 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev am:
9a30ceab83
am:
881b581e0a
Change-Id: I1a63208cc637be0f9f5ab1e4171b59e498d381ee
jackqdyulei [Wed, 28 Jun 2017 19:48:24 +0000 (19:48 +0000)]
Merge "Update the UI for battery header" into oc-dr1-dev am:
923f50fce6
am:
9d4a2806a8
Change-Id: I28f110fef49db0aca036eb06c5c3f4d1249522de
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
jackqdyulei [Wed, 28 Jun 2017 19:24:02 +0000 (12:24 -0700)]
Fix the getForegroundActivityTotalTimeMs
The parameter in timer should be microseconds, not milliseconds
Bug:
63073847
Test: RunSettingsRoboTests
Change-Id: I5e451aee9eb30815fbefe12c0bfdc85dff884b8e
Doris Ling [Fri, 16 Jun 2017 21:13:45 +0000 (14:13 -0700)]
Change to use new suggestion/condition UI.
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.
Fix:
37645754
Fix:
62621808
Test: make RunSettingsRoboTests
Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
Fan Zhang [Wed, 28 Jun 2017 18:30:58 +0000 (11:30 -0700)]
Fix preference title typo in saved network screen
Change-Id: If6df7d42379d8597fcdcd20f71c88376a972ee70
Fix:
33909403
Test: reindex search
Matthew Fritze [Sun, 25 Jun 2017 21:18:02 +0000 (14:18 -0700)]
Add synchronous indexing api to SearchFeatureProvider
- Opens the database indexing to be synchronous for the
external settings api.
- Adds logging to track synchronous and async indexing
times.
Bug:
62826872
Test: make RunSettingsRoboTests
Change-Id: I28b69f3952946c0ae5dd7ea7da66f7a5fd485637
Daniel Nishi [Tue, 27 Jun 2017 22:59:47 +0000 (15:59 -0700)]
Put the donut on a diet.
Shrinks the donut from 6dp to 4dp to closer match the mocks.
Change-Id: Iaf455beb4f54e7673ff6adc6068e0410fac379b5
Fixes:
62548749
Test: Manual
Doris Ling [Wed, 28 Jun 2017 18:22:44 +0000 (11:22 -0700)]
Change to use new suggestion/condition UI.
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.
Bug:
37645754
Bug:
62621808
Test: make RunSettingsRoboTests
Change-Id: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Matthew Fritze [Fri, 23 Jun 2017 17:05:07 +0000 (10:05 -0700)]
Add list-select as an inline result
Move the majority of the Setting set & get logic into
InlinePayload, but add formatting of input to each
concrete payload class.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: I08932871554beb4a04625f05f8555a5b3a887fe2
Lei Yu [Wed, 28 Jun 2017 18:13:20 +0000 (18:13 +0000)]
Merge "Add location check action for bt anomaly" into oc-dr1-dev am:
a6b24388fc
am:
91dbfc6ee9
Change-Id: Ib7f5560b4ef44cb14bcf5e3633b09d179816b221
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 18:01:17 +0000 (18:01 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am:
d6df3b3d00
am:
cbdaa2b56a
Change-Id: I1c260f3d1d089ae46ddba08dfc83063085ecbe42
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:57:46 +0000 (17:57 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am:
451b7edfd7
am:
d3f035af0a
Change-Id: If1a3d3b931130efa18014538bc95c2d9ac41d410
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:47:45 +0000 (17:47 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev am:
b365594242
am:
1d16eb3622
Change-Id: I08b48e4e3c6049ddb9e25a3733b7f19b012bb051
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:20:04 +0000 (17:20 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev am:
7ea8ecdae1
am:
fc55a3cef1
Change-Id: I7d23a1bab37417064a1ffc358f9856d711426c19
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:50:20 +0000 (01:50 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev am:
c074c1c8fe
am:
da9d206916
Change-Id: Ia2d3416b079c617450562eb0daf3ab3625b83d0f
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
OSDN Git Service
