OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Add the specific string for the tablet device" into nyc-mr1-dev am: 5d825bc3f3
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

7 years agoAdd the specific string for the tablet device am: ba28b26105
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

7 years agoMerge "Add the specific string for the tablet device" into nyc-mr1-dev
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

7 years agoAdd the specific string for the tablet device
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

7 years agoMerge "Add the specific string for the tablet device" into nyc-mr1-dev
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

7 years agoAdd the specific string for the tablet device
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

7 years agoMerge "Added guard to logging in AsyncTask" into nyc-mr1-dev am: 43344c83af
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

7 years agoAdded guard to logging in AsyncTask am: 030eeeee6d
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

7 years agoMerge "Added guard to logging in AsyncTask" into nyc-mr1-dev
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

7 years agoAdded guard to logging in AsyncTask
Salvador Martinez [Thu, 25 Aug 2016 19:59:34 +0000 (19:59 +0000)]
Added guard to logging in AsyncTask
am: 030eeeee6d

Change-Id: I5ad7dec889004484117a621a18e61c477c0c94d6

7 years agoMerge "Added guard to logging in AsyncTask" into nyc-mr1-dev
Salvador Martinez [Thu, 25 Aug 2016 19:57:24 +0000 (19:57 +0000)]
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev

7 years agoInflate necessary previews upon user interaction instead of inflating everything...
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

7 years agoInflate necessary previews upon user interaction instead of inflating everything...
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

7 years agoInflate necessary previews upon user interaction instead of inflating everything...
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

7 years agoAdded guard to logging in AsyncTask
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)

7 years agoInflate necessary previews upon user interaction instead of
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)

7 years agoMerge "Add tablet and device product version for the Moves description text." into...
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

7 years agoAdd tablet and device product version for the Moves description text. am: fd87b198b1
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

7 years agoMerge "Add tablet and device product version for the Moves description text." into...
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

7 years agoAdd tablet and device product version for the Moves description text.
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

7 years agoMerge "Add tablet and device product version for the Moves description text." into...
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

7 years agoFix animation video render issue when Settings->Moves is resumed from screen off...
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

7 years agoMerge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev am: b6ad0f9349
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

7 years agoFix crash in ChooseLockPassworkFragment. am: f958f2e14e
Doris Ling [Thu, 25 Aug 2016 02:06:58 +0000 (02:06 +0000)]
Fix crash in ChooseLockPassworkFragment. am: f958f2e14e
am: 773a2ab217

Change-Id: Iaf85188f0b3df6884a876aa120b13fead5478295

7 years agoFix animation video render issue when Settings->Moves is resumed from screen off...
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

7 years agoMerge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev
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

7 years agoFix crash in ChooseLockPassworkFragment.
Doris Ling [Thu, 25 Aug 2016 02:00:57 +0000 (02:00 +0000)]
Fix crash in ChooseLockPassworkFragment.
am: f958f2e14e

Change-Id: I5df6a8989513347f6f55cc5fff9c54852c2a80ec

7 years agoFix animation video render issue when Settings->Moves is resumed from screen off.
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

7 years agoMerge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev
TreeHugger Robot [Thu, 25 Aug 2016 01:44:21 +0000 (01:44 +0000)]
Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev

7 years agoFix animation video render issue when Settings->Moves is resumed from
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)

7 years agoDon't remove wifi preferences when updating AP to avoid GC. am: 9d031f2fbc am: 1330f1...
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

7 years agoAdd tablet and device product version for the Moves description text.
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC. am: 9d031f2fbc am: 1330f130d6
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC. am: 9d031f2fbc
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC. am: 9d031f2fbc
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
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

7 years agoMerge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1...
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC. am: 3f0e1344d3
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

7 years agoMerge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
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

7 years agoFix crash in ChooseLockPassworkFragment.
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

7 years agoMerge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
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

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
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

7 years agoMerge "Inflate necessary previews upon user interaction instead of inflating everythi...
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

7 years agoInflate necessary previews upon user interaction instead of inflating everything...
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

7 years agoMerge "Inflate necessary previews upon user interaction instead of inflating everythi...
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

7 years agoInflate necessary previews upon user interaction instead of inflating everything...
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

7 years agoMerge "Inflate necessary previews upon user interaction instead of inflating everythi...
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

7 years agoInflate necessary previews upon user interaction instead of
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

