Svetoslav Ganov
00f7070f18
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am: de090f3f85
...
am: 3300192cdb
2016-08-24 02:10:31 +00:00
Svetoslav Ganov
e9f958f2b6
Only sync adapters with access can see an account - settings am: 6f9bf1da90
...
am: a2c7515a3f
2016-08-24 02:10:20 +00:00
Sudheer Shanka
c1cbdef71d
Merge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72
...
am: 35221c350d
2016-08-24 02:10:18 +00:00
Yoshinori Hirano
ce6a2356ad
Show summary of "Add user" item am: 2ce843b00e
...
am: 9224414477
2016-08-24 02:10:16 +00:00
Maurice Lam
44f8e7ab2e
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am: 497704a2cf
...
am: b62638e83b
2016-08-24 02:10:15 +00:00
Maurice Lam
7d64ded43f
Position fingerprint progress in the center on landscape am: 5fffa74d68
...
am: b2d7eced0b
2016-08-24 02:09:28 +00:00
Fan Zhang
017d6048c4
Force phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a
...
am: 97df6439b9
2016-08-24 02:09:27 +00:00
Maurice Lam
1755a04f6b
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e
...
am: 8291dc725d
2016-08-24 02:09:27 +00:00
Maurice Lam
7da62c35a7
Remove duplicate string for fingerprint enroll am: 64ac93ba40
...
am: e0c8fcf453
2016-08-24 02:09:26 +00:00
Doris Ling
6dcd71756d
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba
...
am: 12a0952d49
2016-08-24 02:09:25 +00:00
Doris Ling
6890d538ae
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
...
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
2016-08-23 19:02:31 -07:00
Svetoslav Ganov
3300192cdb
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
...
am: de090f3f85
2016-08-23 23:35:22 +00:00
Svetoslav Ganov
a2c7515a3f
Only sync adapters with access can see an account - settings
...
am: 6f9bf1da90
2016-08-23 23:35:21 +00:00
TreeHugger Robot
de090f3f85
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
2016-08-23 23:26:48 +00:00
Sudheer Shanka
35221c350d
Merge "Show summary of "Add user" item" into nyc-mr1-dev
...
am: acd34a9c72
2016-08-23 23:25:09 +00:00
Yoshinori Hirano
9224414477
Show summary of "Add user" item
...
am: 2ce843b00e
2016-08-23 23:25:05 +00:00
Sudheer Shanka
acd34a9c72
Merge "Show summary of "Add user" item" into nyc-mr1-dev
2016-08-23 23:23:08 +00:00
Maurice Lam
b62638e83b
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
...
am: 497704a2cf
2016-08-23 23:08:05 +00:00
Maurice Lam
b2d7eced0b
Position fingerprint progress in the center on landscape
...
am: 5fffa74d68
2016-08-23 23:08:04 +00:00
Maurice Lam
497704a2cf
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
2016-08-23 22:57:32 +00:00
Fan Zhang
97df6439b9
Force phone number display to be LTR in support tab. am: 68c6d9956f
...
am: 197829fb8a
2016-08-23 22:46:01 +00:00
Fan Zhang
197829fb8a
Force phone number display to be LTR in support tab.
...
am: 68c6d9956f
2016-08-23 22:43:30 +00:00
Maurice Lam
8291dc725d
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
...
am: 993d37749e
2016-08-23 22:23:01 +00:00
Maurice Lam
e0c8fcf453
Remove duplicate string for fingerprint enroll
...
am: 64ac93ba40
2016-08-23 22:23:00 +00:00
Maurice Lam
993d37749e
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
2016-08-23 22:19:57 +00:00
Doris Ling
12a0952d49
Merge "Log settings suggestions events only once." into nyc-mr1-dev
...
am: c4e5acedba
2016-08-23 22:18:00 +00:00
Doris Ling
f757d1ede8
Log settings suggestions events only once.
...
am: bfbb964cb1
2016-08-23 22:18:00 +00:00
Doris Ling
c4e5acedba
Merge "Log settings suggestions events only once." into nyc-mr1-dev
2016-08-23 22:15:52 +00:00
Doris Ling
9ca6758e0b
Add scrollbar to Settings app. am: 124251d54e
...
am: 13a4eeb2a9
2016-08-23 21:46:42 +00:00
Svetoslav Ganov
6f9bf1da90
Only sync adapters with access can see an account - settings
...
This change ensures that when the user tries to toggle a sync for a
sync adapter that doesn't have access to an account we show UI for
the user to approve the sync.
bug:28163381
Change-Id: I59802df6614572cf0eaf4b72a177beb111b87b34
2016-08-23 21:44:47 +00:00
Doris Ling
13a4eeb2a9
Add scrollbar to Settings app.
...
am: 124251d54e
2016-08-23 21:43:33 +00:00
Maurice Lam
5fffa74d68
Position fingerprint progress in the center on landscape
...
Update the layout of the landscape fingerprint enrolling screen to
be consistent with fingerprint find sensor, which vertically centers
the graphic on the right.
Also added back the accessibility live region for TalkBack.
Bug: 30288351
Bug: 30287231
Change-Id: Ia5b429215e36bbc108585aa8b14330b77ddc8584
(cherry picked from commit c81575138e
2016-08-23 20:58:50 +00:00
Maurice Lam
64ac93ba40
Remove duplicate string for fingerprint enroll
...
Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit 56093f6f4f
2016-08-23 20:57:28 +00:00
Fan Zhang
68c6d9956f
Force phone number display to be LTR in support tab.
...
Bug: 31030062
Test: manual switch between LTR/RLT languages
Change-Id: I94272c0ecbfa2f96842838c0f590b3704cd5c020
(cherry picked from commit dcfdde5a2c
2016-08-23 20:41:02 +00:00
Doris Ling
bfbb964cb1
Log settings suggestions events only once.
...
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes: 30108142
2016-08-23 13:25:06 -07:00
Rubin Xu
0085774488
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am: 0948ce0cdb
...
am: f9665da994
2016-08-23 18:31:19 +00:00
Rubin Xu
7c23b6b04a
Remove duplicated call to authenticationSucceeded() am: 3a437490be
...
am: 886af76fb3
2016-08-23 18:31:16 +00:00
Rubin Xu
a2da83d30a
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am: 7a4ecbac12
...
am: bd7e2376fc
2016-08-23 18:30:14 +00:00
Rubin Xu
a63a05362f
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am: da9f9a0fab
...
am: 7425b2d677
2016-08-23 18:30:10 +00:00
Doris Ling
fa896fbf9a
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am: 6cdd5fccd8
...
am: 7849b2044c
2016-08-23 18:30:09 +00:00
Doris Ling
753f95d7e0
Fix crash when selecting AppInfo for uninstalled app from Recents. am: 7574b64910
...
am: 0f7d5f36a3
2016-08-23 18:30:08 +00:00
Doris Ling
b29f18c49f
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am: e9af5024a1
...
am: 7c529e5ba8
2016-08-23 18:30:07 +00:00
Doris Ling
340d8b6268
Update Jump to Camera gesture settings description text. am: 8d9b89ed5c
...
am: b9ed707735
2016-08-23 18:29:11 +00:00
Doris Ling
317af15dec
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am: cf988e3d64
...
am: f1c69ead73
2016-08-23 18:29:10 +00:00
Doris Ling
6e5ea7dbb9
Fix caption text being cut off when text size is set to very large. am: 0f625ae280
...
am: 3768e718c6
2016-08-23 18:29:09 +00:00
Doris Ling
f101f3c396
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10
...
am: ea445c9db7
2016-08-23 18:29:08 +00:00
Doris Ling
a44f2e0f8f
Fix margin in Tap & pay -> Payment default. am: 9e29ac7983
...
am: 88842736d7
2016-08-23 18:29:07 +00:00
Matthew Fritze
b4522799ef
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am: 88d3cb7176
...
am: c9be13f26e
2016-08-23 18:28:04 +00:00
Matthew Fritze
bf61bf6459
Stop apps with Storage Managers from launching activity when disabled am: 1051fe1e14
...
am: 7444ee791c
2016-08-23 18:27:59 +00:00
Salvador Martinez
bc81965891
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b
...
am: b3b0fd931b
2016-08-23 18:27:56 +00:00
