Ryusuke Sawa
b0e008841f
Merge "Show Error dialog when WPS is interrupted"
...
am: fd7dec5d4a
2017-07-27 18:21:19 +00:00
Ajay Nadathur
05fcf3baf2
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 17:43:24 +00:00
Kenny Guy
bb504346c7
Update work briefcase asset.
...
Bug: 36497538
Test: manual
Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
2017-07-27 16:58:08 +01:00
Julia Reynolds
7b423836ea
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5 am: d6ab7dee09
...
am: 81eb0697da
2017-07-27 12:48:21 +00:00
Julia Reynolds
81eb0697da
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
...
am: d6ab7dee09
2017-07-27 12:45:50 +00:00
Julia Reynolds
698ce72bc2
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
2017-07-27 12:43:21 +00:00
Julia Reynolds
d6ab7dee09
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
2017-07-27 12:43:21 +00:00
TreeHugger Robot
4b8f2c9ad5
Merge "Revert string change" into oc-dr1-dev
2017-07-27 12:36:55 +00:00
jackqdyulei
24f6fc8b05
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 063e87c689
...
am: 220b1f163a
2017-07-27 05:28:27 +00:00
Ryusuke Sawa
a15be47bd5
Show Error dialog when WPS is interrupted
...
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.
Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on
Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
jackqdyulei
220b1f163a
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 063e87c689
2017-07-27 01:33:28 +00:00
jackqdyulei
75e89dfede
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 01:08:43 +00:00
Jeff Davidson
a0b8472c4d
Remove eSIM reset checkbox and always perform the reset.
...
Due to substantial risk in landing the "retain profiles" flow that
would otherwise occur if the user elected not to wipe eSIM profiles
during a factory reset, we no longer expose this option to users
through the UI. Instead, we show affected users messaging indicating
that their eSIM will be wiped unconditionally.
The underlying plumbing is retained to keep the change small and to
make it easier to revert back to a checkbox when the rest of the
platform supports it.
Change-Id: Ida7df14d81ffc4cb6b4b414928d3ce7e5c78594b
Fixes: 64081853
Test: TreeHugger
2017-07-27 01:05:02 +00:00
Ajay Nadathur
cfc78d7d7c
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 00:38:14 +00:00
jackqdyulei
063e87c689
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 00:05:53 +00:00
Fan Zhang
0d64577205
Fix search indexing for game controller "use vibrator"
...
Change-Id: I34848a58b5ac4cdf58c7dd5f40677b78e764f2dc
Fix: 64035933
Test: robotests
2017-07-26 21:51:57 +00:00
TreeHugger Robot
76e4804a63
Merge "Import translations. DO NOT MERGE"
2017-07-26 21:41:58 +00:00
Maurice Lam
f88a617468
Raise CHAR LIMIT and update description
...
Raise header CHAR LIMIT to 40, and update the description to tell
translators to translate "Set fingerprint backup" if the translation
cannot fit within 40 chars.
Test: Existing tests pass
Bug: 63541502
Change-Id: Ie37e574873d73fc24a3acef5c3c054a561a16f3f
2017-07-26 19:47:44 +00:00
TreeHugger Robot
975d9a18f1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-07-26 19:39:46 +00:00
jackqdyulei
dbe6bd3984
Set minLines for battery header text
...
So the header won't grow/shrink when the text changes.
Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Bill Yi
67133670a6
Import translations. DO NOT MERGE
...
Change-Id: If81b78db0b3575bccde65cb54ee824b4897ddc56
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:26:10 -07:00
Bill Yi
0d07e5e3f3
Import translations. DO NOT MERGE
...
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 08:07:49 -07:00
Bill Yi
d5390dac46
Import translations. DO NOT MERGE
...
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:32:24 -07:00
Fan Zhang
0e641f55ae
Merge "Update misc strings" into oc-mr1-dev am: 34d30267e3
...
am: c2c42de513
2017-07-26 05:07:25 +00:00
Fan Zhang
c2c42de513
Merge "Update misc strings" into oc-mr1-dev
...
am: 34d30267e3
2017-07-26 05:02:56 +00:00
TreeHugger Robot
34d30267e3
Merge "Update misc strings" into oc-mr1-dev
2017-07-26 04:59:29 +00:00
Doris Ling
f8bb8a9792
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
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
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
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
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
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
2017-07-24 21:49:10 +00:00
Fan Zhang
3c8b12e2dd
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
...
am: c239561da5
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
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
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
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
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
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
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
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
