OSDN Git Service
Lei Yu [Fri, 16 Jun 2017 17:06:37 +0000 (17:06 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
am:
b275471725
Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
Lei Yu [Fri, 16 Jun 2017 16:55:52 +0000 (16:55 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
Christine Franks [Fri, 16 Jun 2017 14:43:56 +0000 (14:43 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
am:
ddd692cf1a
Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
Christine Franks [Fri, 16 Jun 2017 14:36:10 +0000 (14:36 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
Tony Mak [Fri, 16 Jun 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
am:
e3d890eaae -s ours
Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd
TreeHugger Robot [Fri, 16 Jun 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
Charles He [Fri, 16 Jun 2017 11:44:42 +0000 (11:44 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
am:
add67648c7
Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
Charles He [Fri, 16 Jun 2017 11:36:05 +0000 (11:36 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 10:59:24 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours am:
a59e02fd58" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 10:59:21 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
Tony Mak [Fri, 16 Jun 2017 10:59:11 +0000 (10:59 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours
am:
a59e02fd58
Change-Id: Idb771b9bca8e0e1d93dc9f9f8b9312bae33d9165
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce -s ours
Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce
am:
80cdf176e9 -s ours
Change-Id: Iea2c278565436cde6cd1fb8d5c58f7b972c7c2e7
Maurice Lam [Fri, 16 Jun 2017 01:15:20 +0000 (01:15 +0000)]
Allow skipping PIN setup screen
am:
4c930fc2d5
Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
Tony Mak [Thu, 15 Jun 2017 22:29:04 +0000 (22:29 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce
Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
Christine Franks [Thu, 15 Jun 2017 17:04:21 +0000 (10:04 -0700)]
Update Night display icon in Settings
Bug:
62658839
Test: Night display qs tile icon matches the icon used in the Night
display condition in Settings.
Change-Id: Ie319c9c94604dd630d5cf66f114a4de4397c2694
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit
0f897d79f698920f1c0e0c102a7985704ffa196e)
Tony Mak [Mon, 12 Jun 2017 17:31:40 +0000 (18:31 +0100)]
Fix searching work app in settings NO PARTIAL RERUN
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
jackqdyulei [Tue, 13 Jun 2017 17:17:59 +0000 (10:17 -0700)]
Display anomaly in battery usage page
This cl adds a new parameter, mAnomalies, for
AdvancedPowerUsageDetail.
If it is null, fragment will start AnomalyLoader to detect anomaly.
If not null, just display the anomaly.
Bug:
36925180
Test: RunSettingsRoboTests
Change-Id: I572bc5954c1cdb210d18b6dbe1ab9dba25c0a61f
Charles He [Thu, 15 Jun 2017 09:57:23 +0000 (10:57 +0100)]
Escape apostrophes in ConfirmCredential strings.
Bug:
62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
Android Build Merger (Role) [Thu, 15 Jun 2017 06:45:45 +0000 (06:45 +0000)]
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours am:
ea46967c2e -s ours" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:21 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours
am:
ea46967c2e -s ours
Change-Id: I12005bef18a23f1aad2c1b5b9ee7982206426a5f
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:20 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5
am:
0c02e22c99 -s ours
Change-Id: Iea1015089c955056d319f5365c1fb8d07e7acb93
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:42 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5 -s ours
Change-Id: I68959f0803cd714d540299ac916616a933594c00
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5
Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
TreeHugger Robot [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 04:21:38 +0000 (04:21 +0000)]
Allow WifiSettings to show old APs on app resume.
am:
4ae59dde43
Change-Id: I57cb72fcdcbe98223ccda71f1ae6de2756b7ec08
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
MANUAL MERGE of ag/
2398149 to avoid merge conflicts when trying to
submit to oc-dev.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Kevin Chyn [Wed, 14 Jun 2017 01:51:50 +0000 (01:51 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
am:
6f365765f7
Change-Id: I23f3bdbcbd60c80842a51da61a16225252dc179c
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
Tarandeep Singh [Wed, 14 Jun 2017 00:06:44 +0000 (00:06 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
am:
fc9622ef53
Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
TreeHugger Robot [Tue, 13 Jun 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
jackqdyulei [Tue, 13 Jun 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
am:
e7735b8d52
Change-Id: I01b51abb73fdc39597388878a846266c339815e2
TreeHugger Robot [Tue, 13 Jun 2017 22:36:04 +0000 (22:36 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:22:13 +0000 (22:22 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
am:
9871df58f1
Change-Id: I0f5e5069ff4a69004dce46921f894cde9d4d854f
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
Kevin Chyn [Fri, 9 Jun 2017 20:37:14 +0000 (13:37 -0700)]
Move assist gestures settings to overlay
Bug:
37427306
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
jackqdyulei [Tue, 13 Jun 2017 21:48:51 +0000 (21:48 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
am:
d907b99d79
Change-Id: Icb92d38004bbbc109e7867638528bc7d80b9ac29
TreeHugger Robot [Tue, 13 Jun 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 00:43:29 +0000 (17:43 -0700)]
Add action active check for anomaly action.
This cl adds the action active check for the following actions:
1. ForceStopAction: check whether app is stopped
2. BackgroundActivityAction: check whether background activity
is turned on
If related action is not active, we won't report anomaly
to users. Future cl will add active check for bluetooth anomaly.
Bug:
62452014
Test: RunSettingsRoboTests
Change-Id: Ib490227f4570accf8ca4840a99bf85a022c42a5b
Alison Cichowlas [Tue, 13 Jun 2017 11:17:07 +0000 (11:17 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
am:
39efd4ec44
Change-Id: Ic059dc659f8e32a64c5fa018f48ce0470c64ccd8
Alison Cichowlas [Tue, 13 Jun 2017 11:08:32 +0000 (11:08 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
Katsiaryna Naliuka [Mon, 12 Jun 2017 15:37:33 +0000 (17:37 +0200)]
Added support for external tiles to the lockscreen activity
Bug:
62487664
Test: Built and flashed a system image.
Change-Id: I75e42a042f9212e247f02c5523979bcd5ea57baa
Bill Yi [Tue, 13 Jun 2017 09:51:01 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
42e494228b -s ours
Change-Id: Ia4b841e5b804c887d6c381d6d2e500a82509fac5
TreeHugger Robot [Tue, 13 Jun 2017 09:45:19 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 08:15:26 +0000 (08:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 08:15:09 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
0c2bb34f5c -s ours
Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57
Bill Yi [Tue, 13 Jun 2017 08:14:54 +0000 (08:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
e637b663e8 -s ours
Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I24da3a236478e91b06710a4065ba29663921f940
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Alison Cichowlas [Tue, 13 Jun 2017 03:04:40 +0000 (23:04 -0400)]
Fix build - fix import of SettingsRobolectricTestRunner.
Test: Only changing imports in test files.
Change-Id: Ib0d1433983da36416b979a0eaa1bb57419150374
Alison Cichowlas [Tue, 13 Jun 2017 01:59:42 +0000 (01:59 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
665384a8eb
Change-Id: Iefb97be4d3c6a73c748347f37a25a4233a65aead
Alison Cichowlas [Tue, 13 Jun 2017 01:49:37 +0000 (01:49 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
0320d4e69f
Change-Id: Icc6ba97501c229ae8d5bf5a7169feae2af85f3a2
Alison Cichowlas [Tue, 13 Jun 2017 01:45:10 +0000 (01:45 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
Alison Cichowlas [Tue, 13 Jun 2017 01:41:39 +0000 (01:41 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Bill Yi [Tue, 13 Jun 2017 01:16:46 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7690f708e8eef5505a3508bbf7998d9638504920
Auto-generated-cl: translation import
Tarandeep Singh [Mon, 12 Jun 2017 22:32:28 +0000 (15:32 -0700)]
Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput
Both View focus (which is triggered by View.requestFocus()) and IME focus
(which is internally handled inside InputMethodManager), are implemented
as delayed tasks on the UI thread. The goal here is to make sure that
InputMethodManager.showSoftInput() always gets called only after the target
EditText gained IME focus.
This requires some tricks, but is basically a solved problem with
ImeAwareEditText introduced by
I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235. Here we can just reuse it.
Note that ConfirmLockPassword & ChooseLockPassword are the only ones
using ScrollToParentEditText. Latter doesn't call IMM.showSoftInput().
Fixes:
62542157
Test: Verified keyboard still shows-up on the ConfirmLock screen.
Change-Id: I892d639f3cc5d43db553b682d5278b8ce2fe72da
Salvador Martinez [Tue, 13 Jun 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
am:
34373c8f33
Change-Id: I4a3d05aade72fc2de50a8fc6df574d8073bdafd6
TreeHugger Robot [Tue, 13 Jun 2017 00:13:43 +0000 (00:13 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Tarandeep Singh [Mon, 12 Jun 2017 22:33:08 +0000 (22:33 +0000)]
Fix keyboard not launching on screen lock settings.
am:
86b8f4460d
Change-Id: I21b872ac9edacd625c0995b9c878cbe91f82cc2b
Tarandeep Singh [Fri, 9 Jun 2017 23:24:14 +0000 (16:24 -0700)]
Fix keyboard not launching on screen lock settings.
calling requestFocus() on EditText fixes the issue.
Bug:
62344628
Test: manual
Change-Id: If8321cb646dca5882d5a44bd1ec2f66f0f4ec5aa
Maurice Lam [Mon, 12 Jun 2017 18:38:52 +0000 (18:38 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
am:
cd2cb4511a
Change-Id: I96a2e76f42d2972eaa2542c7d4d94a728c48ead2
Maurice Lam [Mon, 12 Jun 2017 18:34:31 +0000 (18:34 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
Salvador Martinez [Mon, 12 Jun 2017 18:08:56 +0000 (11:08 -0700)]
Increase length of string for pref title
Translators needed a few more characters in a preference that still
had ample space. This cl simply changes the comment to allow for
the requested character count.
Test: Ensure 25 chars fit (screenshot)
Bug:
62433109
Change-Id: I1bd31c969cc4fea8bcfec794a2d8a7b98778853c
Andrew Sapperstein [Mon, 12 Jun 2017 17:41:10 +0000 (17:41 +0000)]
Update advanced battery screen to use headline font.
am:
e2a276f2b6
Change-Id: I920fe5c52fae1f8ec873f999dff72d79bcc2cd9a
Maurice Lam [Sun, 11 Jun 2017 21:13:24 +0000 (14:13 -0700)]
Increase CHAR LIMIT
Test: Existing tests pass
Bug:
62362729
Bug:
62401881
Change-Id: I4416db079d35cfdedd69670eaa92ef62bcacca80
Andrew Sapperstein [Sun, 11 Jun 2017 01:00:45 +0000 (18:00 -0700)]
Update advanced battery screen to use headline font.
Change-Id: I8e70cc8093cccbe67b7c363a60a03f0eb1cda2e5
Fixes:
62507326
Test: robotests
Bill Yi [Sat, 10 Jun 2017 06:09:16 +0000 (06:09 +0000)]
Import translations. DO NOT MERGE
am:
5a3748e39a -s ours
Change-Id: Ie76608b1e36973b34eb896cbf5871fa9b658fc39
Bill Yi [Sat, 10 Jun 2017 01:36:51 +0000 (18:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cf44e9a52a89c9d4ebdfa3e05897e68e6ea505f
Auto-generated-cl: translation import
Andrew Sapperstein [Fri, 9 Jun 2017 22:50:29 +0000 (22:50 +0000)]
Update SummaryPreference to use config_headlineFontFamily.
am:
be3972d7c2
Change-Id: I794adde11115dbcbcdc07f3307c284253a4a33b0
jackqdyulei [Fri, 9 Jun 2017 20:29:09 +0000 (13:29 -0700)]
Update dialogs for anomaly
1. Add dialog for background activity action
2. Use new strings in anomaly dialogs
Bug:
62490179
Test: RunSettingsRoboTests
Change-Id: Ide836a4aca939963bd3b15c6d728eed68a6d7f43
Andrew Sapperstein [Fri, 9 Jun 2017 00:27:14 +0000 (17:27 -0700)]
Update SummaryPreference to use config_headlineFontFamily.
Also deleted a couple of unused files.
Change-Id: I42b6f6c79c3a7ba00040d657204830c5a468a2b2
Fixes:
62385826
Test: manual
Daniel Nishi [Fri, 9 Jun 2017 18:07:15 +0000 (18:07 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
am:
1dc3f38506
Change-Id: If51ce88bc44c123080c3853152f026fc3c2d23ea
Daniel Nishi [Fri, 9 Jun 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 17:17:16 +0000 (17:17 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
am:
bacb9fc459
Change-Id: I5d9d673d07d84cb630a04e620c8818f187350cc0
Maurice Lam [Fri, 9 Jun 2017 17:07:47 +0000 (17:07 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 16:55:29 +0000 (16:55 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
am:
128fd39a13
Change-Id: I50ef5d7f0a403389339b041c6064bfc188a7d4cd
Maurice Lam [Fri, 9 Jun 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
Andrew Sapperstein [Fri, 9 Jun 2017 16:33:43 +0000 (16:33 +0000)]
Refactor test runner to use static list of resource paths
am:
9f1e911759
Change-Id: I5d00898c2c3f335f543fcbd31f2b977e67ad1abd
Andrew Sapperstein [Fri, 9 Jun 2017 02:27:36 +0000 (19:27 -0700)]
Refactor test runner to use static list of resource paths
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.
Bug:
62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
Antony Sargent [Fri, 9 Jun 2017 15:57:25 +0000 (15:57 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
92661526d4
Change-Id: I915fc0691158c2b7a7c4adccc038f79fad8ccfd8
Antony Sargent [Fri, 9 Jun 2017 15:54:38 +0000 (15:54 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
6a5f36a494
Change-Id: I011faf9c0b0ea10ab9c23caa2daa0e5b74915900
Antony Sargent [Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
Antony Sargent [Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 09:00:11 +0000 (09:00 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
am:
5d02b8b85f
Change-Id: I0c3429fa16cf6b69c401f33ddc51f161eed02dff
Hugo Benichi [Fri, 9 Jun 2017 08:56:17 +0000 (08:56 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 08:37:40 +0000 (08:37 +0000)]
Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 am:
3aae1f336e -s ours" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 9 Jun 2017 08:37:15 +0000 (08:37 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 -s ours
am:
8a241a438b -s ours
Change-Id: Ia7fd253450ff8224724b1ed15f689fe4dc9b4d1d
jackqdyulei [Fri, 9 Jun 2017 08:37:15 +0000 (08:37 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8
am:
3aae1f336e -s ours
Change-Id: I1f2a83c9f65231c4b6c3d119a3cf67507b10f3b5
jackqdyulei [Fri, 9 Jun 2017 08:34:46 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8
Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
jackqdyulei [Fri, 9 Jun 2017 08:34:43 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8 -s ours
Change-Id: I19ee339c025e3db0c26cd323b65db1131980733e
TreeHugger Robot [Fri, 9 Jun 2017 08:29:56 +0000 (08:29 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
OSDN Git Service
