Doris Ling
6c2f8404aa
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am: 302abf2f54
am: f4e5c9352a
...
am: 8f366e6e1e
Change-Id: Idba77be343a50ae11c120309e8a167da562973a8
2016-08-27 00:33:42 +00:00
Doris Ling
d0c7de09f0
Re-enable Ambient Display double tab. am: fec320324c
am: 6bc8858379
...
am: 5d4c701707
Change-Id: I01c2e3a4a207f0338744228171a0cee7ff6bfbab
2016-08-27 00:33:28 +00:00
Doris Ling
8f366e6e1e
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am: 302abf2f54
...
am: f4e5c9352a
Change-Id: I92607b84437ad84feb4e204c60f1fc2901be6ff8
2016-08-27 00:10:56 +00:00
Doris Ling
5d4c701707
Re-enable Ambient Display double tab. am: fec320324c
...
am: 6bc8858379
Change-Id: I175e52946e1c11bafcb4376572bcce31f2e21538
2016-08-27 00:10:52 +00:00
Doris Ling
f4e5c9352a
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
...
am: 302abf2f54
Change-Id: I4aac43d3f5bf6c2bafda59dc16013a65e5c7e953
2016-08-27 00:07:32 +00:00
Doris Ling
6bc8858379
Re-enable Ambient Display double tab.
...
am: fec320324c
Change-Id: I0fb3bb11e0c6d9b10a095ea1d8cf45c62afaa8e4
2016-08-27 00:07:31 +00:00
Doris Ling
302abf2f54
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
2016-08-27 00:04:19 +00:00
Doris Ling
f0bb63f307
Fix NullPointerException in DashboardSummary. am: 797dd7440d
am: 454dc3739a
...
am: 45a821105f
Change-Id: I39623232f80a9de2d2199af11585eaa61bce2e08
2016-08-26 23:03:39 +00:00
Salvador Martinez
bb7de48b91
Merge "Updated Nexus imprint screen" into nyc-mr1-dev am: 96fb5d795f
am: e8d96b5700
...
am: 7e9e51c2c2
Change-Id: Ide6b43f105cbcc4e8b639750c2cafc2d5a50da11
2016-08-26 23:03:38 +00:00
Salvador Martinez
109d3ac81d
Updated Nexus imprint screen am: 2acb2257cd
am: f2a6608c8c
...
am: 69fe148362
Change-Id: I6e6ff198a5ef947cdf2acf5d32cc0abed6158307
2016-08-26 23:02:33 +00:00
Maurice Lam
ffa4ebd3db
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev am: f15fe812ec
am: d42834fffd
...
am: e0e1e592c2
Change-Id: If24b2cfe5129d05bc2a0e89a6e5a5774698bc97e
2016-08-26 23:02:31 +00:00
Maurice Lam
e0f72aa6f8
Fix fingerprint progress bar in RTL am: e8da03bcaa
am: 4a637f1496
...
am: 0477112d77
Change-Id: Id5f53a92dc64c41d185a8e7517cc42dd959123bc
2016-08-26 23:02:30 +00:00
Lei Yu
ab7326bf9b
Merge "Add the specific string for the tablet device" into nyc-mr1-dev am: 5d825bc3f3
am: b7dfaa585b
...
am: 0d91106ce5
Change-Id: Ic2f49fa39ece9b1fea4f399a0c4e9c5f0a6bf6d9
2016-08-26 23:02:21 +00:00
jackqdyulei
12ff3e2f40
Add the specific string for the tablet device am: ba28b26105
am: c41dff3a52
...
am: d6d1578184
Change-Id: I54d02f3f3d580b95a1e1bed57a356b75ae5e6bb1
2016-08-26 23:02:07 +00:00
Doris Ling
45a821105f
Fix NullPointerException in DashboardSummary. am: 797dd7440d
...
am: 454dc3739a
Change-Id: Id334c7b3f36d8fcfbb4e919007d0bf5789b605fb
2016-08-26 22:26:40 +00:00
Doris Ling
454dc3739a
Fix NullPointerException in DashboardSummary.
...
am: 797dd7440d
Change-Id: Icca9421e52c1f751023bdee5a9b6fbcdbd89e6a1
2016-08-26 22:23:31 +00:00
Doris Ling
fec320324c
Re-enable Ambient Display double tab.
...
Restoring the changes to move Display->Ambient Display to Moves->Quick screen
This reverts commit 9b3000d8ac
, 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
2016-08-26 14:46:03 -07:00
Christopher Wiley
87e59d0e81
Do not use TetherUtil.setWifiTethering
...
This functionality is replaced by ConnectivityManager.startTethering()
and ConnectivityManager.stopTethering().
Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
and quick quick settings.
Change-Id: I4d190185c473237982b988f898e76d4997dc401c
(cherry picked from commit 9d251279ca
)
2016-08-26 13:26:45 -07:00
Doris Ling
797dd7440d
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
2016-08-26 11:13:21 -07:00
Salvador Martinez
7e9e51c2c2
Merge "Updated Nexus imprint screen" into nyc-mr1-dev am: 96fb5d795f
...
am: e8d96b5700
Change-Id: I9d1e1bb070c5a8a9327db26c30f2edf0e43b5ad6
2016-08-26 17:16:12 +00:00
Salvador Martinez
69fe148362
Updated Nexus imprint screen am: 2acb2257cd
...
am: f2a6608c8c
Change-Id: I8de98ac7c395114618efa6ca8d9c3b14db306aaf
2016-08-26 17:16:11 +00:00
Salvador Martinez
e8d96b5700
Merge "Updated Nexus imprint screen" into nyc-mr1-dev
...
am: 96fb5d795f
Change-Id: Iaf479def55d9fabb93ff04e62d40eef586e833f3
2016-08-26 17:13:41 +00:00
Salvador Martinez
f2a6608c8c
Updated Nexus imprint screen
...
am: 2acb2257cd
Change-Id: I2017163f0c62e92190ed12975d662b8627066548
2016-08-26 17:13:40 +00:00
Salvador Martinez
96fb5d795f
Merge "Updated Nexus imprint screen" into nyc-mr1-dev
2016-08-26 17:01:12 +00:00
Rubin Xu
3231afe95b
Prompt to turn on/unlock profile before showing account sync settings
...
Bug: 29087280
Change-Id: I39e175ab23d4f1071727fe9c0906e40da1e7aada
2016-08-26 16:35:06 +01:00
Maurice Lam
e0e1e592c2
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev am: f15fe812ec
...
am: d42834fffd
Change-Id: I981612e2391e04f3f8a72ee91f2ae75dbe9de231
2016-08-26 01:37:21 +00:00
Maurice Lam
0477112d77
Fix fingerprint progress bar in RTL am: e8da03bcaa
...
am: 4a637f1496
Change-Id: Iaa3370efbcfd06608a9b42818b6c207f67d76017
2016-08-26 01:37:21 +00:00
Maurice Lam
d42834fffd
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev
...
am: f15fe812ec
Change-Id: I1aca69f0de90eed7a643c501d41d61caeae48eec
2016-08-26 01:15:30 +00:00
Maurice Lam
4a637f1496
Fix fingerprint progress bar in RTL
...
am: e8da03bcaa
Change-Id: If084189ef8361d15dde4b05058cac7db163a8ede
2016-08-26 01:15:30 +00:00
TreeHugger Robot
f15fe812ec
Merge "Fix fingerprint progress bar in RTL" into nyc-mr1-dev
2016-08-26 00:56:16 +00:00
Lei Yu
0d91106ce5
Merge "Add the specific string for the tablet device" into nyc-mr1-dev am: 5d825bc3f3
...
am: b7dfaa585b
Change-Id: I03e0cd5da6958faca37406d3f4220cfd6ef14a3b
2016-08-26 00:12:16 +00:00
jackqdyulei
d6d1578184
Add the specific string for the tablet device am: ba28b26105
...
am: c41dff3a52
Change-Id: I5c31b3507036d3679f83d4704c8275e1a8d32648
2016-08-26 00:12:12 +00:00
Lei Yu
b7dfaa585b
Merge "Add the specific string for the tablet device" into nyc-mr1-dev
...
am: 5d825bc3f3
Change-Id: I353ecbb00c1747d9416c770b54d19aff55b347d9
2016-08-26 00:00:07 +00:00
jackqdyulei
c41dff3a52
Add the specific string for the tablet device
...
am: ba28b26105
Change-Id: Id0060403b2b094f7033457b1426d8641f7e97ec9
2016-08-26 00:00:05 +00:00
Lei Yu
5d825bc3f3
Merge "Add the specific string for the tablet device" into nyc-mr1-dev
2016-08-25 23:48:50 +00:00
Maurice Lam
e8da03bcaa
Fix fingerprint progress bar in RTL
...
Bug: 31047779
Change-Id: Ia6961d9fa425a8a247365f75f5c00955d69d2c60
(cherry picked from commit 6e300bca3a
)
2016-08-25 23:28:25 +00:00
Maurice Lam
f6f467a545
Merge "Fix fingerprint progress bar in RTL"
2016-08-25 23:19:59 +00:00
jackqdyulei
ba28b26105
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
2016-08-25 15:04:12 -07:00
Guang Zhu
e0fcb1290c
Merge "Avoid JUnit4 collision in android-support-test, mockito-target"
2016-08-25 20:42:29 +00:00
Doris Ling
5468424402
Merge "Add ObservableDialogFragment to log DialogFragments."
2016-08-25 20:31:53 +00:00
Salvador Martinez
342f012517
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev am: 43344c83af
am: fedea9ed8d
...
am: 2915c67dfe
Change-Id: I36195e8763bdd809e8b59a6837215596a0d74233
2016-08-25 20:21:17 +00:00
Salvador Martinez
dd51eef2e2
Added guard to logging in AsyncTask am: 030eeeee6d
am: 60bd509d4e
...
am: a54c3690a4
Change-Id: I3752d2897aaf439376b8c6a5bff6b5b43d6c7190
2016-08-25 20:21:17 +00:00
Salvador Martinez
2915c67dfe
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev am: 43344c83af
...
am: fedea9ed8d
Change-Id: Ieef8b64a2323dfa546295ec6aac26803ff07bcc5
2016-08-25 20:02:36 +00:00
Salvador Martinez
a54c3690a4
Added guard to logging in AsyncTask am: 030eeeee6d
...
am: 60bd509d4e
Change-Id: Ib1d37a0c9c68c01be0d59bff5d78cd37c083689f
2016-08-25 20:02:35 +00:00
Salvador Martinez
fedea9ed8d
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev
...
am: 43344c83af
Change-Id: Ibb2e26af8b72ad113e8ba9f7f33b676578fffa62
2016-08-25 19:59:35 +00:00
Salvador Martinez
60bd509d4e
Added guard to logging in AsyncTask
...
am: 030eeeee6d
Change-Id: I5ad7dec889004484117a621a18e61c477c0c94d6
2016-08-25 19:59:34 +00:00
Salvador Martinez
43344c83af
Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev
2016-08-25 19:57:25 +00:00
Todd Kennedy
d5824967ee
Implement Web Action settings
...
Users can enable / disable Web Action from "Opening links" under
the apps setting.
Bug: 28140107
Change-Id: I4ed4b77953952a56316b780a54a482d0c564cbe4
Test: manual testing of the settings app
2016-08-25 12:56:37 -07:00
Salvador Martinez
2acb2257cd
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 3d2d5e040a
)
2016-08-25 19:55:11 +00:00
TreeHugger Robot
8da706f6ff
Merge "Updated Nexus imprint screen"
2016-08-25 19:51:02 +00:00