OSDN Git Service
Doris Ling [Thu, 25 Aug 2016 20:31:53 +0000 (20:31 +0000)]
Merge "Add ObservableDialogFragment to log DialogFragments."
Salvador Martinez [Thu, 25 Aug 2016 20:21:17 +0000 (20:21 +0000)]
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev am:
43344c83af am:
fedea9ed8d
am:
2915c67dfe
Change-Id: I36195e8763bdd809e8b59a6837215596a0d74233
Salvador Martinez [Thu, 25 Aug 2016 20:21:17 +0000 (20:21 +0000)]
Added guard to logging in AsyncTask am:
030eeeee6d am:
60bd509d4e
am:
a54c3690a4
Change-Id: I3752d2897aaf439376b8c6a5bff6b5b43d6c7190
Salvador Martinez [Thu, 25 Aug 2016 20:02:36 +0000 (20:02 +0000)]
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev am:
43344c83af
am:
fedea9ed8d
Change-Id: Ieef8b64a2323dfa546295ec6aac26803ff07bcc5
Salvador Martinez [Thu, 25 Aug 2016 20:02:35 +0000 (20:02 +0000)]
Added guard to logging in AsyncTask am:
030eeeee6d
am:
60bd509d4e
Change-Id: Ib1d37a0c9c68c01be0d59bff5d78cd37c083689f
Salvador Martinez [Thu, 25 Aug 2016 19:59:35 +0000 (19:59 +0000)]
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev
am:
43344c83af
Change-Id: Ibb2e26af8b72ad113e8ba9f7f33b676578fffa62
Salvador Martinez [Thu, 25 Aug 2016 19:59:34 +0000 (19:59 +0000)]
Added guard to logging in AsyncTask
am:
030eeeee6d
Change-Id: I5ad7dec889004484117a621a18e61c477c0c94d6
Salvador Martinez [Thu, 25 Aug 2016 19:57:24 +0000 (19:57 +0000)]
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev
TreeHugger Robot [Thu, 25 Aug 2016 19:51:01 +0000 (19:51 +0000)]
Merge "Updated Nexus imprint screen"
Noah Wang [Thu, 25 Aug 2016 19:01:17 +0000 (19:01 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change. am:
ff23df19ba am:
9e714c5871 am:
562c577e9c
am:
9e40c94fe8
Change-Id: Ia0fcd01225a5159ebfec5ca26502500f9362f717
Noah Wang [Thu, 25 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change. am:
ff23df19ba am:
9e714c5871
am:
562c577e9c
Change-Id: Id498a637d747160fd18465e0b2ed5e3f07e74b81
Noah Wang [Thu, 25 Aug 2016 18:46:22 +0000 (18:46 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change. am:
ff23df19ba
am:
9e714c5871
Change-Id: I04d1d090ada0e2a83e55a6b7ef4b7824dd9fc929
Noah Wang [Thu, 25 Aug 2016 18:42:57 +0000 (18:42 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change.
am:
ff23df19ba
Change-Id: I5667a6eecd3ab379a34a1d3488b6f03f354358d1
André Lago [Thu, 25 Aug 2016 18:07:39 +0000 (18:07 +0000)]
Merge "[Settings App] Fix char_limit of some strings"
Salvador Martinez [Wed, 24 Aug 2016 22:11:21 +0000 (15:11 -0700)]
Added guard to logging in AsyncTask
An async task was trying to get the context
in an InstrumentedFragment. This could return
null if the context disappears before the new
thread gets to that line. Logging will now
be aborted if context is null to avoid this.
Test: Manual/Monkey Stability Test
Bug:
31058928
Change-Id: Iae97d389e58a76b0f213a2749415501894ebf649
(cherry picked from commit
566b66e27c69fbf48860f367781800442c5110e7)
Doris Ling [Thu, 25 Aug 2016 17:42:50 +0000 (10:42 -0700)]
Add ObservableDialogFragment to log DialogFragments.
Bug:
30681529
Test: RunSettingsRoboTests
ObservableDialogFragment can be used as host of VisibilityLoggerMixin,
allowing us to log visibility change for all dialogs easily.
Change-Id: I973db929d8494d3756584ca60df3b2e87d96c757
Andre Lago [Thu, 25 Aug 2016 14:54:59 +0000 (15:54 +0100)]
[Settings App] Fix char_limit of some strings
Fix:
31032014
Fix:
30999277
Fix:
31002562
Fix:
31001271
Fix:
30996418
Fix:
31000455
Change-Id: I0616b02087e05d7f5a4691ab0954bec67f25c84b
Noah Wang [Tue, 23 Aug 2016 21:56:27 +0000 (14:56 -0700)]
Inflate necessary previews upon user interaction instead of
inflating everything on creation of the screen. This will
improve the speed of opening the screen and refreshing screen upon
commiting change.
Test: Manually tested by interacting with ViewPager and SeekBar.
Bug:
30697309
Change-Id: Ieb2fac95696b8be33fd508f3b75741529b68e946
(cherry picked from commit
5666ddfe5d96c8bb2454b5e9c296ef664e5af9ae)
Doris Ling [Thu, 25 Aug 2016 02:55:02 +0000 (02:55 +0000)]
Merge "Add tablet and device product version for the Moves description text." into nyc-mr1-dev am:
a40300e753 am:
02685e4408
am:
2334c0f7fd
Change-Id: I5e2f842c9869f8656580dad3b7f770698ffcbcac
Doris Ling [Thu, 25 Aug 2016 02:55:01 +0000 (02:55 +0000)]
Add tablet and device product version for the Moves description text. am:
fd87b198b1 am:
e9541147d2
am:
20322f4ec3
Change-Id: I7cc35952c11fc8ceb8dda5e7d801db8c0d01ffb8
Doris Ling [Thu, 25 Aug 2016 02:37:00 +0000 (02:37 +0000)]
Merge "Add tablet and device product version for the Moves description text." into nyc-mr1-dev am:
a40300e753
am:
02685e4408
Change-Id: Iaa5c0330a7ca3a6ffe2032aeea5da5cb84ea3b7d
Doris Ling [Thu, 25 Aug 2016 02:36:59 +0000 (02:36 +0000)]
Add tablet and device product version for the Moves description text. am:
fd87b198b1
am:
e9541147d2
Change-Id: I2ed4607d2ffe218bfe02afcbb44c15572509a39e
Doris Ling [Thu, 25 Aug 2016 02:34:00 +0000 (02:34 +0000)]
Merge "Add tablet and device product version for the Moves description text." into nyc-mr1-dev
am:
a40300e753
Change-Id: Iab4a482e8335c4de92c1dfdb081e96de95f60cd6
Doris Ling [Thu, 25 Aug 2016 02:33:59 +0000 (02:33 +0000)]
Add tablet and device product version for the Moves description text.
am:
fd87b198b1
Change-Id: Ia2a7efb92cde0d344c2ecd4b674794d362ef713a
TreeHugger Robot [Thu, 25 Aug 2016 02:27:14 +0000 (02:27 +0000)]
Merge "Add tablet and device product version for the Moves description text." into nyc-mr1-dev
Doris Ling [Thu, 25 Aug 2016 02:18:37 +0000 (02:18 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
465e926542 am:
6361e8fc86 am:
40b3ad2b2c
am:
478c96245a
Change-Id: I4c5ca46f1dbebd283a8ec6aee1753c37057226a6
Doris Ling [Thu, 25 Aug 2016 02:18:36 +0000 (02:18 +0000)]
Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev am:
b6ad0f9349 am:
11b1c2742d
am:
f3c7ad2408
Change-Id: Ie3531ec030e056b82b4d66868ef28bababff6b6c
Doris Ling [Thu, 25 Aug 2016 02:18:35 +0000 (02:18 +0000)]
Fix crash in ChooseLockPassworkFragment. am:
f958f2e14e am:
773a2ab217
am:
6ffe36cf79
Change-Id: I6792e6ac9bd209c7e2dc8b20a5173bb01ed788bc
Doris Ling [Thu, 25 Aug 2016 02:07:00 +0000 (02:07 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
465e926542 am:
6361e8fc86
am:
40b3ad2b2c
Change-Id: Idaf522d125e6c072d593861f9ed1bcf97c35e01f
Doris Ling [Thu, 25 Aug 2016 02:06:59 +0000 (02:06 +0000)]
Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev am:
b6ad0f9349
am:
11b1c2742d
Change-Id: Ie08cffb72ec311addaf821d0005bf3f84388bfd6
Doris Ling [Thu, 25 Aug 2016 02:06:58 +0000 (02:06 +0000)]
Fix crash in ChooseLockPassworkFragment. am:
f958f2e14e
am:
773a2ab217
Change-Id: Iaf85188f0b3df6884a876aa120b13fead5478295
Doris Ling [Thu, 25 Aug 2016 02:00:58 +0000 (02:00 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
465e926542
am:
6361e8fc86
Change-Id: I673c72f0cf7311a9e0381f6b2e2461458ac932bf
Doris Ling [Thu, 25 Aug 2016 02:00:57 +0000 (02:00 +0000)]
Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev
am:
b6ad0f9349
Change-Id: I86af1fc7787adb7afdbe8aa51b3cc185846215af
Doris Ling [Thu, 25 Aug 2016 02:00:57 +0000 (02:00 +0000)]
Fix crash in ChooseLockPassworkFragment.
am:
f958f2e14e
Change-Id: I5df6a8989513347f6f55cc5fff9c54852c2a80ec
Doris Ling [Thu, 25 Aug 2016 01:54:55 +0000 (01:54 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off.
am:
465e926542
Change-Id: Ie92491dd5aa16a473ead297a56795fe0d72bbb93
TreeHugger Robot [Thu, 25 Aug 2016 01:44:21 +0000 (01:44 +0000)]
Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev
Fan Zhang [Thu, 25 Aug 2016 01:15:43 +0000 (01:15 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc am:
1330f130d6 am:
4bc20232d6 am:
f5fff83919
am:
a12487e021
Change-Id: I4d38c456417f2e3425a6027d29ed3b886cf1b265
Doris Ling [Tue, 23 Aug 2016 23:08:34 +0000 (16:08 -0700)]
Fix animation video render issue when Settings->Moves is resumed from
screen off.
Re-initialize the animation video if necessary when the preference is
visible to the user.
Fixes:
31023261
Test: manual -
1. Go to Settings -> Moves and verify that the animation video are
displayed correctly on load.
2. Press power button to turn screen off, then on again. Verify when
Moves settings resumes, the animation video is displayed correctly.
3. Repeat #2 above but let display time out instead of turning off
screen by power button.
Change-Id: I0ee21d23a4c402b3a8463dca3b36fce67d651993
(cherry picked from commit
008ba4ec402c6b223ff4126d9a180b3931a049ef)
Fan Zhang [Thu, 25 Aug 2016 00:54:23 +0000 (00:54 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc am:
1330f130d6 am:
4bc20232d6
am:
f5fff83919
Change-Id: I718fe8765c1102f04472a94cdae5eb76a2d7f921
Doris Ling [Thu, 25 Aug 2016 00:27:50 +0000 (17:27 -0700)]
Add tablet and device product version for the Moves description text.
Provide corresponding version of the string device/phone/tablet
according to the product type.
Change-Id: I9f1e47b88ee0d72bb52b588f781470922ba572c2
Fixes:
30946424
Fan Zhang [Thu, 25 Aug 2016 00:51:36 +0000 (00:51 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc am:
1dda6f6430
am:
7edd25c8b6
Change-Id: Id086450a5b234e2c45b3e152bd21c4e0fa7c744e
Fan Zhang [Thu, 25 Aug 2016 00:51:35 +0000 (00:51 +0000)]
Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev am:
06609bec29 am:
d08309e829
am:
442e87e0a3
Change-Id: I52de239834df02a55e6c3c586e989f27cbaca87f
Fan Zhang [Thu, 25 Aug 2016 00:51:34 +0000 (00:51 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
3f0e1344d3 am:
bc6e2c49f0
am:
d96bc5b5a6
Change-Id: Id10ded6d97308c175194ffb59afdd89e924ed1c8
Fan Zhang [Thu, 25 Aug 2016 00:51:22 +0000 (00:51 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc am:
1330f130d6
am:
4bc20232d6
Change-Id: I684e6b21b297d9a681e1b1358192543167f4284a
Salvador Martinez [Wed, 24 Aug 2016 18:07:37 +0000 (11:07 -0700)]
Updated Nexus imprint screen
The fingerprint settings screen looked ugly so an
icon was added and the styles used in the
preferences normalized so everything lines up
and is flush now.
Test: Visually Inspect
Bug:
27834731
Change-Id: I208d7fc2aecbe64d3a0b771fc73f49c9612f6efa
Fan Zhang [Thu, 25 Aug 2016 00:47:51 +0000 (00:47 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc
am:
1330f130d6
Change-Id: Ifa8d1b0f30a07243a49a61bd92072de4e90e8709
Fan Zhang [Thu, 25 Aug 2016 00:47:51 +0000 (00:47 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
9d031f2fbc
am:
1dda6f6430
Change-Id: Id360e02374b1f35d7a3cc31c320328cf577a4dc4
Fan Zhang [Thu, 25 Aug 2016 00:44:53 +0000 (00:44 +0000)]
Don't remove wifi preferences when updating AP to avoid GC.
am:
9d031f2fbc
Change-Id: I0a4c7204dcb79880aee5db620b9642b8a1314757
Fan Zhang [Thu, 25 Aug 2016 00:44:53 +0000 (00:44 +0000)]
Don't remove wifi preferences when updating AP to avoid GC.
am:
9d031f2fbc
Change-Id: I3b589d86fc6ecd1a6caf0db9f3b9f7674dbe046a
TreeHugger Robot [Thu, 25 Aug 2016 00:36:32 +0000 (00:36 +0000)]
Merge "Added guard to logging in AsyncTask"
Fan Zhang [Thu, 25 Aug 2016 00:30:18 +0000 (00:30 +0000)]
Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev am:
06609bec29
am:
d08309e829
Change-Id: I7d01e213286e01c8c944148364789501f1fdecdc
Fan Zhang [Thu, 25 Aug 2016 00:30:17 +0000 (00:30 +0000)]
Don't remove wifi preferences when updating AP to avoid GC. am:
3f0e1344d3
am:
bc6e2c49f0
Change-Id: Id21a0340fd29bee4ee5bdf721d3ec7b44be8a961
Fan Zhang [Thu, 25 Aug 2016 00:20:21 +0000 (00:20 +0000)]
Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev
am:
06609bec29
Change-Id: Icb5b897c07ff28a2b18ff897a9d23209aeb7b429
Fan Zhang [Thu, 25 Aug 2016 00:20:20 +0000 (00:20 +0000)]
Don't remove wifi preferences when updating AP to avoid GC.
am:
3f0e1344d3
Change-Id: I3062dbcb338d5068afbd8318e23a778659641744
Doris Ling [Thu, 25 Aug 2016 00:17:52 +0000 (17:17 -0700)]
Fix crash in ChooseLockPassworkFragment.
Check for null activity when the handler receives messages to ensure
that the fragment is still attached to the activity.
Fixes:
31034901
Test: Manual - Manually try to update password, verify it works. Run
monkey test on settings package and verify no crash seen.
Change-Id: I9753729ee64458fa1bc25d78abc946d2563a5067
TreeHugger Robot [Thu, 25 Aug 2016 00:09:49 +0000 (00:09 +0000)]
Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev
Fan Zhang [Wed, 24 Aug 2016 21:52:49 +0000 (14:52 -0700)]
Don't remove wifi preferences when updating AP to avoid GC.
Bug:
30870531
Removing wifi preferences every time will force update create a new set
of preferences, which leads to higher chance of GC.
Change-Id: Ifea2f63a3b54fa0d5861fb34a348d81e99bcab68
Fan Zhang [Wed, 24 Aug 2016 21:52:49 +0000 (14:52 -0700)]
Don't remove wifi preferences when updating AP to avoid GC.
Bug:
30870531
Removing wifi preferences every time will force update create a new set
of preferences, which leads to higher chance of GC.
Change-Id: Ifea2f63a3b54fa0d5861fb34a348d81e99bcab68
Salvador Martinez [Wed, 24 Aug 2016 22:11:21 +0000 (15:11 -0700)]
Added guard to logging in AsyncTask
An async task was trying to get the context
in an InstrumentedFragment. This could return
null if the context disappears before the new
thread gets to that line. Logging will now
be aborted if context is null to avoid this.
Bug:
31058928
Change-Id: Iae97d389e58a76b0f213a2749415501894ebf649
Noah Wang [Wed, 24 Aug 2016 21:44:23 +0000 (21:44 +0000)]
Merge "Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change." into nyc-mr1-dev am:
eed4d98eca am:
f485dd3e10
am:
d7e225553e
Change-Id: I89dfa16694c4f18beb64d84ecc3cf99be4a133bd
Noah Wang [Wed, 24 Aug 2016 21:44:22 +0000 (21:44 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change. am:
5666ddfe5d am:
509449d34f
am:
4e1499da6e
Change-Id: I61fd482993d0e0a880f70282cb59ca09b58a137e
Noah Wang [Wed, 24 Aug 2016 21:30:04 +0000 (21:30 +0000)]
Merge "Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change." into nyc-mr1-dev am:
eed4d98eca
am:
f485dd3e10
Change-Id: I27c452c88cad7653436d26ae506390d87a46d802
Noah Wang [Wed, 24 Aug 2016 21:30:04 +0000 (21:30 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change. am:
5666ddfe5d
am:
509449d34f
Change-Id: Id9d77a210032c7ac71d7c445aea9b13648c1b6b0
Noah Wang [Wed, 24 Aug 2016 21:27:04 +0000 (21:27 +0000)]
Merge "Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change." into nyc-mr1-dev
am:
eed4d98eca
Change-Id: I270759839d269ad80b003f5897b1ed8df777eb69
Noah Wang [Wed, 24 Aug 2016 21:27:03 +0000 (21:27 +0000)]
Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change.
am:
5666ddfe5d
Change-Id: I4df4b99664e4ce608efbcf909172e38e8b5cc86d
Noah Wang [Wed, 24 Aug 2016 21:16:13 +0000 (21:16 +0000)]
Merge "Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change." into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 19:12:12 +0000 (19:12 +0000)]
Merge "Add lifecycle observers for future mixin structures."
Noah Wang [Tue, 23 Aug 2016 21:56:27 +0000 (14:56 -0700)]
Inflate necessary previews upon user interaction instead of
inflating everything on creation of the screen. This will
improve the speed of opening the screen and refreshing screen upon
commiting change.
Test: Manually tested by interacting with ViewPager and SeekBar.
Bug:
30697309
Change-Id: Ieb2fac95696b8be33fd508f3b75741529b68e946
Doris Ling [Wed, 24 Aug 2016 16:18:05 +0000 (16:18 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
008ba4ec40 am:
12967ed1a8
am:
8467747449
Change-Id: I5ae2a65f4849588cccfa25b0d7ef981c0bef8eb5
Fan Zhang [Wed, 24 Aug 2016 16:18:02 +0000 (16:18 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am:
2c8178db3a am:
a9d2aa8dfa
am:
77ba0620ea
Change-Id: I7a557b4ce9923b7d9b3bd2add8c02fdbadfe589d
Fan Zhang [Wed, 24 Aug 2016 16:18:00 +0000 (16:18 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle. am:
83f91f61ae am:
2fd3f18e27
am:
5de68da85a
Change-Id: I5788b58e9e09fb64bd935450c51f604b30c75b65
Svetoslav Ganov [Wed, 24 Aug 2016 16:17:57 +0000 (16:17 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am:
de090f3f85 am:
3300192cdb
am:
6c5c9ba8cb
Change-Id: Ib4a9e14a63bc6f2cb4cd49b1c20e3efacc95f204
Svetoslav Ganov [Wed, 24 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Only sync adapters with access can see an account - settings am:
6f9bf1da90 am:
a2c7515a3f
am:
00f7070f18
Change-Id: Ib7efe9e11caf2e53cc73627d9ccc7ae834145b6a
Sudheer Shanka [Wed, 24 Aug 2016 16:16:52 +0000 (16:16 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev am:
acd34a9c72 am:
35221c350d
am:
e9f958f2b6
Change-Id: I050044222863cca5884461a555c05f47d2cc9a0e
Yoshinori Hirano [Wed, 24 Aug 2016 16:16:51 +0000 (16:16 +0000)]
Show summary of "Add user" item am:
2ce843b00e am:
9224414477
am:
c1cbdef71d
Change-Id: I21c85d4f833fa98ae40eb546dc838b4da9b40bd0
Maurice Lam [Wed, 24 Aug 2016 16:16:50 +0000 (16:16 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am:
497704a2cf am:
b62638e83b
am:
ce6a2356ad
Change-Id: I3c0a875966275473a8d411ca444e29fae22c7357
Maurice Lam [Wed, 24 Aug 2016 16:16:49 +0000 (16:16 +0000)]
Position fingerprint progress in the center on landscape am:
5fffa74d68 am:
b2d7eced0b
am:
44f8e7ab2e
Change-Id: I1a6448f769a82516337fb4366e0916f833998337
Fan Zhang [Wed, 24 Aug 2016 16:15:56 +0000 (16:15 +0000)]
Force phone number display to be LTR in support tab. am:
68c6d9956f am:
197829fb8a am:
97df6439b9
am:
7d64ded43f
Change-Id: I0a369b23fdd9374b0062839d168269605d0c5d2c
Maurice Lam [Wed, 24 Aug 2016 16:15:54 +0000 (16:15 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am:
993d37749e am:
8291dc725d
am:
017d6048c4
Change-Id: Ied2a171fa9bb1da0b55841a01249b0c483d4276c
Maurice Lam [Wed, 24 Aug 2016 16:15:53 +0000 (16:15 +0000)]
Remove duplicate string for fingerprint enroll am:
64ac93ba40 am:
e0c8fcf453
am:
1755a04f6b
Change-Id: I0624be0fc853864a7f82fabf3f4c8fccd8cb7388
Doris Ling [Wed, 24 Aug 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba am:
12a0952d49
am:
7da62c35a7
Change-Id: I0729d5c62c7c29c173d419aace20ac44a99fd55b
Doris Ling [Wed, 24 Aug 2016 16:15:51 +0000 (16:15 +0000)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
am:
6dcd71756d
Change-Id: Iae1f9cbd2f8e677e82f27e69de35228a4ae35b99
Andrew Sapperstein [Wed, 24 Aug 2016 14:50:28 +0000 (10:50 -0400)]
resolve merge conflicts of
6890d53 to master
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
Pat Tjin [Wed, 24 Aug 2016 04:48:07 +0000 (04:48 +0000)]
Merge "Remove duplicate KEY_DEVICE_MODEL string set"
Doris Ling [Wed, 24 Aug 2016 04:11:43 +0000 (04:11 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev am:
b88068a876
am:
7822cb6d35
Change-Id: If793369e690fa252431d73cd3443ae245dcf4c82
Doris Ling [Wed, 24 Aug 2016 04:11:42 +0000 (04:11 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
008ba4ec40
am:
12967ed1a8
Change-Id: Ief21c41a4caaa4f20b12cd9987c8fba32fe16f2a
Doris Ling [Wed, 24 Aug 2016 04:08:55 +0000 (04:08 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
am:
b88068a876
Change-Id: Ia49233d7e13eedad46af92ea58c08cedc0f07b0d
Doris Ling [Wed, 24 Aug 2016 04:08:55 +0000 (04:08 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off.
am:
008ba4ec40
Change-Id: I48898d70a02a96a4fc76aa04bfeab309d6e9785f
Doris Ling [Wed, 24 Aug 2016 04:05:38 +0000 (04:05 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
Fan Zhang [Wed, 24 Aug 2016 02:33:39 +0000 (02:33 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am:
2c8178db3a
am:
a9d2aa8dfa
Change-Id: I6eecc24f52e48900620058f7c4142275ad391d22
Fan Zhang [Wed, 24 Aug 2016 02:33:38 +0000 (02:33 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle. am:
83f91f61ae
am:
2fd3f18e27
Change-Id: Ied30f294df99b869e06ee4dc11c300da3fd70ade
Svetoslav Ganov [Wed, 24 Aug 2016 02:10:31 +0000 (02:10 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am:
de090f3f85
am:
3300192cdb
Change-Id: Icd81d8d32a85f5cb926d84f5b3239b93d6ce0d7e
Svetoslav Ganov [Wed, 24 Aug 2016 02:10:20 +0000 (02:10 +0000)]
Only sync adapters with access can see an account - settings am:
6f9bf1da90
am:
a2c7515a3f
Change-Id: I4b0d16639837e73fced0260e93b29c08aa4b7346
Sudheer Shanka [Wed, 24 Aug 2016 02:10:18 +0000 (02:10 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev am:
acd34a9c72
am:
35221c350d
Change-Id: Icfef29048747e36f5fdac374be18d092ccb71c9d
Yoshinori Hirano [Wed, 24 Aug 2016 02:10:16 +0000 (02:10 +0000)]
Show summary of "Add user" item am:
2ce843b00e
am:
9224414477
Change-Id: Iee1fe204b1d48b57c8d0577eb86dc3518c144b6f
Maurice Lam [Wed, 24 Aug 2016 02:10:15 +0000 (02:10 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am:
497704a2cf
am:
b62638e83b
Change-Id: Ic3dccbbb7d27b157076c3009468f7c8a5acba34d
Maurice Lam [Wed, 24 Aug 2016 02:09:28 +0000 (02:09 +0000)]
Position fingerprint progress in the center on landscape am:
5fffa74d68
am:
b2d7eced0b
Change-Id: I24602a6cb4ae2a1ca56d6fffac25cbe6952d0b64
Fan Zhang [Wed, 24 Aug 2016 02:09:27 +0000 (02:09 +0000)]
Force phone number display to be LTR in support tab. am:
68c6d9956f am:
197829fb8a
am:
97df6439b9
Change-Id: I38eac1a0e7a55298cec6a818a051424306721752
Maurice Lam [Wed, 24 Aug 2016 02:09:27 +0000 (02:09 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am:
993d37749e
am:
8291dc725d
Change-Id: I881722545a7b1605705377406f785bfa3ea0fa4b
Maurice Lam [Wed, 24 Aug 2016 02:09:26 +0000 (02:09 +0000)]
Remove duplicate string for fingerprint enroll am:
64ac93ba40
am:
e0c8fcf453
Change-Id: I1ea9fad83d06ec3526921f942f3476d008717ec4