Commit Graph

26180 Commits

Author SHA1 Message Date
shwetachahar
4ac718b7b5 Add a pitch seekbar for TTS speech output.
Bug: 27137452
Change-Id: I0992333822b4b1cd561dfa2501e47270ff4964b9
2016-03-09 18:20:19 +00:00
Abodunrinwa Toki
80c082f066 Fix work challenge background size.
Bug: 26820717
Change-Id: Icd984b7bb7517ac01a3fa5ca26d060ea33b58a99
2016-03-09 16:48:43 +00:00
Sudheer Shanka
0796f1a86b Merge "Update the timeout list dialog in display and security settings." into nyc-dev am: 64d424a1c2
am: 1c6ce85cdc

* commit '1c6ce85cdc49cfed55bbcee0fc351b22af916c07':
  Update the timeout list dialog in display and security settings.
2016-03-09 16:37:31 +00:00
Jason Monk
dab12b66be Merge "Make sure mWifiManager gets initialized" into nyc-dev am: 6dca89f741
am: 36317c9014

* commit '36317c9014aacaa734703435e12890090a3ded5c':
  Make sure mWifiManager gets initialized
2016-03-09 16:37:31 +00:00
Geoff Mendal
8c505104f9 Merge "Import translations. DO NOT MERGE" into nyc-dev am: c76c37ef6d -s ours
am: ddbf785d63  -s ours

* commit 'ddbf785d63a61b25e6aa787db814bcc4938120d9':
  Import translations. DO NOT MERGE
2016-03-09 16:37:31 +00:00
Jason Monk
28cdc6fa54 Update data usage graph to use new graph ui am: 9dc9a0ebb3
am: c93a998a91

* commit 'c93a998a9176ef07ed650c14fbb9626a9629de72':
  Update data usage graph to use new graph ui
2016-03-09 16:37:31 +00:00
Sudheer Shanka
1c6ce85cdc Merge "Update the timeout list dialog in display and security settings." into nyc-dev
am: 64d424a1c2

* commit '64d424a1c2ce16a5c40afbdde5dc5c96e7f25121':
  Update the timeout list dialog in display and security settings.
2016-03-09 16:33:41 +00:00
Jason Monk
36317c9014 Merge "Make sure mWifiManager gets initialized" into nyc-dev
am: 6dca89f741

* commit '6dca89f74176dd728d5bcdc92dc067078a6afe9e':
  Make sure mWifiManager gets initialized
2016-03-09 16:33:41 +00:00
Geoff Mendal
ddbf785d63 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c76c37ef6d  -s ours

* commit 'c76c37ef6dcc19ea956e6130c641017ff4b5eb6f':
  Import translations. DO NOT MERGE
2016-03-09 16:33:41 +00:00
Jason Monk
c93a998a91 Update data usage graph to use new graph ui
am: 9dc9a0ebb3

* commit '9dc9a0ebb383df0225c4d0f92cb837ccabe40021':
  Update data usage graph to use new graph ui
2016-03-09 16:33:41 +00:00
Sudheer Shanka
64d424a1c2 Merge "Update the timeout list dialog in display and security settings." into nyc-dev 2016-03-09 16:24:55 +00:00
Sudheer Shanka
900adce6ca Update the timeout list dialog in display and security settings.
Currently, we add padlocks to all the timeout options which are
more than the timeout enforced by the admin. Instead of adding
the padlocks to the options, updated the timeout list dialog to
have a disabled by admin message as dialog footer.

Bug: 27564363
Change-Id: I66ce35e92c044ce1864d14e1fc0e83881f8f4ab0
2016-03-09 16:19:37 +00:00
Jason Monk
6dca89f741 Merge "Make sure mWifiManager gets initialized" into nyc-dev 2016-03-09 16:13:49 +00:00
Jason Monk
245bbaf205 Make sure mWifiManager gets initialized
To avoid crashing.

