OSDN Git Service
Jason Monk [Mon, 29 Aug 2016 20:12:34 +0000 (20:12 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75 am:
1221326124
am:
b4ad2f4eb4
Change-Id: I255a286a12f4a65aa459e88154a15e872da5be47
Jason Monk [Mon, 29 Aug 2016 18:35:23 +0000 (18:35 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75
am:
1221326124
Change-Id: Iee0f60e07d1abd068f29f0473d691cabc53cc26f
Jason Monk [Mon, 29 Aug 2016 18:26:31 +0000 (18:26 +0000)]
Fix multiple bluetooth devices bug
am:
e2428aff75
Change-Id: I15a10b8260c6812dd1084420b9487497e021f11a
Geoffrey Pitsch [Mon, 29 Aug 2016 13:39:27 +0000 (13:39 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev am:
1ff11c5ef0 am:
cf58341082
am:
e005d2bcc9
Change-Id: Ie1f05158d2c0515b70e76712173fcfd5cff538e5
Geoffrey Pitsch [Mon, 29 Aug 2016 13:39:23 +0000 (13:39 +0000)]
Only show BootSounds preference if has_boot_sounds is true. am:
fd351eaaf1 am:
de67bc9d68
am:
93352a4451
Change-Id: I6fe28d8c40bd254458121f1bea3c23b567f36b18
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
(cherry picked from commit
6666f9cc37ac8f9b99c6a174b1478924ed8fc6cd)
Geoffrey Pitsch [Mon, 29 Aug 2016 13:15:58 +0000 (13:15 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev am:
1ff11c5ef0
am:
cf58341082
Change-Id: Ib7c373b962efd4382dccccd81dceb0b0aeb27159
Geoffrey Pitsch [Mon, 29 Aug 2016 13:15:54 +0000 (13:15 +0000)]
Only show BootSounds preference if has_boot_sounds is true. am:
fd351eaaf1
am:
de67bc9d68
Change-Id: I077c3fa8247092a38b1a8aa48885221ae2198b1f
Geoffrey Pitsch [Mon, 29 Aug 2016 13:12:24 +0000 (13:12 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev
am:
1ff11c5ef0
Change-Id: I93b33da62bdc2cbb06ab427f92193773ba1e86fe
Geoffrey Pitsch [Mon, 29 Aug 2016 13:12:23 +0000 (13:12 +0000)]
Only show BootSounds preference if has_boot_sounds is true.
am:
fd351eaaf1
Change-Id: Iac1ce93f1c9cb063162c2eab14774b720b4eb4e8
Geoffrey Pitsch [Mon, 29 Aug 2016 13:06:21 +0000 (13:06 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev
Doris Ling [Sat, 27 Aug 2016 00:33:42 +0000 (00:33 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am:
302abf2f54 am:
f4e5c9352a
am:
8f366e6e1e
Change-Id: Idba77be343a50ae11c120309e8a167da562973a8
Doris Ling [Sat, 27 Aug 2016 00:33:28 +0000 (00:33 +0000)]
Re-enable Ambient Display double tab. am:
fec320324c am:
6bc8858379
am:
5d4c701707
Change-Id: I01c2e3a4a207f0338744228171a0cee7ff6bfbab
Doris Ling [Sat, 27 Aug 2016 00:10:56 +0000 (00:10 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am:
302abf2f54
am:
f4e5c9352a
Change-Id: I92607b84437ad84feb4e204c60f1fc2901be6ff8
Doris Ling [Sat, 27 Aug 2016 00:10:52 +0000 (00:10 +0000)]
Re-enable Ambient Display double tab. am:
fec320324c
am:
6bc8858379
Change-Id: I175e52946e1c11bafcb4376572bcce31f2e21538
Doris Ling [Sat, 27 Aug 2016 00:07:32 +0000 (00:07 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
am:
302abf2f54
Change-Id: I4aac43d3f5bf6c2bafda59dc16013a65e5c7e953
Doris Ling [Sat, 27 Aug 2016 00:07:31 +0000 (00:07 +0000)]
Re-enable Ambient Display double tab.
am:
fec320324c
Change-Id: I0fb3bb11e0c6d9b10a095ea1d8cf45c62afaa8e4
Doris Ling [Sat, 27 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
Doris Ling [Fri, 26 Aug 2016 23:03:39 +0000 (23:03 +0000)]
Fix NullPointerException in DashboardSummary. am:
797dd7440d am:
454dc3739a
am:
45a821105f
Change-Id: I39623232f80a9de2d2199af11585eaa61bce2e08
Salvador Martinez [Fri, 26 Aug 2016 23:03:38 +0000 (23:03 +0000)]
Merge "Updated Nexus imprint screen" into nyc-mr1-dev am:
96fb5d795f am:
e8d96b5700
am:
7e9e51c2c2
Change-Id: Ide6b43f105cbcc4e8b639750c2cafc2d5a50da11
Salvador Martinez [Fri, 26 Aug 2016 23:02:33 +0000 (23:02 +0000)]
Updated Nexus imprint screen am:
2acb2257cd am:
f2a6608c8c
am:
69fe148362
Change-Id: I6e6ff198a5ef947cdf2acf5d32cc0abed6158307
Maurice Lam [Fri, 26 Aug 2016 23:02:31 +0000 (23:02 +0000)]
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev am:
f15fe812ec am:
d42834fffd
am:
e0e1e592c2
Change-Id: If24b2cfe5129d05bc2a0e89a6e5a5774698bc97e
Maurice Lam [Fri, 26 Aug 2016 23:02:30 +0000 (23:02 +0000)]
Fix fingerprint progress bar in RTL am:
e8da03bcaa am:
4a637f1496
am:
0477112d77
Change-Id: Id5f53a92dc64c41d185a8e7517cc42dd959123bc
Lei Yu [Fri, 26 Aug 2016 23:02:21 +0000 (23:02 +0000)]
Merge "Add the specific string for the tablet device" into nyc-mr1-dev am:
5d825bc3f3 am:
b7dfaa585b
am:
0d91106ce5
Change-Id: Ic2f49fa39ece9b1fea4f399a0c4e9c5f0a6bf6d9
jackqdyulei [Fri, 26 Aug 2016 23:02:07 +0000 (23:02 +0000)]
Add the specific string for the tablet device am:
ba28b26105 am:
c41dff3a52
am:
d6d1578184
Change-Id: I54d02f3f3d580b95a1e1bed57a356b75ae5e6bb1
Doris Ling [Fri, 26 Aug 2016 22:26:40 +0000 (22:26 +0000)]
Fix NullPointerException in DashboardSummary. am:
797dd7440d
am:
454dc3739a
Change-Id: Id334c7b3f36d8fcfbb4e919007d0bf5789b605fb
Doris Ling [Fri, 26 Aug 2016 22:23:31 +0000 (22:23 +0000)]
Fix NullPointerException in DashboardSummary.
am:
797dd7440d
Change-Id: Icca9421e52c1f751023bdee5a9b6fbcdbd89e6a1
Doris Ling [Fri, 26 Aug 2016 21:29:52 +0000 (14:29 -0700)]
Re-enable Ambient Display double tab.
Restoring the changes to move Display->Ambient Display to Moves->Quick screen
This reverts commit
9b3000d8ac256093bbf62d04c518b67df244c311, except for
the removal of res/raw/gesture_ambient_move_lift.mp4
Test: Manual - Go to Settings->Display->Quick screen check and verify
the preference is restored.
Bug:
30595437
Change-Id: Ie50bcebd119714d49422b7139d0d0234f27584e2
Doris Ling [Fri, 26 Aug 2016 18:13:21 +0000 (11:13 -0700)]
Fix NullPointerException in DashboardSummary.
In onSaveInstanceState(), move saving the suggestions logging lists to
the top so that it will be saved to the bundle even when layout manager
is null.
Test: run monkey
Change-Id: I248563a255158feadeb85898a920af96a1565fa9
Fixes:
31111795
Salvador Martinez [Fri, 26 Aug 2016 17:16:12 +0000 (17:16 +0000)]
Merge "Updated Nexus imprint screen" into nyc-mr1-dev am:
96fb5d795f
am:
e8d96b5700
Change-Id: I9d1e1bb070c5a8a9327db26c30f2edf0e43b5ad6
Salvador Martinez [Fri, 26 Aug 2016 17:16:11 +0000 (17:16 +0000)]
Updated Nexus imprint screen am:
2acb2257cd
am:
f2a6608c8c
Change-Id: I8de98ac7c395114618efa6ca8d9c3b14db306aaf
Salvador Martinez [Fri, 26 Aug 2016 17:13:41 +0000 (17:13 +0000)]
Merge "Updated Nexus imprint screen" into nyc-mr1-dev
am:
96fb5d795f
Change-Id: Iaf479def55d9fabb93ff04e62d40eef586e833f3
Salvador Martinez [Fri, 26 Aug 2016 17:13:40 +0000 (17:13 +0000)]
Updated Nexus imprint screen
am:
2acb2257cd
Change-Id: I2017163f0c62e92190ed12975d662b8627066548
Salvador Martinez [Fri, 26 Aug 2016 17:01:11 +0000 (17:01 +0000)]
Merge "Updated Nexus imprint screen" into nyc-mr1-dev
Maurice Lam [Fri, 26 Aug 2016 01:37:21 +0000 (01:37 +0000)]
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev am:
f15fe812ec
am:
d42834fffd
Change-Id: I981612e2391e04f3f8a72ee91f2ae75dbe9de231
Maurice Lam [Fri, 26 Aug 2016 01:37:21 +0000 (01:37 +0000)]
Fix fingerprint progress bar in RTL am:
e8da03bcaa
am:
4a637f1496
Change-Id: Iaa3370efbcfd06608a9b42818b6c207f67d76017
Maurice Lam [Fri, 26 Aug 2016 01:15:30 +0000 (01:15 +0000)]
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev
am:
f15fe812ec
Change-Id: I1aca69f0de90eed7a643c501d41d61caeae48eec
Maurice Lam [Fri, 26 Aug 2016 01:15:30 +0000 (01:15 +0000)]
Fix fingerprint progress bar in RTL
am:
e8da03bcaa
Change-Id: If084189ef8361d15dde4b05058cac7db163a8ede
TreeHugger Robot [Fri, 26 Aug 2016 00:56:15 +0000 (00:56 +0000)]
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev
Lei Yu [Fri, 26 Aug 2016 00:12:16 +0000 (00:12 +0000)]
Merge "Add the specific string for the tablet device" into nyc-mr1-dev am:
5d825bc3f3
am:
b7dfaa585b
Change-Id: I03e0cd5da6958faca37406d3f4220cfd6ef14a3b
jackqdyulei [Fri, 26 Aug 2016 00:12:12 +0000 (00:12 +0000)]
Add the specific string for the tablet device am:
ba28b26105
am:
c41dff3a52
Change-Id: I5c31b3507036d3679f83d4704c8275e1a8d32648
Lei Yu [Fri, 26 Aug 2016 00:00:07 +0000 (00:00 +0000)]
Merge "Add the specific string for the tablet device" into nyc-mr1-dev
am:
5d825bc3f3
Change-Id: I353ecbb00c1747d9416c770b54d19aff55b347d9
jackqdyulei [Fri, 26 Aug 2016 00:00:05 +0000 (00:00 +0000)]
Add the specific string for the tablet device
am:
ba28b26105
Change-Id: Id0060403b2b094f7033457b1426d8641f7e97ec9
Lei Yu [Thu, 25 Aug 2016 23:48:50 +0000 (23:48 +0000)]
Merge "Add the specific string for the tablet device" into nyc-mr1-dev
Maurice Lam [Thu, 25 Aug 2016 01:54:09 +0000 (18:54 -0700)]
Fix fingerprint progress bar in RTL
Bug:
31047779
Change-Id: Ia6961d9fa425a8a247365f75f5c00955d69d2c60
(cherry picked from commit
6e300bca3a3f2302d513a64fd03071170ac5fad1)
Maurice Lam [Thu, 25 Aug 2016 23:19:58 +0000 (23:19 +0000)]
Merge "Fix fingerprint progress bar in RTL"
jackqdyulei [Thu, 25 Aug 2016 22:04:12 +0000 (15:04 -0700)]
Add the specific string for the tablet device
Bug:
30761670
Add "product=default" in support_disclaimer_content to prevent crash
when merging down to master branch.
Change-Id: Ib9ce94288ca4cf13514ba2af64031bd3ecafab7f
Guang Zhu [Thu, 25 Aug 2016 20:42:24 +0000 (20:42 +0000)]
Merge "Avoid JUnit4 collision in android-support-test, mockito-target"
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
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
(cherry picked from commit
3d2d5e040ac0d28012c480a5bf1f10d947cf629c)
TreeHugger Robot [Thu, 25 Aug 2016 19:51:01 +0000 (19:51 +0000)]
Merge "Updated Nexus imprint screen"
Guang Zhu [Wed, 24 Aug 2016 17:49:23 +0000 (10:49 -0700)]
Avoid JUnit4 collision in android-support-test, mockito-target
Bug:
31072145
Test: make droid checkbuild
Change-Id: I7f2b13a4c28e51d76313ee3b6d13c904c2925228
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
Maurice Lam [Thu, 25 Aug 2016 01:54:09 +0000 (18:54 -0700)]
Fix fingerprint progress bar in RTL
Bug:
31047779
Change-Id: Ia6961d9fa425a8a247365f75f5c00955d69d2c60
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: I3b589d86fc6ecd1a6caf0db9f3b9f7674dbe046a
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