Doris Ling
f8bb8a9792
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
2017-07-26 02:08:44 +00:00
TreeHugger Robot
0e9711ab92
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
2017-07-26 02:02:32 +00:00
Fan Zhang
00d306465c
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: 2f84a358d9
...
am: 3bc97152d1
Change-Id: Iea6491534c7d43a97456ab2e83eae5e32c747c80
2017-07-25 21:53:25 +00:00
Fan Zhang
3bc97152d1
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
...
am: 2f84a358d9
Change-Id: I727693edc69b0adfb862efce87834fc78657600e
2017-07-25 21:39:00 +00:00
Fan Zhang
2f84a358d9
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
2017-07-25 21:30:57 +00:00
Fan Zhang
f854a08c3e
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
2017-07-25 21:30:26 +00:00
Fan Zhang
325d28ae6c
Update misc strings
...
Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix: 62069132
Fix: 62265094
Test: visual
2017-07-25 13:40:37 -07:00
Julia Reynolds
e7f99fb9e3
Revert string change
...
Test: manual
Change-Id: I3f38ac68ae6b9fc225c92bdfcc0f79859ff8dfa1
Fixes: 63906381
2017-07-25 14:46:10 -04:00
Fan Zhang
febf70348b
Merge "Update string for bluetooth device visibility" into oc-mr1-dev am: c239561da5
...
am: 3c8b12e2dd
Change-Id: I3eff784da35cbb8713540518c271842945e63d12
2017-07-24 21:49:10 +00:00
Fan Zhang
3c8b12e2dd
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
...
am: c239561da5
Change-Id: Ic124bbed9f9bf3185787444264d063185f9754f6
2017-07-24 21:38:18 +00:00
Fan Zhang
a4a3833a08
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
2017-07-24 12:34:34 -07:00
Fan Zhang
358d30f093
Update string for bluetooth device visibility
...
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix: 62891178
Test: visual
Test: robotests
2017-07-24 18:40:59 +00:00
TreeHugger Robot
4d7111b0e9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-22 16:25:35 +00:00
TreeHugger Robot
06ce58b8d5
Merge "Import translations. DO NOT MERGE"
2017-07-22 16:13:53 +00:00
Bill Yi
555a55210a
Import translations. DO NOT MERGE
...
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:57:25 -07:00
Bill Yi
5f049085b9
Import translations. DO NOT MERGE
...
Change-Id: I72ad5b5a671392c519f7a4ca5fce76404c2240b5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:36:18 -07:00
Andrew Sapperstein
5a99deabf2
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: 80a5336b25" into oc-mr1-dev-plus-aosp
...
am: 3c6df33d4b
Change-Id: I6768483e56d60effb2127720a39e36034716514d
2017-07-22 00:42:57 +00:00
Antony Sargent
99257e5d7f
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 62b7527da5
...
am: 75512a3215
Change-Id: I8d5d76660f90ae614eaa420d0072f2a6024a50d7
2017-07-22 00:41:38 +00:00
Andrew Sapperstein
ca87892984
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
...
am: 80a5336b25
Change-Id: Ib32bcfa22706abf89633b86333498f77328daebb
2017-07-22 00:36:03 +00:00
Andrew Sapperstein
ebd8308698
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
...
am: 59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
2017-07-22 00:33:13 +00:00
Andrew Sapperstein
80a5336b25
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
...
am: 59a66d9b77
Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
2017-07-22 00:32:32 +00:00
Antony Sargent
75512a3215
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
...
am: 62b7527da5
Change-Id: Ibfe8afab3bf662c2855a28c27d636da17444eb79
2017-07-22 00:32:07 +00:00
Antony Sargent
0531bd48e3
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
...
am: a6ac4890ed
Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
2017-07-22 00:32:00 +00:00
TreeHugger Robot
59a66d9b77
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
2017-07-22 00:28:31 +00:00
Fan Zhang
ee308b950f
Layout tweak for app action buttons
...
Now shadow is no longer cropped when pressing button
Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes: 62550425
Test: visual
2017-07-21 15:06:36 -07:00
Andrew Sapperstein
64590ec7a6
Add help uri for process stats summary and apps.
...
Bug: 62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
2017-07-21 15:01:55 -07:00
Antony Sargent
62b7527da5
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
...
am: a6ac4890ed
Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
2017-07-21 20:11:53 +00:00
TreeHugger Robot
a6ac4890ed
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
2017-07-21 20:03:41 +00:00
Bill Yi
2bef642280
Import translations. DO NOT MERGE
...
Change-Id: Ifb876a3208315c84fad355fac5204336eb8681e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-21 12:22:06 -07:00
Fan Zhang
8df2cef10d
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
...
am: e09338a208
Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
2017-07-21 18:23:56 +00:00
Fan Zhang
e09338a208
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
2017-07-21 18:18:44 +00:00
Doris Ling
31ac55877c
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev am: a39daa25e7
...
am: 9275814c02
Change-Id: I3ef01527517f7660913b34621b7c74c1250d3361
2017-07-21 17:29:34 +00:00
Doris Ling
a39daa25e7
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
2017-07-21 17:19:12 +00:00
Julia Reynolds
1525457b4d
Zen settings screen update am: 56b748d686 am: 6ad9f3267b
...
am: eff648bf76
Change-Id: Ic32cc6a1762b60b15e76762868a403e9f2b143d7
2017-07-21 16:30:18 +00:00
Julia Reynolds
eff648bf76
Zen settings screen update am: 56b748d686
...
am: 6ad9f3267b
Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68
2017-07-21 16:27:00 +00:00
Julia Reynolds
6ad9f3267b
Zen settings screen update
...
am: 56b748d686
Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
2017-07-21 16:21:25 +00:00
Julia Reynolds
4faa353f02
Zen settings screen update
...
am: 56b748d686
Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686
Zen settings screen update
...
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Fan Zhang
ee8d574c26
Add shadow to searchbar when user scrolls vertically
...
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6 )
2017-07-21 01:34:46 +00:00
Fan Zhang
1cc0ebc79a
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev am: 91468e309c
...
am: 2770bfa38b
Change-Id: I6c6ceb9d46e88bccc727334bd5a8cd373519b11c
2017-07-21 00:44:01 +00:00
Doris Ling
6f44ea54ae
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 6cd558e595 )
2017-07-20 17:21:11 -07:00
TreeHugger Robot
acd97be0b8
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-20 21:17:34 +00:00
TreeHugger Robot
508a622fac
Merge "Import translations. DO NOT MERGE"
2017-07-20 21:08:37 +00:00
Doris Ling
c84001528c
Fix gesture preview image visibility not set correctly.
...
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.
Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix: 63783217
Test: make RunSettingsRoboTests
2017-07-20 20:41:43 +00:00
Fan Zhang
e651ddf9e6
Add shadow to searchbar when user scrolls vertically
...
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
2017-07-20 20:32:09 +00:00
Antony Sargent
64fab6f4cd
Switch to using gray icon for Bluetooth imaging devices
...
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.
Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
2017-07-20 09:54:29 -07:00
Doris Ling
204ca74397
Move Gesture settings up one level.
...
Move System->Languages, input & gestures->Gestures to System->Gestures.
Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7d0 )
2017-07-20 16:46:44 +00:00
Fan Zhang
dd0f8dd568
Merge "Move Gesture settings up one level."
2017-07-20 16:45:37 +00:00
Julia Reynolds
8639bbcb2e
Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
...
am: 2ab6e2ef9e
Change-Id: Idd8c5f5602a46e595077989dc03911367f633263
2017-07-20 14:26:50 +00:00
Julia Reynolds
2ab6e2ef9e
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
2017-07-20 14:24:03 +00:00