Commit Graph

26915 Commits

Author SHA1 Message Date
shwetachahar
dd49d0308d Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev am: abef602 am: 82f3228
am: 94e6245

* commit '94e6245a809cd5b8e8bef25f36fb1ebd841ab447':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I78cbd3a39973e38d81640b994858690e6e90c8ae
2016-04-18 15:15:01 +00:00
Shweta Chahar
94e6245a80 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev am: abef602
am: 82f3228

* commit '82f32288c124ca5dfed87199931a390ba86e621e':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I786bad2629688e065972b5fa8dc8d19c06cc350f
2016-04-18 15:09:58 +00:00
shwetachahar
82f32288c1 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev
am: abef602

* commit 'abef602337c8d362021ebeaf081ff3ca8a2a61f8':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I2fae21bd484ef457b86494ca9e95742c48a03d10
2016-04-18 15:04:55 +00:00
Shweta Chahar
abef602337 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev 2016-04-18 14:56:51 +00:00
Sudheer Shanka
29094b2eba Fix NullPointerException in Utils.copyMeProfilePhoto. am: 39975a6
am: c258a3d

* commit 'c258a3dd4129eacc6a69847871b8f7bfa8a6e266':
  Fix NullPointerException in Utils.copyMeProfilePhoto.

Change-Id: I179eb6365ff2ea9eb396160e179838f4276f2199
2016-04-16 01:49:54 +00:00
Sudheer Shanka
c258a3dd41 Fix NullPointerException in Utils.copyMeProfilePhoto.
am: 39975a6

* commit '39975a60cc0953da058bbfa33c16007f763f5498':
  Fix NullPointerException in Utils.copyMeProfilePhoto.

Change-Id: I3fb15ca1afb2f0887767ee9a63314d19c1642eb0
2016-04-16 01:47:20 +00:00
Sudheer Shanka
39975a60cc Fix NullPointerException in Utils.copyMeProfilePhoto.
Bug: 28221898
Change-Id: I2f67c4ba349a1c831b22174fefd0db6efeffbf1e
2016-04-15 17:21:41 -07:00
Ido Ofir
f472716ba2 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev am: 7f4892f
am: 5a9cff7

* commit '5a9cff708f3c83a71c9610ec52453acf21aff649':
  Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.

Change-Id: I12d6c2c7fe63f1bc7a3a6798a3070f8cef2bf541
2016-04-15 23:29:13 +00:00
Ido Ofir
5a9cff708f Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
am: 7f4892f

* commit '7f4892f223ec265fdee5223fdec92440849160ac':
  Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.

Change-Id: Iacab34944705d4ad8e49d9b32fecdfa0cc9cd40b
2016-04-15 23:24:34 +00:00
Ido Ofir
7f4892f223 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev 2016-04-15 23:16:51 +00:00
Ido Ofir
81513d7a88 Changing dimensions and margins for fingerprint image in portrait mode.
Landscape layout remains the same with fixed size.

Bug: 27875410

Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67
2016-04-15 13:30:01 -07:00
Mihai Niță
c3e8ae2e6f Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev am: 50669fa
am: 7b5e52b

* commit '7b5e52bf9e0866f0391b25f94efef4a13677ccbd':
  Fix checkboxes and warning dialog lost when device rotates

Change-Id: Ic212a06cbd8838421443ee7dfb7a4fe8b9ad037a
2016-04-15 19:06:49 +00:00
Mihai Nita
7b5e52bf9e Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev
am: 50669fa

* commit '50669fa3e8774e1707ddf072c645629359ada9ec':
  Fix checkboxes and warning dialog lost when device rotates

Change-Id: Id4f7d65e987f1c340898d1c1136260b0b1d72c4f
2016-04-15 18:56:48 +00:00
Mihai Niță
50669fa3e8 Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev 2016-04-15 18:44:19 +00:00
TreeHugger Robot
c6cd619468 Merge "Add metrics for Data Saver actions." into nyc-dev am: 2ed2158
am: 4012ca7

* commit '4012ca71822327ee7b0b21a27a2d821155636201':
  Add metrics for Data Saver actions.

Change-Id: I2a19d84cb77f5c6464088ac8a61e748849a2552c
2016-04-15 18:11:48 +00:00
Felipe Leme
4012ca7182 Merge "Add metrics for Data Saver actions." into nyc-dev
am: 2ed2158

* commit '2ed21582367a52bf021a4337d549e64a20c1d02b':
  Add metrics for Data Saver actions.

Change-Id: I9634aa77870a28287672130f453b9b83c9ea6dd1
2016-04-15 18:08:37 +00:00
TreeHugger Robot
2ed2158236 Merge "Add metrics for Data Saver actions." into nyc-dev 2016-04-15 17:53:41 +00:00
Jason Monk
c8a9a78f8a Merge ""Fix" search" into nyc-dev am: 15310bb
am: 951ee5b