Bug: 27561590
Change-Id: I417b8382cb3d1b6c22fa33e05e9b4bf35e048e7e
2016-03-09 10:49:33 -05:00
Geoff Mendal
c76c37ef6d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-09 15:45:34 +00:00
Jason Monk
9dc9a0ebb3 Update data usage graph to use new graph ui
Bug: 27278313
Change-Id: Ia9e8598dcb970540877f7dac7061cfc55ed99d4d
2016-03-09 10:39:57 -05:00
Geoff Mendal
f14efd9f97 Import translations. DO NOT MERGE
Change-Id: Id46ae01e6b35ba18f2e12c151acab4c156293976
Auto-generated-cl: translation import
2016-03-09 07:39:42 -08:00
Geoff Mendal
190d4cec18 Merge "Import translations. DO NOT MERGE" 2016-03-09 14:32:36 +00:00
Geoff Mendal
8ef051e0f4 Import translations. DO NOT MERGE
Change-Id: I24bd2bff7b3986a1b00841d36e9f316ce208163c
Auto-generated-cl: translation import
2016-03-09 06:30:58 -08:00
Jason Monk
17ee2a2b2c Merge "Move temporary metrics constants to proto" into nyc-dev am: 222be28d13
am: 5520276085

* commit '5520276085af9bc340aca13c4abbbc12c1ae01f8':
  Move temporary metrics constants to proto
2016-03-09 14:08:44 +00:00
Jason Monk
5520276085 Merge "Move temporary metrics constants to proto" into nyc-dev
am: 222be28d13

* commit '222be28d13cf7aaddb9944855e8079a8e86617e8':
  Move temporary metrics constants to proto
2016-03-09 14:06:47 +00:00
Jason Monk
222be28d13 Merge "Move temporary metrics constants to proto" into nyc-dev 2016-03-09 14:03:34 +00:00
Mihai Nita
f067dd123a Merge "Hide "Remove" menu & the drag handle when there\'s just one locale" into nyc-dev am: 70fd5d0ecc
am: dd56043bac

* commit 'dd56043baca7159475ee2f9d7d1bcaf22c53a1ec':
  Hide "Remove" menu & the drag handle when there's just one locale
2016-03-09 01:22:51 +00:00
Mihai Nita
dd56043bac Merge "Hide "Remove" menu & the drag handle when there\'s just one locale" into nyc-dev
am: 70fd5d0ecc

* commit '70fd5d0ecc29630ba79f25038234a0f6b56effd4':
  Hide "Remove" menu & the drag handle when there's just one locale
2016-03-09 01:20:59 +00:00
Mihai Niță
70fd5d0ecc Merge "Hide "Remove" menu & the drag handle when there's just one locale" into nyc-dev 2016-03-09 01:15:21 +00:00
Mihai Nita
7751358ab6 Hide "Remove" menu & the drag handle when there's just one locale
When there's just one locale, showing the "Remove" menu and the
drag handle is confusing to the user since nothing can happen if
they try to use them: the drag simply won't happen, and if they
go through the delete process, we give them an error.

Bug: 26730336
Change-Id: Ie219dd9b3d653272b325d7af01aba205a58cd472
2016-03-08 14:47:46 -08:00
Julia Reynolds
ebdb5b62b8 Merge "Don\'t reference framework strings." into nyc-dev am: 179a57b21f
am: 3fd9a62b39

* commit '3fd9a62b397f7c37aef4c1d13db96615a3cb45f7':
  Don't reference framework strings.
2016-03-08 21:55:32 +00:00
Julia Reynolds
3fd9a62b39 Merge "Don\'t reference framework strings." into nyc-dev
am: 179a57b21f

* commit '179a57b21ff1053442b93e2cc943dc1feb65c952':
  Don't reference framework strings.
2016-03-08 21:44:35 +00:00
Julia Reynolds
3a4f9d81dd Merge "Don\'t reference the notification led if it doesn\'t exist." into nyc-dev am: d3c07da6e9
am: f830adddb8

* commit 'f830adddb8a1144bd31fdb3a65b2c1ab8d07bbf6':
  Don't reference the notification led if it doesn't exist.
2016-03-08 21:43:17 +00:00
Julia Reynolds
dc67434fd8 Merge "Notification summary updates." into nyc-dev am: 5354f8a2d0
am: 1d91e0f910

* commit '1d91e0f910729b1107653009489f696201a45f57':
  Notification summary updates.
2016-03-08 21:42:55 +00:00
Julia Reynolds
179a57b21f Merge "Don't reference framework strings." into nyc-dev 2016-03-08 21:41:59 +00:00
Julia Reynolds
5f5d049e00 Don't reference framework strings.
Bug: 27513548
Change-Id: Ia459d540ebcb81c8a6d6b045e71141aef849d1f1
2016-03-08 16:37:32 -05:00
Julia Reynolds
f830adddb8 Merge "Don\'t reference the notification led if it doesn\'t exist." into nyc-dev
am: d3c07da6e9

