OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am:...
Android Build Merger (Role) [Wed, 5 Jul 2017 20:42:57 +0000 (20:42 +0000)]
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp

7 years agoMerge "Storage item preferences should be 72dp tall." into oc-dr1-dev
Daniel Nishi [Wed, 5 Jul 2017 20:42:44 +0000 (20:42 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: I97bb447b0b2ce106bc87914bc2b10df6b7632a4c

7 years agoMerge "Storage item preferences should be 72dp tall." into oc-dr1-dev
Daniel Nishi [Wed, 5 Jul 2017 20:42:29 +0000 (20:42 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f

7 years agoMerge "Update the method about foreground time." into oc-dr1-dev
jackqdyulei [Wed, 5 Jul 2017 20:42:10 +0000 (20:42 +0000)]
Merge "Update the method about foreground time." into oc-dr1-dev
am: 96e774b7d7

Change-Id: I4037f224cf5028abe5617775d394adfed1552b27

7 years agoMerge "Storage item preferences should be 72dp tall." into oc-dr1-dev
Daniel Nishi [Wed, 5 Jul 2017 20:40:41 +0000 (20:40 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev

7 years agoMerge "Update the method about foreground time." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 20:38:52 +0000 (20:38 +0000)]
Merge "Update the method about foreground time." into oc-dr1-dev

7 years agoMerge "Make items in Advanced battery page unclickable." into oc-dr1-dev
jackqdyulei [Wed, 5 Jul 2017 20:24:58 +0000 (20:24 +0000)]
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
am: 3a9734261d

Change-Id: I03c108b9a4712205906125ea12114e4ed6659255

7 years agoMerge "Make items in Advanced battery page unclickable." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 20:21:46 +0000 (20:21 +0000)]
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev

7 years agoMerge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
Charles He [Mon, 3 Jul 2017 15:34:45 +0000 (15:34 +0000)]
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
am: c619ad77bb

Change-Id: I6d4e95b63896365308c8acaa07699d53560d64b4

7 years agoMerge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
Charles He [Mon, 3 Jul 2017 15:32:09 +0000 (15:32 +0000)]
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev

7 years agoDisable incorrect strong auth prompt strings.
Charles He [Mon, 3 Jul 2017 08:42:20 +0000 (09:42 +0100)]
Disable incorrect strong auth prompt strings.

The prompt strings on the confirm credentials screen (pin, password,
pattern) are incorrect. They currently say strong auth is "required
after device restarts". But instead they should be "required for
additional security" because strong auth can be enforced not only after
device or profile restarts, but also after profile key eviction, for
example.

Unfortunately, we've already missed the window for string changes.
Therefore, as an alternative, we use generic prompt strings in this CL,
to avoid conveying the incorrect (and misleading) information. We'll
follow up with another CL in master with a proper string change to fix
the issue.

Bug: 36511626
Test: manual
Test: make SettingsRoboTests
Change-Id: I44f84420b88bb4933ad0afa6e8032af465de0cd3

7 years agoMerge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b ...
Android Build Merger (Role) [Sat, 1 Jul 2017 16:10:18 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE am: 126ce95bc6  -s ours am: 07a57fc90b  -s ours" into oc-dr1-dev-plus-aosp

7 years agoImport translations. DO NOT MERGE am: 126ce95bc6 -s ours
Bill Yi [Sat, 1 Jul 2017 16:09:54 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am: 126ce95bc6  -s ours
am: 07a57fc90b  -s ours

Change-Id: Ifbfb5d7e768115a0b2366d15c489da2b34d57ad4

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 16:09:53 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: aaeb09e6c7  -s ours

Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694

7 years agoImport translations. DO NOT MERGE am: 126ce95bc6 -s ours
Bill Yi [Sat, 1 Jul 2017 16:09:34 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am: 126ce95bc6  -s ours
am: 2626c36d29  -s ours

Change-Id: Ia3d459b682083ce6b7897439748a2630a143e90e

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:06:05 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: Iaa93cedcdc1089409ee0d01bad5edd932acbbcbb

7 years agoMerge "Assist gesture setting should not be available on unsupported devices" into...
Kevin Chyn [Sat, 1 Jul 2017 03:06:52 +0000 (03:06 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am: 72a94e9f5a

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e

7 years agoMerge "Assist gesture setting should not be available on unsupported devices" into...
TreeHugger Robot [Sat, 1 Jul 2017 02:59:19 +0000 (02:59 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Jul 2017 01:07:52 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Jul 2017 01:02:00 +0000 (18:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import

7 years agoChange permission preference to only 1 line summary
Fan Zhang [Sat, 1 Jul 2017 00:45:13 +0000 (00:45 +0000)]
Change permission preference to only 1 line summary
am: 32a8568230

Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b

7 years agoAssist gesture setting should not be available on unsupported devices
Kevin Chyn [Fri, 30 Jun 2017 23:27:49 +0000 (16:27 -0700)]
Assist gesture setting should not be available on unsupported devices

Fixes: 63176246

Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b

7 years agoUpdate the method about foreground time.
jackqdyulei [Fri, 30 Jun 2017 17:18:34 +0000 (10:18 -0700)]
Update the method about foreground time.

For now it uses MIN(STATE_TOP_TIME, FOREGROUND_ACTIVITY_TIME) and this
method is used in both display and screen smearing.

Bug: 63080621
Test: RunSettingsRoboTests
Change-Id: I2ca3109697aa66fae67d8b2f4f10c4d08bb99d59

7 years agoChange permission preference to only 1 line summary
Fan Zhang [Fri, 30 Jun 2017 22:28:19 +0000 (15:28 -0700)]
Change permission preference to only 1 line summary

Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664

7 years agoMerge "Add BatteryInfo logging to settings" into oc-dr1-dev
Salvador Martinez [Fri, 30 Jun 2017 22:05:53 +0000 (22:05 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
am: 9a3b115cc8

Change-Id: I447d0d7689f77b12a0caf9374155883217ff330a

7 years agoMerge "Use normal layout for "Space Used" header." into oc-dr1-dev
Daniel Nishi [Fri, 30 Jun 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am: 7809c3d2f0

Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8

7 years agoMerge "Add BatteryInfo logging to settings" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 21:58:38 +0000 (21:58 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev

7 years agoMerge "Use normal layout for "Space Used" header." into oc-dr1-dev
Daniel Nishi [Fri, 30 Jun 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev

7 years agoAllow clicking on guest user
Jason Monk [Fri, 30 Jun 2017 19:43:00 +0000 (19:43 +0000)]
Allow clicking on guest user
am: c1cc9fefa8

Change-Id: I828716ff982cd2f8bedc96b74c1abc44716cc753

7 years agoMake items in Advanced battery page unclickable.
jackqdyulei [Fri, 30 Jun 2017 18:11:16 +0000 (11:11 -0700)]
Make items in Advanced battery page unclickable.

Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item

Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036

7 years agoAllow clicking on guest user
Jason Monk [Fri, 30 Jun 2017 15:29:40 +0000 (11:29 -0400)]
Allow clicking on guest user

This is needed since the user switch will be hidden by default in
QS and will show up once multi-user has been activated in some way.

Test: click on guest
Bug: 37152893
Change-Id: I351a5d95e9e8a5e47e388d9f0611924b077754da

7 years agoFix settings robotest
Fan Zhang [Fri, 30 Jun 2017 03:49:57 +0000 (03:49 +0000)]
Fix settings robotest
am: 4e34839a1e

Change-Id: I46d6dd639b779f993bc2088608a52165139967fb

7 years agoFix settings robotest
Fan Zhang [Fri, 30 Jun 2017 01:25:48 +0000 (18:25 -0700)]
Fix settings robotest

Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest

7 years agoMerge "Don't scroll when removing saved networks." into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 00:04:37 +0000 (00:04 +0000)]
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
am: 1e561edb45

Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f

7 years agoMerge "Don't scroll when removing saved networks." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 23:56:51 +0000 (23:56 +0000)]
Merge "Don't scroll when removing saved networks." into oc-dr1-dev

7 years agoAdd BatteryInfo logging to settings
Salvador Martinez [Tue, 27 Jun 2017 00:21:05 +0000 (17:21 -0700)]
Add BatteryInfo logging to settings

This Cl adds a few log statements to BatteryInfo to try
and determine what the bottleneck in the Battery Settings
Advanced page could be.

Test: robotests still pass
Bug: 62959645
Change-Id: I1ff712d97bc8be78873c63e187edbffa8e10cd21

7 years agoMerge "Fix robotests." into oc-dr1-dev
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

7 years agoMerge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 23:27:24 +0000 (23:27 +0000)]
Merge "Fix robotests." into oc-dr1-dev

7 years agoFix robotests.
Andrew Sapperstein [Thu, 29 Jun 2017 22:38:55 +0000 (15:38 -0700)]
Fix robotests.

Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes: 63141368
Test: robotest

7 years agoMerge "Update strings for anomaly dialog" into oc-dr1-dev
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

7 years agoMerge "Update strings for anomaly dialog" into oc-dr1-dev
Lei Yu [Thu, 29 Jun 2017 22:08:40 +0000 (22:08 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev

7 years agoMerge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
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

7 years agoMerge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
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

7 years agoUse normal layout for "Space Used" header.
Daniel Nishi [Thu, 29 Jun 2017 19:37:23 +0000 (12:37 -0700)]
Use normal layout for "Space Used" header.

This fixes the issue where the indentation was wrong.

Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes: 62548754
Test: Manual

7 years agoMerge "Add account sync summary." into oc-dr1-dev
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

7 years agoStorage item preferences should be 72dp tall.
Daniel Nishi [Thu, 29 Jun 2017 18:38:27 +0000 (11:38 -0700)]
Storage item preferences should be 72dp tall.

In changing the layout, this also centers the icon properly.

Change-Id: I8fa36e18cf4a0d5765ccbe65a7975fd71832a9ae
Fixes: 62548432
Bug: 62581475
Test: Manual

7 years agoMerge "Add account sync summary." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 18:58:58 +0000 (18:58 +0000)]
Merge "Add account sync summary." into oc-dr1-dev

7 years agoMerge "Change the type of "hours" from long to double" into oc-dr1-dev
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

7 years agoMerge "Change the type of "hours" from long to double" into oc-dr1-dev
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

7 years agoUpdate strings for anomaly dialog
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

7 years agoMerge "Use proper title for support page." into oc-dr1-dev
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

7 years agoMerge "Use proper title for support page." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:31:06 +0000 (16:31 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev

7 years agoMerge "Reduce number of wallpaper results in search." into oc-dr1-dev
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

7 years agoMerge "Reduce number of wallpaper results in search." into oc-dr1-dev
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

7 years agoDon't scroll when removing saved networks.
Sundeep Ghuman [Tue, 27 Jun 2017 00:22:08 +0000 (17:22 -0700)]
Don't scroll when removing saved networks.

Bug: b/62374459
Test: Open saved networks from WifiSettings. Remove a saved network.
Screen should not scroll to the top of the list.

Change-Id: Ia78fc0b5435f659c8fe31abee8b76006d7986b66

7 years agoFix Wi-Fi list adds same AP repeatedly
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

7 years agoMerge "Read theme for lock screen flows" into oc-dr1-dev
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

7 years agoMerge "Read theme for lock screen flows" into oc-dr1-dev
Maurice Lam [Thu, 29 Jun 2017 01:47:14 +0000 (01:47 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev

7 years agoMerge "Add metric action log for anomaly action" into oc-dr1-dev
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

7 years agoMerge "Change to use new suggestion/condition UI." into oc-dr1-dev
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

7 years agoMerge "Add metric action log for anomaly action" into oc-dr1-dev
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

7 years agoMerge "Change to use new suggestion/condition UI." 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

7 years agoUse proper title for support page.
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

7 years agoMerge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
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

7 years agoMerge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 00:43:09 +0000 (00:43 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev

7 years agoReduce number of wallpaper results in search.
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

7 years agoMerge "Scroll to top when connecting to network." into oc-dr1-dev
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

7 years agoMerge "Scroll to top when connecting to network." into oc-dr1-dev
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

7 years agoChange the type of "hours" from long to double
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

7 years agoAdd metric action log for anomaly action
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

7 years agoRead theme for lock screen flows
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

7 years agoMerge "Put the donut on a diet." into oc-dr1-dev
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

7 years agoMerge "Use the proper style for the SpacePreference." into oc-dr1-dev
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

7 years agoMerge "Put the donut on a diet." into oc-dr1-dev
Daniel Nishi [Wed, 28 Jun 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev

7 years agoMerge "Use the proper style for the SpacePreference." 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

7 years agoMerge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
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

7 years agoMerge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 20:44:13 +0000 (20:44 +0000)]
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev

7 years agoAdd account sync summary.
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

7 years agoMerge "Add list-select as an inline result" into oc-dr1-dev
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

7 years agoMerge "Add list-select as an inline result" into oc-dr1-dev
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

7 years agoMerge "Hide the IDLE in "app list"" into oc-dr1-dev
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

7 years agoMerge "Update the UI for battery header" into oc-dr1-dev
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

7 years agoMerge "Hide the IDLE in "app list"" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 19:38:20 +0000 (19:38 +0000)]
Merge "Hide the IDLE in "app list"" into oc-dr1-dev

7 years agoMerge "Update the UI for battery header" 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

7 years agoFix the getForegroundActivityTotalTimeMs
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

7 years agoChange to use new suggestion/condition UI.
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

7 years agoAdd synchronous indexing api to SearchFeatureProvider
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

7 years agoPut the donut on a diet.
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

7 years agoAdd list-select as an inline result
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

7 years agoMerge "Add location check action for bt anomaly" 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

7 years agoMerge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
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

7 years agoMerge "Add location check action for bt anomaly" into oc-dr1-dev
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

7 years agoMerge "Fix the getForegroundActivityTotalTimeMs" 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

7 years agoMerge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
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

7 years agoMerge "Fix the getForegroundActivityTotalTimeMs" 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

7 years agoMerge "Update string: Gesture setting title" 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

7 years agoMerge "Update string: Gesture setting title" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:39:08 +0000 (17:39 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev

7 years agoUpdate the UI for battery header
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