Lei Yu
0e0bf4672b
Merge "Refine update process for restrict tip." into pi-dev
...
am: 018548b320
Change-Id: I947eac4e04f049dda27a306427a9bf70412527fc
2018-05-18 19:02:55 -07:00
TreeHugger Robot
018548b320
Merge "Refine update process for restrict tip." into pi-dev
2018-05-19 01:55:05 +00:00
Shuzhen Wang
d359d7c47e
[automerger skipped] Merge "Settings: Add logical camera default switch" into pi-dev am: 871d93a564
...
am: 94f80c719a
-s ours
Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8
2018-05-18 18:51:13 -07:00
hughchen
fdc33416d6
[automerger skipped] Merge "Add controller to show the summary" into pi-dev am: 863b27270d
...
am: e5ec69e433
-s ours
Change-Id: I42d0991a22187c1b9782db7af7e836ddd299a2fd
2018-05-18 18:49:44 -07:00
Alexey Kuzmin
cf663511db
Add vibration preview
...
Test: Open vibration intensity settings, tap on any option. The preview
effect of selected intensity should be played back.
Bug: 74504389
Merged-In: Ie22ecb830752edb7a7515a3a6475587e72274e51
Change-Id: Ie22ecb830752edb7a7515a3a6475587e72274e51
2018-05-19 02:48:09 +01:00
Shuzhen Wang
94f80c719a
Merge "Settings: Add logical camera default switch" into pi-dev
...
am: 871d93a564
Change-Id: Id24373caa953f31fae232eb965710cca909ce19d
2018-05-18 18:37:16 -07:00
hughchen
e5ec69e433
Merge "Add controller to show the summary" into pi-dev
...
am: 863b27270d
Change-Id: I612207108138216ba865cb026b00866ae9f53250
2018-05-18 18:35:44 -07:00
Alexey Kuzmin
96f114ad7e
Add vibration preview
...
Test: Open vibration intensity settings, tap on any option. The preview
effect of selected intensity should be played back.
Bug: 74504389
Merged-In: Ie22ecb830752edb7a7515a3a6475587e72274e51
Change-Id: Ie22ecb830752edb7a7515a3a6475587e72274e51
2018-05-19 02:30:44 +01:00
Antony Sargent
6c196e3227
Merge "Update headset, help, and info icons" into pi-dev am: 88d4356a1f
...
am: d789f43ea9
Change-Id: I26ad75ad4d88395a25445308318a80cd4e1414b8
2018-05-18 18:30:26 -07:00
Antony Sargent
a6b602e370
Merge "Refresh of "swipe up" gesture animation" into pi-dev am: 5d0efdce7f
...
am: 1ead1f1665
Change-Id: I481687f0a8b6c65d6dff2a18dbe280230d0cd550
2018-05-18 18:29:41 -07:00
TreeHugger Robot
871d93a564
Merge "Settings: Add logical camera default switch" into pi-dev
2018-05-19 01:27:11 +00:00
TreeHugger Robot
863b27270d
Merge "Add controller to show the summary" into pi-dev
2018-05-19 01:26:12 +00:00
Antony Sargent
d789f43ea9
Merge "Update headset, help, and info icons" into pi-dev
...
am: 88d4356a1f
Change-Id: Ic8ae157f46296613edd6f0b75a43973d4a69d048
2018-05-18 18:25:46 -07:00
Antony Sargent
1ead1f1665
Merge "Refresh of "swipe up" gesture animation" into pi-dev
...
am: 5d0efdce7f
Change-Id: Ieb09a7411a7e4f81ccd9fea2f9f7b53c5ce07ebd
2018-05-18 18:24:44 -07:00
TreeHugger Robot
88d4356a1f
Merge "Update headset, help, and info icons" into pi-dev
2018-05-19 01:22:23 +00:00
TreeHugger Robot
5d0efdce7f
Merge "Refresh of "swipe up" gesture animation" into pi-dev
2018-05-19 01:20:35 +00:00
Hansong Zhang
e36ca3e96d
DO NOT MERGE Give PBAP permission only after user confirms
...
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-18 17:31:42 -07:00
Fan Zhang
1d04fa9197
Merge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549
...
am: 9b8684fd12
Change-Id: I99e6bf942928fe64595c1eba03c3099910fc0545
2018-05-18 16:10:25 -07:00
Antony Sargent
93efecbe47
Refresh of "swipe up" gesture animation
...
Fixes: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I3e6f187ffd79c8b39afeb783fd067878136d0feb
2018-05-18 16:09:20 -07:00
Fan Zhang
9b8684fd12
Merge "Don't use cached app icon in app info page." into pi-dev
...
am: 7312f55549
Change-Id: I3f196276bca134df35d0c723ae637354f5214744
2018-05-18 16:08:08 -07:00
Shuzhen Wang
a9578a2b8a
Settings: Add logical camera default switch
...
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.
Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 23:01:03 +00:00
TreeHugger Robot
f5e52c421b
Merge "Settings: Add logical camera default switch"
2018-05-18 22:58:35 +00:00
Beverly
76507e06b6
[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev am: cf845f365c
...
am: 9c6ccfbb4a
-s ours
Change-Id: Ie2482ef0da93306300b1c15e6a1cec8fff4d43b5
2018-05-18 15:58:19 -07:00
Antony Sargent
6ef7737b71
Update headset, help, and info icons
...
Bug: 77982107
Test: manual
Change-Id: Ib5fe8e4df4a524b9c50ad395cd0189bef5fcafa5
2018-05-18 15:45:01 -07:00
TreeHugger Robot
7312f55549
Merge "Don't use cached app icon in app info page." into pi-dev
2018-05-18 22:43:35 +00:00
Beverly
9c6ccfbb4a
Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
...
am: cf845f365c
Change-Id: Ifdbe1baa8fc2b7cff4520ef61aa9277d9aeaef15
2018-05-18 15:32:12 -07:00
TreeHugger Robot
cf845f365c
Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
2018-05-18 22:23:37 +00:00
Salvador Martinez
f3d532f43d
Make user explicitly set security type for tether network
...
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.
Test: robotests
Bug: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-18 15:21:07 -07:00
Beverly
f6d54bc6c5
Don't give onboarding dialog a fixed width
...
Test: visual inspection (display and font largest)
Change-Id: Ia81cfa41c125d088d95db2e29f83248dc6819396
Fixes: 79960996
2018-05-18 22:19:22 +00:00
Beverly
77f3973d97
Update DND strings
...
Test: manual
Bug: 79525632
Change-Id: Ia6106d03499fa546df51dc80f086c7cd684acad4
2018-05-18 22:19:02 +00:00
Nathan Harold
93a2b1e893
Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp
...
am: 3eb0dbdee0
Change-Id: I010e6932d481a6e031239212bb01258a317a7c41
2018-05-18 15:18:27 -07:00
Nathan Harold
3eb0dbdee0
Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp
...
* changes:
[Telephony Debug Menu] Redo Layout
[Telephony Debug Menu] Remove DcRtInfo
[Telephony Debug Menu] Remove NeighboringCellInfo
2018-05-18 22:09:20 +00:00
Antony Sargent
bdba093a59
Merge "Update cancel and cast icons" into pi-dev am: cf2dc360bd
...
am: a219ed30df
Change-Id: I9857a7e87943426b1a7759526448690351239d89
2018-05-18 14:53:17 -07:00
Antony Sargent
28f04c984d
Merge "Updated delete icon" into pi-dev am: 55642ef91b
...
am: d55b214dbd
Change-Id: Ifca325273ca5e99461a93487b127b5d0adcf6a39
2018-05-18 14:52:44 -07:00
Antony Sargent
a219ed30df
Merge "Update cancel and cast icons" into pi-dev
...
am: cf2dc360bd
Change-Id: I234d9aff45339d501669f05e3dafa9969542d2bc
2018-05-18 14:49:56 -07:00
Antony Sargent
d55b214dbd
Merge "Updated delete icon" into pi-dev
...
am: 55642ef91b
Change-Id: I070f6c587c2b840793027e5e76fe4b258d76dd9d
2018-05-18 14:49:07 -07:00
Fan Zhang
95c8c89fee
Fix color lint baseline. am: 76a0ef6adb
...
am: 11c9f97a2f
Change-Id: I541566eda1a225d096c8a1210cfff114cef08a05
2018-05-18 14:39:57 -07:00
TreeHugger Robot
cf2dc360bd
Merge "Update cancel and cast icons" into pi-dev
2018-05-18 21:39:33 +00:00
TreeHugger Robot
55642ef91b
Merge "Updated delete icon" into pi-dev
2018-05-18 21:38:51 +00:00
Fan Zhang
11c9f97a2f
Fix color lint baseline.
...
am: 76a0ef6adb
Change-Id: I814c6575a157fa6c4f27cb68aa076df23f94e3be
2018-05-18 14:36:21 -07:00
Fan Zhang
fcbf155b47
Don't use cached app icon in app info page.
...
The cache in ApplicationsState is causing a lot of damage because AS
object is not smart enough to invalidate the cache in all conditions. So
we end up having bugs like stale app label or icon in weird cases.
This change stops using the cache when loading app icon in entity
headres. This is only a stop gap solution to fix most visible (and most
frequently complained) parts of the page. We still need to address the
cache in ApplicationsState eventually.
Change-Id: Iea88ad99d4069d678d09943cfb0b0e5c94eb3326
Fixes: 79881693
Test: robotests
2018-05-18 14:31:48 -07:00
Beverly
2f2a4d97e7
DO NOT MERGE Set click listeners on displayPreference
...
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Bug: 79728671
2018-05-18 21:24:37 +00:00
Shuzhen Wang
5aab8d9ee1
Settings: Add logical camera default switch
...
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.
Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 14:09:00 -07:00
Fan Zhang
76a0ef6adb
Fix color lint baseline.
...
This is broken by some automerge.
Change-Id: I520eff408ef2d071893b0ed4de3c4e58916bf9fc
Fixes: 79954469
Test: repo preupload
2018-05-18 20:33:45 +00:00
Lei Yu
551a1a0176
Refine update process for restrict tip.
...
When restrict tip update, we should also update app list unless it goes
from NEW to INVISIBLE. After that it won't show "0 apps been
restricted".
Change-Id: Iedf4288fcddfe632a9ba8c16afdfb5bc044bce2e
Fix: 79890132
Test: RunSettingsRoboTests
2018-05-18 13:00:03 -07:00
Ching-Sung Li
7c0c7a0626
Update color whitelist for color repohook (caused by auto-merge)
...
It's blocking CLs to be uploaded to git server becuase inconsistent code
by auto-merge
Test: Can build and upload CLs
Bug: 79954469
Change-Id: I8dfc2cb8d660c6ddc97b3e1c8f06db7db2e15cfb
2018-05-18 12:54:39 -07:00
Android Build Merger (Role)
51741602d1
Merge "[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910
am: f7fcdbda29
-s ours"
2018-05-18 19:35:01 +00:00
Matthew Fritze
2cc510974b
[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910
...
am: f7fcdbda29
-s ours
Change-Id: Ie1456f331f0547576ca3e540733e7b0982755700
2018-05-18 12:34:54 -07:00
TreeHugger Robot
42ef3471e4
Merge "Add controller to show the summary"
2018-05-18 19:34:48 +00:00
hughchen
a2a26442eb
Merge "Update UI when BT device is rename" into pi-dev am: 77d218ab72
...
am: 3053922340
Change-Id: I86bd3be4f017f5bd80a2308a5b1e99366027a476
2018-05-18 12:27:08 -07:00