* commit '951ee5b5946ea0282ca52b953fe2b5c95efff8ce':
  "Fix" search

Change-Id: Ie504a81f0bc0f2f45ee5961a56a20f1a7fbdaae7
2016-04-15 16:10:45 +00:00
Makoto Onuki
1edbece1f5 Merge "Don\'t allow removing admin to be added again" into nyc-dev am: 547fc39
am: 513c783

* commit '513c783b39eb52eb77295f1a0c3b3b3e38a9d919':
  Don't allow removing admin to be added again

Change-Id: I05a3d7915d502c9535a6f62effce854a0dffb466
2016-04-15 16:10:45 +00:00
Jason Monk
951ee5b594 Merge ""Fix" search" into nyc-dev
am: 15310bb

* commit '15310bbb2f1fac136dfbb62d43babf4a80483fa5':
  "Fix" search

Change-Id: Id414ce87a468111799ca5222c4650af14d6f025c
2016-04-15 16:10:23 +00:00
Makoto Onuki
513c783b39 Merge "Don\'t allow removing admin to be added again" into nyc-dev
am: 547fc39

* commit '547fc3983edc67a9abf28b628fcb0b9bd0be2415':
  Don't allow removing admin to be added again

Change-Id: Ib44dc27ab2be9c0bd8298162cf64776090021d35
2016-04-15 16:07:14 +00:00
Jason Monk
15310bbb2f Merge ""Fix" search" into nyc-dev 2016-04-15 16:06:47 +00:00
Makoto Onuki
547fc3983e Merge "Don't allow removing admin to be added again" into nyc-dev 2016-04-15 16:05:21 +00:00
shwetachahar
87f3e11da1 Replace the try catch block for retrieving pitch and speech rate
values from secure settings with getInt() supplied with a default
arg.
Also, set the pitch and speech rate of the TTS engine to the
default rate and pitch when initSetting() is called.

Bug: 27916665
Bug: 27871182
Change-Id: Ie772ee6f29d40774f70e73fe091f6f884472e2f8
2016-04-15 16:48:17 +01:00
Julia Reynolds
0986daa6cc Merge "Notification slider changes." into nyc-dev am: 8b01df5
am: 29eeaf9

* commit '29eeaf9530fa116f7ad890ed438c4e5de7486dff':
  Notification slider changes.

Change-Id: I6427f467d58cf40a8b6ba3067b0007b6e11a2927
2016-04-15 15:38:32 +00:00
Julia Reynolds
29eeaf9530 Merge "Notification slider changes." into nyc-dev
am: 8b01df5

* commit '8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
  Notification slider changes.

Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997
2016-04-15 15:32:17 +00:00
Julia Reynolds
8b01df5d78 Merge "Notification slider changes." into nyc-dev 2016-04-15 15:20:21 +00:00
Julia Reynolds
088fb52ef8 Notification slider changes.
Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
2016-04-15 11:04:13 -04:00
Benjamin Franz
70d759c131 Merge "Only try disabling quiet mode" into nyc-dev am: 89726fd
am: e4a793f

* commit 'e4a793f02d44f371ac465a0fc928f1bcf50dd642':
  Only try disabling quiet mode

Change-Id: I971956822a2d874180311d78fa163faacb804773
2016-04-15 14:58:15 +00:00
Benjamin Franz
e4a793f02d Merge "Only try disabling quiet mode" into nyc-dev
am: 89726fd

* commit '89726fd95209689dea1f82912e85c837fbeb8553':
  Only try disabling quiet mode

Change-Id: I20ae72a682796290796e724f26e2f36280de9ed0
2016-04-15 14:55:11 +00:00
Benjamin Franz
89726fd952 Merge "Only try disabling quiet mode" into nyc-dev 2016-04-15 14:53:16 +00:00
Noah Wang
263d135ebd Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev am: 87ec078
am: 3256144

* commit '3256144ebaf3272eb58bbc0e047c442eba12d44b':
  Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982

Change-Id: I82851aa292da506e198d170f1d298e17dcf3ee0f
2016-04-15 14:52:16 +00:00
Noah Wang
3256144eba Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev
am: 87ec078

* commit '87ec078dd5bb1801bb58189ccd2e11a771cb453a':
  Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982

Change-Id: I83445e037451d4ab121d040ef9b2e63e1ba9be3d
2016-04-15 14:49:19 +00:00
Noah Wang
87ec078dd5 Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev 2016-04-15 14:47:58 +00:00
Ricky Wai
b82b5007da Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev am: 697f3a6
am: ab8a796

* commit 'ab8a79616fa129d0c6d2124b119269a6f0582bfa':
  Show "work mode off" dialog when work notification setting is clicked