7 years agoMerge "Fix animation video render issue when Settings->Moves is resumed from screen...
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

7 years agoFix animation video render issue when Settings->Moves is resumed from screen off...
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

7 years agoMerge "Fix animation video render issue when Settings->Moves is resumed from screen...
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

7 years agoFix animation video render issue when Settings->Moves is resumed from screen off.
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

7 years agoMerge "Fix animation video render issue when Settings->Moves is resumed from screen...
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

7 years agoMerge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am...
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

7 years agoUse isOemUnlockEnabled to drive oem unlocking toggle. am: 83f91f61ae
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

7 years agoMerge "Only sync adapters with access can see an account - settings" into nyc-mr1...
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

7 years agoOnly sync adapters with access can see an account - settings am: 6f9bf1da90
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

7 years agoMerge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72
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

7 years agoShow summary of "Add user" item am: 2ce843b00e
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

7 years agoMerge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev...
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

7 years agoPosition fingerprint progress in the center on landscape am: 5fffa74d68
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

7 years agoForce phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a
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

7 years agoMerge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e
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

7 years agoRemove duplicate string for fingerprint enroll am: 64ac93ba40
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

7 years agoMerge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba
Doris Ling [Wed, 24 Aug 2016 02:09:25 +0000 (02:09 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba
am: 12a0952d49

Change-Id: Iac5b318d0bc9f929e34fac9c46dfd3b020889738

7 years agoresolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
Doris Ling [Wed, 24 Aug 2016 01:59:09 +0000 (18:59 -0700)]
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp

Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65

7 years agoMerge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
Fan Zhang [Wed, 24 Aug 2016 00:36:11 +0000 (00:36 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
am: 2c8178db3a

Change-Id: I66489cdc64f5a2ce9ac2ca3c75014d8d3c981c7a

7 years agoUse isOemUnlockEnabled to drive oem unlocking toggle.
Fan Zhang [Wed, 24 Aug 2016 00:36:10 +0000 (00:36 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle.
am: 83f91f61ae

Change-Id: I11d1210beaa26a0bad54e03f7a08817a3c500fe3

7 years agoMerge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 00:31:53 +0000 (00:31 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev

7 years agoMerge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:22 +0000 (23:35 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
am: de090f3f85

Change-Id: I2d62ede26a41eee9f7a98a17df255c2b2f516b6c

7 years agoOnly sync adapters with access can see an account - settings
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:21 +0000 (23:35 +0000)]
Only sync adapters with access can see an account - settings
am: 6f9bf1da90

Change-Id: Ia97c5fe3a1101b9472bc8370671fba838d59edf7

7 years agoMerge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 23:26:47 +0000 (23:26 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev

7 years agoMerge "Show summary of "Add user" item" into nyc-mr1-dev
Sudheer Shanka [Tue, 23 Aug 2016 23:25:09 +0000 (23:25 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev
am: acd34a9c72

Change-Id: Idc7d32b89a569e1201097dad3ad480a82b7f75fd

7 years agoShow summary of "Add user" item
Yoshinori Hirano [Tue, 23 Aug 2016 23:25:05 +0000 (23:25 +0000)]
Show summary of "Add user" item
am: 2ce843b00e

Change-Id: I413ab13bbf58b7100348d20c02aeeff850a84639

7 years agoMerge "Show summary of "Add user" item" into nyc-mr1-dev
Sudheer Shanka [Tue, 23 Aug 2016 23:23:07 +0000 (23:23 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev

7 years agoFix animation video render issue when Settings->Moves is resumed from
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

7 years agoMerge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
Maurice Lam [Tue, 23 Aug 2016 23:08:05 +0000 (23:08 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
am: 497704a2cf

Change-Id: I1e33c4ce331e2060b91b8038aca35c4a746b8edc

7 years agoPosition fingerprint progress in the center on landscape
Maurice Lam [Tue, 23 Aug 2016 23:08:04 +0000 (23:08 +0000)]
Position fingerprint progress in the center on landscape
am: 5fffa74d68

Change-Id: I8a989108c1a72eef25bd0fe90875be856bd81cbc

7 years agoMerge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
Maurice Lam [Tue, 23 Aug 2016 22:57:32 +0000 (22:57 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev

7 years agoForce phone number display to be LTR in support tab. am: 68c6d9956f
Fan Zhang [Tue, 23 Aug 2016 22:46:01 +0000 (22:46 +0000)]
Force phone number display to be LTR in support tab. am: 68c6d9956f
am: 197829fb8a

Change-Id: Iccbd0ec126818f295d45855a8b2bc3d338bd9939

7 years agoForce phone number display to be LTR in support tab.
Fan Zhang [Tue, 23 Aug 2016 22:43:30 +0000 (22:43 +0000)]
Force phone number display to be LTR in support tab.
am: 68c6d9956f

Change-Id: Ib5a7b11f9063af047f37a1f342ec715c590cb337

7 years agoMerge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
Maurice Lam [Tue, 23 Aug 2016 22:23:01 +0000 (22:23 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
am: 993d37749e

Change-Id: I22a772df18ca5439912ad8b18e4aef0234f558fa

7 years agoRemove duplicate string for fingerprint enroll
Maurice Lam [Tue, 23 Aug 2016 22:23:00 +0000 (22:23 +0000)]
Remove duplicate string for fingerprint enroll
am: 64ac93ba40

Change-Id: Id49d79278ad68b0b49194576467b5e0714c55c89

7 years agoMerge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
Maurice Lam [Tue, 23 Aug 2016 22:19:57 +0000 (22:19 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev

7 years agoMerge "Log settings suggestions events only once." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
am: c4e5acedba

Change-Id: Ice4efccbb63061053bc1b2ea75f65fcfe41555d0

7 years agoLog settings suggestions events only once.
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Log settings suggestions events only once.
am: bfbb964cb1

Change-Id: If4e3e15b56c7e5a99eb54376c519019ff44d6a34

7 years agoMerge "Log settings suggestions events only once." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev

7 years agoUse isOemUnlockEnabled to drive oem unlocking toggle.
Fan Zhang [Tue, 23 Aug 2016 22:13:22 +0000 (15:13 -0700)]
Use isOemUnlockEnabled to drive oem unlocking toggle.

Bug: 31031467
Test: manually turned on/off persistent_data_block

Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f

7 years agoAdd scrollbar to Settings app. am: 124251d54e
Doris Ling [Tue, 23 Aug 2016 21:46:42 +0000 (21:46 +0000)]
Add scrollbar to Settings app. am: 124251d54e
am: 13a4eeb2a9

Change-Id: Ifbb3c930d259bc65ec54ffa496c2cfcdb5bb9a63

7 years agoOnly sync adapters with access can see an account - settings
Svetoslav Ganov [Tue, 12 Jul 2016 02:34:21 +0000 (19:34 -0700)]
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

7 years agoAdd scrollbar to Settings app.
Doris Ling [Tue, 23 Aug 2016 21:43:33 +0000 (21:43 +0000)]
Add scrollbar to Settings app.
am: 124251d54e

Change-Id: Id59772914f83860c5ff46ace71d640e17623c98d

7 years agoPosition fingerprint progress in the center on landscape
Maurice Lam [Fri, 29 Jul 2016 00:12:24 +0000 (17:12 -0700)]
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 c81575138ed00999aa0e9f1e5c4d6445f0300dda)

7 years agoRemove duplicate string for fingerprint enroll
Maurice Lam [Wed, 10 Aug 2016 19:27:29 +0000 (12:27 -0700)]
Remove duplicate string for fingerprint enroll

Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit 56093f6f4f08c4d57b40d853d1491149ed07b5c1)

7 years agoForce phone number display to be LTR in support tab.
Fan Zhang [Tue, 23 Aug 2016 16:18:13 +0000 (09:18 -0700)]
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 dcfdde5a2c6fa72c564f8dd747d27fbef7fcab04)

7 years agoLog settings suggestions events only once.
Doris Ling [Tue, 2 Aug 2016 21:45:58 +0000 (14:45 -0700)]
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

7 years agoMerge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:...
Rubin Xu [Tue, 23 Aug 2016 18:31:19 +0000 (18:31 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am: 0948ce0cdb
am: f9665da994

Change-Id: Ia5c441a86cfd6cc9c4c3ba0c207c4289ea5a4bb2

7 years agoRemove duplicated call to authenticationSucceeded() am: 3a437490be
Rubin Xu [Tue, 23 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Remove duplicated call to authenticationSucceeded() am: 3a437490be
am: 886af76fb3

Change-Id: Ic0154eef40bfe90a62644405e35092ac037db000