OSDN Git Service
jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text
So the header won't grow/shrink when the text changes.
Bug:
64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
Bill Yi [Wed, 26 Jul 2017 17:04:23 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: I8b980099381db8f56e3a339dfe497cce93595674
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Antony Sargent [Wed, 26 Jul 2017 11:12:39 +0000 (11:12 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:24:19 +0000 (08:24 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
0c3ee7c15d -s ours
Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5
Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f
Bill Yi [Wed, 26 Jul 2017 08:03:05 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88
Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: If4a3775dac048d13e739174b79415cf025bd4454
Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]
Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.
Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:
-The TestAccessPointBuilder class wasn't being found at runtime because
it was getting stripped out at build time due to not being used in
settings.
-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
asserting that we don't end up with multiple entries for the same SSID
in the access point list when changing the security state for the AP,
but it was accidentally passing multiple AP's with the same name the
first time.
Bug:
33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
Jack He [Wed, 26 Jul 2017 06:34:29 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am:
0c6f001c09
Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6
TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 06:23:08 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a
Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d
TreeHugger Robot [Wed, 26 Jul 2017 06:11:07 +0000 (06:11 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 06:07:30 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
Fan Zhang [Wed, 26 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christine Franks [Wed, 26 Jul 2017 02:56:36 +0000 (02:56 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am:
a7e10e0316
Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
Christine Franks [Wed, 26 Jul 2017 02:38:08 +0000 (02:38 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 02:08:44 +0000 (02:08 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am:
0e9711ab92
Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
TreeHugger Robot [Wed, 26 Jul 2017 02:02:32 +0000 (02:02 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
Matthew Fritze [Wed, 26 Jul 2017 01:57:29 +0000 (01:57 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
am:
5aca5f3aec
Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
TreeHugger Robot [Wed, 26 Jul 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
Jack He [Tue, 25 Jul 2017 21:50:11 +0000 (14:50 -0700)]
Bluetooth: reset mConnectionState when adapter is OFF
* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
order to display the correct summary message on ConnectedDevice
preference
* Otherwise, "Connected to null" will be shown because no device is
connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state
Bug:
62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409
Andrew Sapperstein [Tue, 25 Jul 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
b5696a9162
Change-Id: I126be625a1b9114ca067dca0f2fe99c7aa395873
Fan Zhang [Mon, 24 Jul 2017 23:03:49 +0000 (16:03 -0700)]
Extract method to build preference count logging's name.
Bug:
35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
Doris Ling [Mon, 24 Jul 2017 20:13:00 +0000 (13:13 -0700)]
Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.
Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix:
63939450
Test: make RunSettingsRoboTests
Andrew Sapperstein [Tue, 25 Jul 2017 23:37:37 +0000 (23:37 +0000)]
Merge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:30:32 +0000 (23:30 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am:
5b67e453bf
Change-Id: I7694793ff006a2c677511563b69e411b6ed284f2
Andrew Sapperstein [Tue, 25 Jul 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.
Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes:
63955012
Test: robotests
Fan Zhang [Tue, 25 Jul 2017 21:30:26 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
TreeHugger Robot [Tue, 25 Jul 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
Roshan Pius [Tue, 25 Jul 2017 21:01:43 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca
Change-Id: I39ee1e7e6712e6acec56aaa088ef19ea2669784c
Lei Yu [Tue, 25 Jul 2017 20:55:21 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb
Roshan Pius [Tue, 25 Jul 2017 20:52:29 +0000 (20:52 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Christine Franks [Wed, 12 Jul 2017 00:32:57 +0000 (17:32 -0700)]
Restrict changing wi-fi networks
Bug:
31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
jackqdyulei [Fri, 21 Jul 2017 19:18:33 +0000 (12:18 -0700)]
Add anomaly detection method to AnomalyUtils
So we could reuse it in different loaders.
Bug:
63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug:
64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9
Bartosz Fabianowski [Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am:
262aacd353
Change-Id: I24ffc75897c92124cf9416ea79ff4c704a733c0e
Bartosz Fabianowski [Tue, 25 Jul 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 05:36:32 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am:
5e707ccb3d
Change-Id: Ib988ae3439dbbaed2c84d906b6e88412ce27461f
Kevin Chyn [Tue, 25 Jul 2017 05:31:53 +0000 (05:31 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes:
63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am:
8f5de15ba1
Change-Id: Ie575c4a6335b83b00d8f2614bba532843a88534d
Kevin Chyn [Mon, 24 Jul 2017 21:00:18 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
Andrew Sapperstein [Mon, 24 Jul 2017 20:42:19 +0000 (13:42 -0700)]
Make AirplaneModePrefController.isAvailable static.
Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.
Bug:
62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5
Fan Zhang [Sat, 22 Jul 2017 00:51:47 +0000 (17:51 -0700)]
Fix search indexing for encryption_and_credential page
- Rewrite search index provider to include all possible keys through
getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
device state
Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix:
37650170
Test: robotests
Ajay Nadathur [Fri, 21 Jul 2017 22:11:21 +0000 (15:11 -0700)]
Use fingerprint icons during setupwizard flow
Use fingerprint icon when lock screens are loaded on
fingerprint setup's behalf.
bug:
63809908
Test: Manually tested and verified. Also added robolectric tests
Change-Id: I773a1eec2466e7ab626cc3330f5ce987a21b048f
Lei Yu [Mon, 24 Jul 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I7ca4b466c6f175192bebb2b9a7807ebf783a249e
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:10 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b
Change-Id: Ie00201adc19b7da516e3bb64fe857a17f8282d28
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Fan Zhang [Sat, 22 Jul 2017 17:59:38 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c
Change-Id: Iacb3b689d1099bb12e43ff42e2f17166428ddfc5
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Andrew Sapperstein [Sat, 22 Jul 2017 00:32:32 +0000 (00:32 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
TreeHugger Robot [Sat, 22 Jul 2017 00:28:31 +0000 (00:28 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
Andrew Sapperstein [Fri, 21 Jul 2017 22:01:55 +0000 (15:01 -0700)]
Add help uri for process stats summary and apps.
Bug:
62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
Fan Zhang [Fri, 21 Jul 2017 21:47:13 +0000 (21:47 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I25e7a3c66fddb8b594e06ced3435fa02273dc68e
Fan Zhang [Fri, 21 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:30:18 +0000 (20:30 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am:
0ec3e4e626
Change-Id: Idcd210c8643f4e60375ab957bcc83136e5ffb0f3
Lei Yu [Fri, 21 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
Antony Sargent [Fri, 21 Jul 2017 20:11:53 +0000 (20:11 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am:
a6ac4890ed
Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.
Change-Id: I85d4c4a994c7ff808662371c857cac1929a8b1cd
Merged-In: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug:
63903835
Test: robotests
TreeHugger Robot [Fri, 21 Jul 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
jackqdyulei [Tue, 18 Jul 2017 18:02:53 +0000 (11:02 -0700)]
Add log for anomaly.
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.
Bug:
63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
Christine Franks [Fri, 21 Jul 2017 19:05:42 +0000 (19:05 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am:
cb9a7075f8
Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7
Christine Franks [Fri, 21 Jul 2017 18:52:56 +0000 (18:52 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap
Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix:
62891178
Test: robotests
Fan Zhang [Fri, 21 Jul 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am:
e09338a208
Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
Fan Zhang [Fri, 21 Jul 2017 18:18:44 +0000 (18:18 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
jackqdyulei [Fri, 21 Jul 2017 01:00:20 +0000 (18:00 -0700)]
Make anomaly item refresh in battery
Bug:
63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am:
56b748d686
Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
Julia Reynolds [Fri, 21 Jul 2017 13:07:23 +0000 (09:07 -0400)]
Zen settings screen update
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes:
63905920
Fixes:
63906381
Test: manual
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am:
4ab6f77f98
Change-Id: I17baf254839424d21f1588b1a7925927437b95c6
TreeHugger Robot [Fri, 21 Jul 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit
e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec)
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings
Bug:
62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
Doris Ling [Fri, 21 Jul 2017 00:05:57 +0000 (17:05 -0700)]
Add divider line below "see all apps" preference
- and increase the tile limit by 1 to accomodate the divider.
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix:
63906012
Test: make RunSettingsRoboTests
(cherry picked from commit
6cd558e595a1d7cb6912b9c2cc1fb8e9e5267ecc)
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am:
e4c9b7162d
Change-Id: Ib105c6a9769db260e781dde61af74563735345a3
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:43:32 +0000 (20:43 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
Evan Laird [Thu, 20 Jul 2017 20:42:46 +0000 (20:42 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 20:05:12 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
OSDN Git Service