Change-Id: I0f752591858d604883a1c89abe9e86628b359c55
2016-04-15 14:46:07 +00:00
Ricky Wai
ab8a79616f Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev
am: 697f3a6

* commit '697f3a6ce21319d4e8f666633b4888fa8dfb0a50':
  Show "work mode off" dialog when work notification setting is clicked

Change-Id: I3385090466d1a601e451bee0b166b784c12df2e8
2016-04-15 14:42:46 +00:00
Ricky Wai
697f3a6ce2 Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev 2016-04-15 14:40:11 +00:00
Noah Wang
37c95e41e0 Change Preview Pager and Pager Indicator order for
RTL environment
Bug: 28025982

Change-Id: Ia80220f9e4c4a22a10e7cd857dc4e3573ee7b51d
2016-04-15 07:34:39 -07:00
Ricky Wai
af67c3b576 Show "work mode off" dialog when work notification setting is clicked
Bug: 28158297
Change-Id: Iea4eaa32f3c4b2e605b6eace82ee4443e387fb4b
2016-04-15 14:43:44 +01:00
Oleksandr Peletskyi
99f598220b Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev am: bd666a1
am: 7cca80d

* commit '7cca80d68cd6fbbb7cc7d6d7e9458058e3aceaf7':
  Fixed stopped countdown when PIN entered incorrect.

Change-Id: Ic5440fee0b43148398a805ba03990f5016830ab8
2016-04-15 13:37:00 +00:00
Oleksandr Peletskyi
7cca80d68c Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev
am: bd666a1

* commit 'bd666a17a28d94036f9312f992aacd37022bfea0':
  Fixed stopped countdown when PIN entered incorrect.

Change-Id: Id56d809f42aac3f5e49e4e56a07e57d41882d7dc
2016-04-15 13:34:49 +00:00
Oleksandr Peletskyi
bd666a17a2 Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev 2016-04-15 13:29:35 +00:00
Mihai Nita
930176b131 Fix checkboxes and warning dialog lost when device rotates
The frame is destroyed then the device rotates, so we need
to save and restore the complete status (remove mode or not,
list of checked locales, if the warning dialog it showing).

Bug: 26720315
Bug: 26758726
Change-Id: Ie1340d3242cb61dc736a0b456224b8570826e937
2016-04-14 20:33:56 -07:00
Sudheer Shanka
8bc0912e0f Merge "Set user icon to default when updating profile without photo" into nyc-dev am: 2cae2f1
am: ded37b8

* commit 'ded37b8050aba3244002c6a76157583ba083f016':
  Set user icon to default when updating profile without photo

Change-Id: Iefe71b6d0f95437fdeb3ddc450cc29cc5ac9680c
2016-04-15 02:26:59 +00:00
Sudheer Shanka
ded37b8050 Merge "Set user icon to default when updating profile without photo" into nyc-dev
am: 2cae2f1

* commit '2cae2f1613136e42e2b79121055da8b526a92a24':
  Set user icon to default when updating profile without photo

Change-Id: If5ddd38898387b52570fbb07365dfd2934ad46a0
2016-04-15 02:22:12 +00:00
Sudheer Shanka
2cae2f1613 Merge "Set user icon to default when updating profile without photo" into nyc-dev 2016-04-15 02:18:11 +00:00
Makoto Onuki
d141856586 Don't allow removing admin to be added again
Bug 27909181

Change-Id: I15bcff0f790e8f701bacea912c1624be926a2076
2016-04-15 01:14:55 +00:00
Sudheer Shanka
71caf698b4 Set user icon to default when updating profile without photo
If the user photo was deleted in the Myself contact, the change
was not reflected neither in Settings/Users nor in expanded
status bar. This was because the ProfileUpdateReceiver did not
handle the case where the updated image was null (deleted).
Fixed by assigning default user icon in UserManager if no photo
found in the profile update.

AOSP change: https://android-review.googlesource.com/#/c/153137

Bug: 28031914
Change-Id: I2f452f78dcf777414f50b133b1a9cee334bbd9a8
2016-04-14 16:56:15 -07:00
Felipe Leme
0628e33bf2 Add metrics for Data Saver actions.
BUG: 28166693
Change-Id: Ie435db66183ef645467ffa6cc7537d54d35cab31
2016-04-14 16:14:55 -07:00
Sudheer Shanka
64872b637d Merge "Add additional summaries for some restricted switch preferences." into nyc-dev am: cdb089c
am: 3718041

* commit '371804159ce68fb43053ca42ed68fcb934634d8e':
  Add additional summaries for some restricted switch preferences.

Change-Id: I87eb43c585cb53571e507aceb2121289662eb7b7
2016-04-14 21:26:21 +00:00