OSDN Git Service
Fan Zhang [Mon, 10 Jul 2017 21:36:10 +0000 (21:36 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am:
5d3f6d566b
am:
16afefd509
Change-Id: Id24c066d913dcab8532b42211dad25e61e2dc0bd
Fan Zhang [Mon, 10 Jul 2017 21:31:39 +0000 (21:31 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
am:
5d3f6d566b
Change-Id: Ifd5f8aae85864e2a264ea76e28700cf82a0bfac5
TreeHugger Robot [Mon, 10 Jul 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
TreeHugger Robot [Mon, 10 Jul 2017 20:52:21 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE"
jackqdyulei [Mon, 10 Jul 2017 20:26:35 +0000 (20:26 +0000)]
Init BatteryUtils in constructor am:
116fec5b25
am:
d6ff657b78
Change-Id: I876a9fc869ae48ef6bf45080c6036980423d1fe5
jackqdyulei [Mon, 10 Jul 2017 20:22:03 +0000 (20:22 +0000)]
Init BatteryUtils in constructor
am:
116fec5b25
Change-Id: I74636f77f8ee44576894ed25eb48212386f8ee40
TreeHugger Robot [Mon, 10 Jul 2017 20:18:42 +0000 (20:18 +0000)]
Merge "Add location as a Inline list payload"
Fan Zhang [Mon, 10 Jul 2017 19:08:04 +0000 (12:08 -0700)]
Support multi line title for switch and edittext preferences
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix:
63509156
Test: visual
kun.tang [Mon, 10 Jul 2017 19:30:30 +0000 (19:30 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5 am:
d34ce65e22 am:
a482b155f2
am:
d83e519871
Change-Id: I1de0b48f92686e0cca42c23520cedf512a659579
kun.tang [Mon, 10 Jul 2017 19:26:03 +0000 (19:26 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5 am:
d34ce65e22
am:
a482b155f2
Change-Id: I31ae1b4a34bd61bceb607d2fa4c6176bbe27af75
kun.tang [Mon, 10 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5
am:
d34ce65e22
Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
kun.tang [Mon, 10 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
am:
3cbae7d6b5
Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
Treehugger Robot [Mon, 10 Jul 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
TreeHugger Robot [Mon, 10 Jul 2017 19:06:50 +0000 (19:06 +0000)]
Merge "Fix build"
Matthew Fritze [Fri, 7 Jul 2017 15:04:42 +0000 (08:04 -0700)]
Add location as a Inline list payload
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.
However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.
Merge from: ag/
2511709/
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
jackqdyulei [Mon, 10 Jul 2017 18:00:05 +0000 (11:00 -0700)]
Init BatteryUtils in constructor
In this case we won't have the NPE.
Bug:
63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56
Fan Zhang [Mon, 10 Jul 2017 17:21:23 +0000 (10:21 -0700)]
Fix build
Change-Id: I0accc5b7c753ff85a56f5dfc17f7d9aa8eb7cd9a
Fix:
63525553
Test: RunSettingsRoboTests
Christine Franks [Mon, 10 Jul 2017 14:13:02 +0000 (14:13 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev am:
8dc795d64b
am:
1be5af80ec
Change-Id: Ibb0cfea8177fed936bd809ccb0a4e953cd9ea401
Christine Franks [Mon, 10 Jul 2017 13:57:38 +0000 (13:57 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
am:
8dc795d64b
Change-Id: Ia2ed1750a996d56255f5eecb42b2607d65c5e8d0
Christine Franks [Mon, 10 Jul 2017 13:51:39 +0000 (13:51 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
Sunny Goyal [Sat, 8 Jul 2017 23:08:36 +0000 (23:08 +0000)]
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev am:
8db0691129
am:
32df75b686 -s ours
Change-Id: I9fd9f4f353b104a0d2df5263000dce2d86acd3e7
Sunny Goyal [Sat, 8 Jul 2017 23:05:38 +0000 (23:05 +0000)]
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev
am:
8db0691129
Change-Id: If1c570e8f469ba2af39d34d016b53daa49de499b
TreeHugger Robot [Sat, 8 Jul 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev
Sunny Goyal [Fri, 7 Jul 2017 13:40:27 +0000 (06:40 -0700)]
Adding key to individual entries in ManagedServiceSettings so that it can
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.
Test: Manually tested on device
Bug:
63418030
Change-Id: I4d818956f2fa0585300d4dfb95ad7a16fe8882d5
Merged-In: I3059e3a562a593bc425d4e778be052ac014a7002
Sunny Goyal [Fri, 7 Jul 2017 13:40:27 +0000 (06:40 -0700)]
Adding key to individual entries in ManagedServiceSettings so that it can
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.
Test: Manually tested on device
Bug:
63418030
Change-Id: I3059e3a562a593bc425d4e778be052ac014a7002
kun.tang [Sat, 8 Jul 2017 03:09:02 +0000 (11:09 +0800)]
Fix Phone crash when rorate screen on SimStatus.
When rorate screen on SimStatus, Fragment not attached to Activity, phone crash.
Solution: use mRes to getString
Test: build
07-07 13:20:27.237 696 696 E AndroidRuntime: Process: com.android.phone, PID: 696
07-07 13:20:27.237 696 696 E AndroidRuntime: java.lang.IllegalStateException: Fragment SimStatus{
d1e4bb3} not attached to Activity
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.Fragment.getResources(Fragment.java:861)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus.updateSignalStrength(SimStatus.java:359)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus$4.onSignalStrengthsChanged(SimStatus.java:444)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.telephony.PhoneStateListener$1.handleMessage(PhoneStateListener.java:334)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6558)
07-07 13:20:27.237 696 696 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygot
Change-Id: Ife8f2e3ed8c4fe6db0fe784a43910768ff3ff4d1
jackqdyulei [Fri, 7 Jul 2017 23:59:46 +0000 (23:59 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev am:
69d6f2840f
am:
d8b92b4d82
Change-Id: Ic8a6bc7312c1a464104867e87daecf72bdcffaa9
jackqdyulei [Fri, 7 Jul 2017 23:57:12 +0000 (23:57 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
am:
69d6f2840f
Change-Id: Ie98286df2d583d521eefb30630bfb32936b5ac79
TreeHugger Robot [Fri, 7 Jul 2017 23:52:58 +0000 (23:52 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
Doris Ling [Fri, 7 Jul 2017 23:43:42 +0000 (23:43 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev am:
fbd8d21588
am:
67fed2400d
Change-Id: Ie0e8d40f3e21e2458e65c18b1e2c87c257cdffb5
Doris Ling [Fri, 7 Jul 2017 23:41:15 +0000 (23:41 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev
am:
fbd8d21588
Change-Id: I309c769f4ee929c3f8c4c9e83b1db8e86f9745f1
TreeHugger Robot [Fri, 7 Jul 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev
Andrew Sapperstein [Fri, 7 Jul 2017 22:51:12 +0000 (22:51 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev am:
604df3cc55
am:
0d2b782c28 -s ours
Change-Id: I9ec3623ddcf18bfd8a321072c9103d6988b656d9
Andrew Sapperstein [Fri, 7 Jul 2017 22:48:45 +0000 (22:48 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
am:
604df3cc55
Change-Id: If9edeb0e771349bec9a0d3d23d8d9331a4ee13a6
Matthew Fritze [Fri, 7 Jul 2017 22:48:42 +0000 (22:48 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev am:
50535da16d
am:
01ee9b3cc7
Change-Id: I2a5063324b21e2a77ba10d9e4be9dcbc4aadd2c9
Matthew Fritze [Fri, 7 Jul 2017 22:46:47 +0000 (22:46 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev
am:
50535da16d
Change-Id: I567ada95b583eec40a873466136c922ef2e73fd2
TreeHugger Robot [Fri, 7 Jul 2017 22:46:05 +0000 (22:46 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 22:40:23 +0000 (22:40 +0000)]
Merge "Duplicate ambient display setting in battery settings."
TreeHugger Robot [Fri, 7 Jul 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev
jackqdyulei [Fri, 7 Jul 2017 20:05:46 +0000 (13:05 -0700)]
Update summary for "Voice Calls"
Change it from "Screen usage 2m" to "2m", since this is not a screen
usage. This cl has effect on all non-app batterySipper.
Bug:
63443732
Test: RunSettingsRoboTests
Change-Id: I027b3234bd7b56738ab31c5dfbc0d8bd7f19186e
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:36:16 +0000 (21:36 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev am:
56787e3e54
am:
3fafe7cf22
Change-Id: I87972bf9236e2be10b8d36bb9c9ba37cf41932b9
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:33:47 +0000 (21:33 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
am:
56787e3e54
Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
Antony Sargent [Fri, 7 Jul 2017 21:17:44 +0000 (21:17 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev am:
db522a539d
am:
ef7f6663ef
Change-Id: I6a20da2230e27b28c3dac6f1526414e06a13507d
Antony Sargent [Fri, 7 Jul 2017 21:15:48 +0000 (21:15 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
am:
db522a539d
Change-Id: I85b5235bde32d6a25a708e3bd1245ba646487124
TreeHugger Robot [Fri, 7 Jul 2017 21:12:58 +0000 (21:12 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 20:31:32 +0000 (20:31 +0000)]
Merge "Change words in wifi settings toggle to lowercase."
Andrew Sapperstein [Fri, 7 Jul 2017 18:02:00 +0000 (11:02 -0700)]
Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.
Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes:
62298578
Test: robotests
Andrew Sapperstein [Fri, 7 Jul 2017 18:02:00 +0000 (11:02 -0700)]
Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.
Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes:
62298578
Test: robotests
jackqdyulei [Fri, 7 Jul 2017 19:47:14 +0000 (19:47 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev am:
062dedb072
am:
3decd57c50 -s ours
Change-Id: I2975753557bdc016d13c3e0acea0801a36d28c53
jackqdyulei [Fri, 7 Jul 2017 19:39:06 +0000 (19:39 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev
am:
062dedb072
Change-Id: I0f992f6191181be50a54040c0694037cf49a77f5
TreeHugger Robot [Fri, 7 Jul 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev
Ajay Nadathur [Fri, 7 Jul 2017 00:03:11 +0000 (17:03 -0700)]
Overlapping text over fingerprint animation
bug:
63122688
Test: Manually tested and verified using smallest & largest display
settings
Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
Rajeev Kumar [Fri, 7 Jul 2017 18:39:07 +0000 (18:39 +0000)]
Merge "Some import cleanups."
Stephen Chen [Fri, 7 Jul 2017 18:21:51 +0000 (11:21 -0700)]
Change words in wifi settings toggle to lowercase.
Bug:
62343859
Test: make RunSettingsRoboTests -j40
Change-Id: If0e653fd7268e5e14f360a043cdc039a7846bb4a
Antony Sargent [Fri, 7 Jul 2017 18:09:24 +0000 (11:09 -0700)]
Get rid of spurious gear icon in BT details page
The problem is that we were calling done() on the EntityHeaderController
and passing false for whether to rebind the action buttons, which means
we were getting the default behavior including a visible gear
icon. Passing true to request rebinding causes that icon to be hidden.
Bug:
63405635
Test: make RunSettingsRoboTests
Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03
Andrew Sapperstein [Fri, 7 Jul 2017 18:04:37 +0000 (18:04 +0000)]
Merge "Search bar polish" into oc-dr1-dev am:
d10a1af258
am:
e0c01c6605
Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev am:
9afa37ac3c
am:
d6e1be947e
Change-Id: I253706d61d4c917601581457b128f7fedec3a12c
Andrew Sapperstein [Fri, 7 Jul 2017 17:47:19 +0000 (17:47 +0000)]
Merge "Search bar polish" into oc-dr1-dev
am:
d10a1af258
Change-Id: Ia09442652744696c2902356b66367d46e7f20534
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
am:
9afa37ac3c
Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
TreeHugger Robot [Fri, 7 Jul 2017 17:39:11 +0000 (17:39 +0000)]
Merge "Search bar polish" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:30:15 +0000 (17:30 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 17:06:07 +0000 (17:06 +0000)]
Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af am:
cfa37bb121"
Android Build Merger (Role) [Fri, 7 Jul 2017 17:05:55 +0000 (17:05 +0000)]
Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af am:
cfa37bb121"
Adrian Roos [Fri, 7 Jul 2017 17:05:50 +0000 (17:05 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af
am:
cfa37bb121
Change-Id: I67430769e05885673c08ac0e9291171d9a86ea4d
Android Build Merger (Role) [Fri, 7 Jul 2017 17:05:45 +0000 (17:05 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours am:
dc333a317e -s ours"
Adrian Roos [Fri, 7 Jul 2017 17:05:39 +0000 (17:05 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af
am:
cfa37bb121
Change-Id: Ie089ee289db78126aba7196e7c1277ab557df61a
Bill Yi [Fri, 7 Jul 2017 17:05:29 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours
am:
dc333a317e -s ours
Change-Id: If837e09f2811d3114cfbbc72bc9be619593b3f31
Bill Yi [Fri, 7 Jul 2017 17:05:17 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours
am:
dc333a317e -s ours
Change-Id: I3ef6ec6fd8c2ebc77325a20ee6b178a08446d59e
jackqdyulei [Wed, 5 Jul 2017 22:49:16 +0000 (15:49 -0700)]
Create BatterySaverReceiver
This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.
BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.
Bug:
32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Merged-In: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Adrian Roos [Fri, 7 Jul 2017 16:57:56 +0000 (16:57 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
am:
6d8f0b57af
Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
TreeHugger Robot [Fri, 7 Jul 2017 16:52:44 +0000 (16:52 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Log async ranking state in Settings search ranking"
Bill Yi [Fri, 7 Jul 2017 16:02:10 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e371dcf55a -s ours
Change-Id: If7245374f3d569a9406d632fc7a6c4d618b1dfd0
TreeHugger Robot [Fri, 7 Jul 2017 15:45:55 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 14:30:04 +0000 (16:30 +0200)]
AOD Settings: Add battery usage warning
Change-Id: I14946046c1541e8092ed2b492867730713e3e1ed
Fixes:
33279975
Test: Open Settings > Display. Verify that always on strings contain the increased battery usage warning.
Bill Yi [Fri, 7 Jul 2017 10:12:06 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Fri, 7 Jul 2017 10:01:25 +0000 (03:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9a5c1d5f9795c7ca3120f792300ec3d4e3cc8b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Fri, 7 Jul 2017 04:00:34 +0000 (04:00 +0000)]
Merge "Change strings for settings toggles when scorer is unset or unsupported."
Kevin Chyn [Fri, 7 Jul 2017 03:57:30 +0000 (03:57 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev am:
d0487eff5e
am:
6d41ab7958
Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
Philip Quinn [Fri, 7 Jul 2017 03:51:09 +0000 (03:51 +0000)]
Add SeekBarPreference.getMax(). am:
648ddd5c83
am:
7d46906218
Change-Id: Id8d9071b4a9ceac31fe81eb7d1de31890d9156f1
Kevin Chyn [Fri, 7 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
am:
d0487eff5e
Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
Philip Quinn [Fri, 7 Jul 2017 03:47:19 +0000 (03:47 +0000)]
Add SeekBarPreference.getMax().
am:
648ddd5c83
Change-Id: I2ea54359e6c13b0626ed96da6c8924e70d3d95cb
TreeHugger Robot [Fri, 7 Jul 2017 03:43:12 +0000 (03:43 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
Philip Quinn [Sun, 2 Jul 2017 04:24:10 +0000 (21:24 -0700)]
Add SeekBarPreference.getMax().
Bug:
63047816
Test: make -j
Change-Id: I416d044fa32f3aed32c1e6239baf9c57652bca2e
Doris Ling [Fri, 7 Jul 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
73b6a18d24
Change-Id: I5711f999c28fcdfd4cbeef0fd807e00a4687a8a2
Doris Ling [Fri, 7 Jul 2017 03:35:19 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
7091fa4882
Change-Id: I73573bcae13c54e0903c6e0a2d81a4802d39a9d9
jackqdyulei [Fri, 7 Jul 2017 03:34:51 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
c0e8d57a48
Change-Id: I961166ef36ac9523355affdd5231af658a67ed75
jackqdyulei [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
0291cbb58e
Change-Id: I7942d4ab3bd2ceb29375dd62c58ff319b9d5d9e8
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:56 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
e0d864aae1
Change-Id: Ia89bdd1f99bdc351ac0b9609e003d0d2166722c2
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:25 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
0ee38fa7eb
Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
Doris Ling [Fri, 7 Jul 2017 03:32:55 +0000 (03:32 +0000)]
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc" into oc-dr1-dev-plus-aosp
am:
abe9a99474
Change-Id: I7e4e805120d934d10fcdc0af0a82d25b007d0899
Doris Ling [Fri, 7 Jul 2017 03:31:35 +0000 (03:31 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc
am:
40822c1800
Change-Id: Id3fee0ce04f5d599c38ccea00e85c5f1bbfa1445
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:58 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:56 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:37 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:26 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Ic0867be73688beed9ddf5395ed9427572d1b5165
OSDN Git Service