* commit 'd3c07da6e916c128b20adee3c1ccfd845725cdee':
  Don't reference the notification led if it doesn't exist.
2016-03-08 21:32:24 +00:00
Julia Reynolds
d3c07da6e9 Merge "Don't reference the notification led if it doesn't exist." into nyc-dev 2016-03-08 21:26:39 +00:00
Julia Reynolds
1d91e0f910 Merge "Notification summary updates." into nyc-dev
am: 5354f8a2d0

* commit '5354f8a2d097f6e67917e94dc019ac8ded8280db':
  Notification summary updates.
2016-03-08 21:25:02 +00:00
Julia Reynolds
184da33bba Don't reference the notification led if it doesn't exist.
Bug: 27318491
Change-Id: Ic43f1e8c0c7cf376b19278ab6c2661abc1052ddb
2016-03-08 16:23:03 -05:00
Julia Reynolds
5354f8a2d0 Merge "Notification summary updates." into nyc-dev 2016-03-08 21:08:55 +00:00
Julia Reynolds
3e912e7ea5 Notification summary updates.
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
2016-03-08 16:08:12 -05:00
Anna Galusza
6cb8b62bae Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev am: 0cb68d4dff
am: 79bc5ece6e

* commit '79bc5ece6e52a1399faf704fb5d3bed37ae82248':
  Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637
2016-03-08 20:50:58 +00:00
Anna Galusza
79bc5ece6e Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev
am: 0cb68d4dff

* commit '0cb68d4dff3a5a348a8e99dc9f808d7d584b1f10':
  Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637
2016-03-08 20:46:00 +00:00
Anna Galusza
0cb68d4dff Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev 2016-03-08 20:37:34 +00:00
Jason Monk
f8a08a2ac5 Fix SummaryLoader lifecycle second and for all am: 9425839379
am: 4a93400a02

* commit '4a93400a02e4abd5e3e99245cb31da0c6d0df50e':
  Fix SummaryLoader lifecycle second and for all
2016-03-08 19:52:31 +00:00
Jason Monk
3e19fc5600 Move temporary metrics constants to proto
Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
2016-03-08 14:18:30 -05:00
Jason Monk
4a93400a02 Fix SummaryLoader lifecycle second and for all
am: 9425839379

* commit '9425839379d862604d4b5a7b9161540f598f64f6':
  Fix SummaryLoader lifecycle second and for all
2016-03-08 18:26:08 +00:00
Jason Monk
9425839379 Fix SummaryLoader lifecycle second and for all
Mostly hypothetical fix for weird circumstance where listening
lifecycle gets broken.  To fix this, track the current state
of listening in the SummaryLoader and force it into the non-listening
state when released.

Bug: 26027137
Bug: 26731143
Change-Id: I7299749230924eafa3e6e7d5b0de6e48ff014a38
2016-03-08 13:14:27 -05:00
Udam Saini
84b7e86cf1 Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev am: 4695fc7e48
am: 704ea2ddef

* commit '704ea2ddeffe243136de770899ae21c297a49fc1':
  Fixes a crash in setup wizard when adding a lock screen.
2016-03-08 02:03:24 +00:00
Udam Saini
704ea2ddef Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev
am: 4695fc7e48

* commit '4695fc7e484bdc76ca9bd3d6b04a72f82a559f41':
  Fixes a crash in setup wizard when adding a lock screen.
2016-03-08 02:01:27 +00:00
Udam Saini
4695fc7e48 Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev 2016-03-08 01:55:00 +00:00
Udam Saini
6d6e117720 Fixes a crash in setup wizard when adding a lock screen.
bug:27528834
Change-Id: Idc06850740695669162e239f28c30a1ddad6d2df
2016-03-07 17:50:40 -08:00
Ruben Brunk
f584fe7493 Merge "Add settings VR listener service." into nyc-dev am: 31a3b770c7
am: caab7e72cd

* commit 'caab7e72cd664bc3f55aaeef2b07f22ba4c43341':
  Add settings VR listener service.
2016-03-08 00:30:55 +00:00