OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am...
shwetachahar [Mon, 18 Apr 2016 15:34:25 +0000 (15:34 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am: cea65a4
am: 335d9fe

* commit '335d9fee62a1eb133cb3d2317bef1305b0874edb':

Change-Id: I25559c455ca6a33caad9d4352377484383aaed32

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am...
shwetachahar [Mon, 18 Apr 2016 15:34:24 +0000 (15:34 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am: 3cf8d61
am: a961b00

* commit 'a961b006c411af203f62cbff61ed1cf13264b402':
  Add a button to reset pitch to default value.

Change-Id: I87f2d329fd04a57e3cb3af5e734227064a3fea93

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
Shweta Chahar [Mon, 18 Apr 2016 15:30:31 +0000 (15:30 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
am: cea65a4

* commit 'cea65a460bfdb2c1f8e5feed063ed76d63df2a49':

Change-Id: I25cfa4a6303852f211c6d61ec2285320b70c19ae

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
Shweta Chahar [Mon, 18 Apr 2016 15:27:14 +0000 (15:27 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
am: 3cf8d61

* commit '3cf8d6145843adac6e0b8eec33aa152995118c7a':
  Add a button to reset pitch to default value.

Change-Id: I0490f1562f5b1d68a82a7f2f9ec9e279e99ffc12

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev
shwetachahar [Mon, 18 Apr 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev
am: da4ecea

* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
  Add a button to reset pitch to default value.

Change-Id: Ib8be9f4d0d5ff5b2a028ab83df3b271b6377b30c

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev
shwetachahar [Mon, 18 Apr 2016 15:22:47 +0000 (15:22 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev
am: da4ecea

* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
  Add a button to reset pitch to default value.

Change-Id: I3188a3de81683638efc236ddea5391685a0c565a

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
shwetachahar [Mon, 18 Apr 2016 15:15:01 +0000 (15:15 +0000)]
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: a4ae307
am: 3461d06

* commit '3461d06b2af5364bb89798dc83fd6b564c1980dc':

Change-Id: I867f574d7ed71cecffc2cdcbfff06c49645aa73f

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
shwetachahar [Mon, 18 Apr 2016 15:15:01 +0000 (15:15 +0000)]
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

8 years agoMerge "Add a button to reset pitch to default value." into nyc-dev
Shweta Chahar [Mon, 18 Apr 2016 15:14:24 +0000 (15:14 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
Shweta Chahar [Mon, 18 Apr 2016 15:10:14 +0000 (15:10 +0000)]
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: a4ae307

* commit 'a4ae3073abe74766c12813e8723cc8d28b8dcb4e':

Change-Id: Ibb497c0e5265cf6597e90cda94550d39dcc8223f

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
Shweta Chahar [Mon, 18 Apr 2016 15:09:58 +0000 (15:09 +0000)]
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

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
shwetachahar [Mon, 18 Apr 2016 15:04:55 +0000 (15:04 +0000)]
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

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
shwetachahar [Mon, 18 Apr 2016 15:04:53 +0000 (15:04 +0000)]
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: I3f870ed496e86180c3a14b490e6472007230e0e6

8 years agoMerge "Replace the try catch block for retrieving pitch and speech rate values from...
Shweta Chahar [Mon, 18 Apr 2016 14:56:51 +0000 (14:56 +0000)]
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

8 years agoFix NullPointerException in Utils.copyMeProfilePhoto. am: 39975a6
Sudheer Shanka [Sat, 16 Apr 2016 01:49:54 +0000 (01:49 +0000)]
Fix NullPointerException in Utils.copyMeProfilePhoto. am: 39975a6
am: c258a3d

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

Change-Id: I179eb6365ff2ea9eb396160e179838f4276f2199

8 years agoFix NullPointerException in Utils.copyMeProfilePhoto.
Sudheer Shanka [Sat, 16 Apr 2016 01:47:20 +0000 (01:47 +0000)]
Fix NullPointerException in Utils.copyMeProfilePhoto.
am: 39975a6

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

Change-Id: I3fb15ca1afb2f0887767ee9a63314d19c1642eb0

8 years agoFix NullPointerException in Utils.copyMeProfilePhoto.
Sudheer Shanka [Sat, 16 Apr 2016 00:20:54 +0000 (17:20 -0700)]
Fix NullPointerException in Utils.copyMeProfilePhoto.

Bug: 28221898
Change-Id: I2f67c4ba349a1c831b22174fefd0db6efeffbf1e

8 years agoMerge "Changing dimensions and margins for fingerprint image in portrait mode. Landsc...
Ido Ofir [Fri, 15 Apr 2016 23:29:13 +0000 (23:29 +0000)]
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

8 years agoMerge "Changing dimensions and margins for fingerprint image in portrait mode. Landsc...
Ido Ofir [Fri, 15 Apr 2016 23:24:34 +0000 (23:24 +0000)]
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

8 years agoMerge "Changing dimensions and margins for fingerprint image in portrait mode. Landsc...
Ido Ofir [Fri, 15 Apr 2016 23:16:50 +0000 (23:16 +0000)]
Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev

8 years agoChanging dimensions and margins for fingerprint image in portrait mode.
Ido Ofir [Thu, 14 Apr 2016 21:31:25 +0000 (14:31 -0700)]
Changing dimensions and margins for fingerprint image in portrait mode.
Landscape layout remains the same with fixed size.

Bug: 27875410

Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67

8 years agoMerge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev am...
Mihai Niță [Fri, 15 Apr 2016 19:06:49 +0000 (19:06 +0000)]
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

8 years agoMerge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev
Mihai Nita [Fri, 15 Apr 2016 18:56:48 +0000 (18:56 +0000)]
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

8 years agoMerge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev
Mihai Niță [Fri, 15 Apr 2016 18:44:19 +0000 (18:44 +0000)]
Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev

8 years agoMerge "Add metrics for Data Saver actions." into nyc-dev am: 2ed2158
TreeHugger Robot [Fri, 15 Apr 2016 18:11:48 +0000 (18:11 +0000)]
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

8 years agoMerge "Add metrics for Data Saver actions." into nyc-dev
Felipe Leme [Fri, 15 Apr 2016 18:08:37 +0000 (18:08 +0000)]
Merge "Add metrics for Data Saver actions." into nyc-dev
am: 2ed2158

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

Change-Id: I9634aa77870a28287672130f453b9b83c9ea6dd1

8 years agoMerge "Add metrics for Data Saver actions." into nyc-dev
TreeHugger Robot [Fri, 15 Apr 2016 17:53:40 +0000 (17:53 +0000)]
Merge "Add metrics for Data Saver actions." into nyc-dev

8 years agoMerge ""Fix" search" into nyc-dev am: 15310bb
Jason Monk [Fri, 15 Apr 2016 16:10:45 +0000 (16:10 +0000)]
Merge ""Fix" search" into nyc-dev am: 15310bb
am: 951ee5b

* commit '951ee5b5946ea0282ca52b953fe2b5c95efff8ce':
  "Fix" search

Change-Id: Ie504a81f0bc0f2f45ee5961a56a20f1a7fbdaae7

8 years agoMerge "Don\'t allow removing admin to be added again" into nyc-dev am: 547fc39
Makoto Onuki [Fri, 15 Apr 2016 16:10:45 +0000 (16:10 +0000)]
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

8 years agoMerge ""Fix" search" into nyc-dev
Jason Monk [Fri, 15 Apr 2016 16:10:23 +0000 (16:10 +0000)]
Merge ""Fix" search" into nyc-dev
am: 15310bb

* commit '15310bbb2f1fac136dfbb62d43babf4a80483fa5':
  "Fix" search

Change-Id: Id414ce87a468111799ca5222c4650af14d6f025c

8 years agoMerge "Don\'t allow removing admin to be added again" into nyc-dev
Makoto Onuki [Fri, 15 Apr 2016 16:07:14 +0000 (16:07 +0000)]
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

8 years agoMerge ""Fix" search" into nyc-dev
Jason Monk [Fri, 15 Apr 2016 16:06:47 +0000 (16:06 +0000)]
Merge ""Fix" search" into nyc-dev

8 years agoMerge "Don't allow removing admin to be added again" into nyc-dev
Makoto Onuki [Fri, 15 Apr 2016 16:05:21 +0000 (16:05 +0000)]
Merge "Don't allow removing admin to be added again" into nyc-dev

8 years agoReplace the try catch block for retrieving pitch and speech rate
shwetachahar [Fri, 15 Apr 2016 13:25:07 +0000 (14:25 +0100)]
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

8 years agoMerge "Notification slider changes." into nyc-dev am: 8b01df5
Julia Reynolds [Fri, 15 Apr 2016 15:38:32 +0000 (15:38 +0000)]
Merge "Notification slider changes." into nyc-dev am: 8b01df5
am: 29eeaf9

* commit '29eeaf9530fa116f7ad890ed438c4e5de7486dff':
  Notification slider changes.

Change-Id: I6427f467d58cf40a8b6ba3067b0007b6e11a2927

8 years agoMerge "Notification slider changes." into nyc-dev
Julia Reynolds [Fri, 15 Apr 2016 15:32:17 +0000 (15:32 +0000)]
Merge "Notification slider changes." into nyc-dev
am: 8b01df5

* commit '8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
  Notification slider changes.

Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997

8 years agoMerge "Notification slider changes." into nyc-dev
Julia Reynolds [Fri, 15 Apr 2016 15:20:21 +0000 (15:20 +0000)]
Merge "Notification slider changes." into nyc-dev

8 years agoNotification slider changes.
Julia Reynolds [Thu, 7 Apr 2016 00:32:23 +0000 (20:32 -0400)]
Notification slider changes.

Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f

8 years agoMerge "Only try disabling quiet mode" into nyc-dev am: 89726fd
Benjamin Franz [Fri, 15 Apr 2016 14:58:15 +0000 (14:58 +0000)]
Merge "Only try disabling quiet mode" into nyc-dev am: 89726fd
am: e4a793f

* commit 'e4a793f02d44f371ac465a0fc928f1bcf50dd642':
  Only try disabling quiet mode

Change-Id: I971956822a2d874180311d78fa163faacb804773

8 years agoAdd a button to reset pitch to default value.
shwetachahar [Fri, 15 Apr 2016 14:56:13 +0000 (15:56 +0100)]
Add a button to reset pitch to default value.

Bug: 27949093
Change-Id: Ia7fd2f824b8e87c08f9e2f3defca6e645c5c1bfb

8 years agoMerge "Only try disabling quiet mode" into nyc-dev
Benjamin Franz [Fri, 15 Apr 2016 14:55:11 +0000 (14:55 +0000)]
Merge "Only try disabling quiet mode" into nyc-dev
am: 89726fd

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

Change-Id: I20ae72a682796290796e724f26e2f36280de9ed0

8 years agoMerge "Only try disabling quiet mode" into nyc-dev
Benjamin Franz [Fri, 15 Apr 2016 14:53:16 +0000 (14:53 +0000)]
Merge "Only try disabling quiet mode" into nyc-dev

8 years agoMerge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 280259...
Noah Wang [Fri, 15 Apr 2016 14:52:16 +0000 (14:52 +0000)]
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

8 years agoMerge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 280259...
Noah Wang [Fri, 15 Apr 2016 14:49:19 +0000 (14:49 +0000)]
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

8 years agoMerge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 280259...
Noah Wang [Fri, 15 Apr 2016 14:47:58 +0000 (14:47 +0000)]
Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev

8 years agoMerge "Show "work mode off" dialog when work notification setting is clicked" into...
Ricky Wai [Fri, 15 Apr 2016 14:46:07 +0000 (14:46 +0000)]
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

8 years agoMerge "Show "work mode off" dialog when work notification setting is clicked" into...
Ricky Wai [Fri, 15 Apr 2016 14:42:46 +0000 (14:42 +0000)]
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

8 years agoMerge "Show "work mode off" dialog when work notification setting is clicked" into...
Ricky Wai [Fri, 15 Apr 2016 14:40:11 +0000 (14:40 +0000)]
Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev

8 years agoChange Preview Pager and Pager Indicator order for
Noah Wang [Sun, 10 Apr 2016 03:53:14 +0000 (20:53 -0700)]
Change Preview Pager and Pager Indicator order for
RTL environment
Bug: 28025982

Change-Id: Ia80220f9e4c4a22a10e7cd857dc4e3573ee7b51d

8 years agoShow "work mode off" dialog when work notification setting is clicked
Ricky Wai [Fri, 15 Apr 2016 13:43:44 +0000 (14:43 +0100)]
Show "work mode off" dialog when work notification setting is clicked

Bug: 28158297
Change-Id: Iea4eaa32f3c4b2e605b6eace82ee4443e387fb4b

8 years agoMerge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev am: bd666a1
Oleksandr Peletskyi [Fri, 15 Apr 2016 13:37:00 +0000 (13:37 +0000)]
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

8 years agoMerge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev
Oleksandr Peletskyi [Fri, 15 Apr 2016 13:34:49 +0000 (13:34 +0000)]
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

8 years agoMerge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev
Oleksandr Peletskyi [Fri, 15 Apr 2016 13:29:34 +0000 (13:29 +0000)]
Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev

8 years agoFix checkboxes and warning dialog lost when device rotates
Mihai Nita [Mon, 11 Apr 2016 15:00:28 +0000 (08:00 -0700)]
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

8 years agoMerge "Set user icon to default when updating profile without photo" into nyc-dev...
Sudheer Shanka [Fri, 15 Apr 2016 02:26:59 +0000 (02:26 +0000)]
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

8 years agoMerge "Set user icon to default when updating profile without photo" into nyc-dev
Sudheer Shanka [Fri, 15 Apr 2016 02:22:12 +0000 (02:22 +0000)]
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

8 years agoMerge "Set user icon to default when updating profile without photo" into nyc-dev
Sudheer Shanka [Fri, 15 Apr 2016 02:18:10 +0000 (02:18 +0000)]
Merge "Set user icon to default when updating profile without photo" into nyc-dev

8 years agoDon't allow removing admin to be added again
Makoto Onuki [Wed, 13 Apr 2016 23:40:37 +0000 (16:40 -0700)]
Don't allow removing admin to be added again

Bug 27909181

Change-Id: I15bcff0f790e8f701bacea912c1624be926a2076

8 years agoSet user icon to default when updating profile without photo
Sudheer Shanka [Thu, 14 Apr 2016 23:50:14 +0000 (16:50 -0700)]
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

8 years agoAdd metrics for Data Saver actions.
Felipe Leme [Thu, 14 Apr 2016 23:11:20 +0000 (16:11 -0700)]
Add metrics for Data Saver actions.

BUG: 28166693
Change-Id: Ie435db66183ef645467ffa6cc7537d54d35cab31

8 years agoMerge "Add additional summaries for some restricted switch preferences." into nyc...
Sudheer Shanka [Thu, 14 Apr 2016 21:26:21 +0000 (21:26 +0000)]
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

8 years agoMerge "Add additional summaries for some restricted switch preferences." into nyc-dev
Sudheer Shanka [Thu, 14 Apr 2016 21:19:26 +0000 (21:19 +0000)]
Merge "Add additional summaries for some restricted switch preferences." into nyc-dev
am: cdb089c

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

Change-Id: I8640613299b71a2a4c60ef49a363508541234bc5

8 years agoMerge "Add additional summaries for some restricted switch preferences." into nyc-dev
Sudheer Shanka [Thu, 14 Apr 2016 21:05:24 +0000 (21:05 +0000)]
Merge "Add additional summaries for some restricted switch preferences." into nyc-dev

8 years agoMerge "Force to unlock work challenge before reply inline notification" into nyc...
Ricky Wai [Thu, 14 Apr 2016 20:29:13 +0000 (20:29 +0000)]
Merge "Force to unlock work challenge before reply inline notification" into nyc-dev am: 29d59dd
am: efe5045

* commit 'efe504558b2584a2990e76985a307f3789a27e6c':
  Force to unlock work challenge before reply inline notification

Change-Id: I145664e05424ac926da00d298043eab8726c6e1d

8 years agoMerge "Allow disconnecting always-on VPNs" into nyc-dev am: 1932aa9
Robin Lee [Thu, 14 Apr 2016 20:29:13 +0000 (20:29 +0000)]
Merge "Allow disconnecting always-on VPNs" into nyc-dev am: 1932aa9
am: 65aa656

* commit '65aa6563ad139d734faf01e040d7d86d06eb955c':
  Allow disconnecting always-on VPNs

Change-Id: I03a97b3ed479a8a561c2c33ae00749d85f863573

8 years agoMerge "Fixed typos "QuiteMode"" into nyc-dev am: 78f1e3d
Bernard Chau [Thu, 14 Apr 2016 20:29:12 +0000 (20:29 +0000)]
Merge "Fixed typos "QuiteMode"" into nyc-dev am: 78f1e3d
am: edb4856

* commit 'edb4856ec1c6d6ab5bafbedf155d0c7d3fca31f6':
  Fixed typos "QuiteMode"

Change-Id: I685b1f704f870c2fa8b998a31732f6021ca0a132

8 years agoMerge "Improvements on "App data usage" screen." into nyc-dev am: 2b131e5
Felipe Leme [Thu, 14 Apr 2016 20:29:12 +0000 (20:29 +0000)]
Merge "Improvements on "App data usage" screen." into nyc-dev am: 2b131e5
am: 242e4f5

* commit '242e4f5c31726877deb5ad02f263bd91a7c387bd':
  Improvements on "App data usage" screen.

Change-Id: I4c5978deef0f1beadc8ff0f1ffb9b14f921903a2

8 years agoMerge "Don\'t debug log on ConditionManager" into nyc-dev am: 452e371
Jason Monk [Thu, 14 Apr 2016 20:29:11 +0000 (20:29 +0000)]
Merge "Don\'t debug log on ConditionManager" into nyc-dev am: 452e371
am: 2f781b7

* commit '2f781b7401a6bfbf8ddc5bd589c89dc1a5e36aee':
  Don't debug log on ConditionManager

Change-Id: Ic85a694889e0402701a282c2cfe04ff7892b8532

8 years agoMerge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev am: 9abb6b0
Oleksandr Peletskyi [Thu, 14 Apr 2016 20:29:11 +0000 (20:29 +0000)]
Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev am: 9abb6b0
am: dfa04e2

* commit 'dfa04e2017b584b33dd11ae8da67e4578bdee5e0':
  Improved UX for DISALLOW_SET_USER_ICON restriction.

Change-Id: I403f6bb442e4e255c3f2daf70a9f88d8a02fe6e6

8 years agoMerge "Show Physical keyboards only after everything has been loaded" into nyc-dev...
Abodunrinwa Toki [Thu, 14 Apr 2016 20:29:10 +0000 (20:29 +0000)]
Merge "Show Physical keyboards only after everything has been loaded" into nyc-dev am: bbf5df7
am: 03137f7

* commit '03137f7cebaf7e8a658d7008eda8b1a4aa35760a':
  Show Physical keyboards only after everything has been loaded

Change-Id: I324850bec9c32aa4921a2bd882e18f4677601bec

8 years agoMerge "Remove the preview screens from Display/Font size settings when the activity...
Noah Wang [Thu, 14 Apr 2016 20:29:09 +0000 (20:29 +0000)]
Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev am: 7444be6
am: 36b15ba

* commit '36b15ba0be48d0d417ad66f516f30b6f2035252c':
  Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf

Change-Id: I4912c21ebabec8430b62054e55689956695b42b7

8 years agoMerge "Instantiating background image of preview video in Magnification Gesture scree...
Noah Wang [Thu, 14 Apr 2016 20:29:08 +0000 (20:29 +0000)]
Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev am: 6e15861
am: 105c088

* commit '105c088d8f7dc5ed3eabec0001e821b62f460a73':
  Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691

Change-Id: Id35f0a4b3ba3affc44338980451d5082e6b6b8eb

8 years agoMerge "Notification listeners have full DND access." into nyc-dev am: cc43dd9
Julia Reynolds [Thu, 14 Apr 2016 20:29:07 +0000 (20:29 +0000)]
Merge "Notification listeners have full DND access." into nyc-dev am: cc43dd9
am: de8799c

* commit 'de8799cc032270c3b1990d34c9f664059c4e31c7':
  Notification listeners have full DND access.

Change-Id: I53ed3ed064179423196d10e9692c51e98ad5508e

8 years agoMerge "Data Saver Mode phrasing tweaks." into nyc-dev am: 6a41da8
TreeHugger Robot [Thu, 14 Apr 2016 20:29:06 +0000 (20:29 +0000)]
Merge "Data Saver Mode phrasing tweaks." into nyc-dev am: 6a41da8
am: 4e77421

* commit '4e7742114bb33ffb008bb937a67b26f7cac70570':
  Data Saver Mode phrasing tweaks.

Change-Id: I9220415d09ebb32abbf917f8f347416dba02768a

8 years ago"Fix" search
Jason Monk [Thu, 14 Apr 2016 18:34:16 +0000 (14:34 -0400)]
"Fix" search

 - Only consider a locale actually indexed after it has had a full
   update run
 - Run all indexing queueing on the AsyncTask's serial threadpool
   to avoid more threading issues.

Change-Id: I8fc84b0faafc5c104d090b6bbd87857550b3af89
Fixes: 27826745

8 years agoMerge "Force to unlock work challenge before reply inline notification" into nyc-dev
Ricky Wai [Thu, 14 Apr 2016 18:09:41 +0000 (18:09 +0000)]
Merge "Force to unlock work challenge before reply inline notification" into nyc-dev
am: 29d59dd

* commit '29d59dd21f3caa38e866ee304fed7d785477ad1e':
  Force to unlock work challenge before reply inline notification

Change-Id: I4ed8b69740db78b1b3a7ad489bfd5107c8e00aa3

8 years agoMerge "Force to unlock work challenge before reply inline notification" into nyc-dev
Ricky Wai [Thu, 14 Apr 2016 17:59:27 +0000 (17:59 +0000)]
Merge "Force to unlock work challenge before reply inline notification" into nyc-dev

8 years agoFixed stopped countdown when PIN entered incorrect.
Oleksandr Peletskyi [Thu, 14 Apr 2016 17:35:04 +0000 (19:35 +0200)]
Fixed stopped countdown when PIN entered incorrect.

When device is locked CountDownTimer.onFinish() is not called
after countdown finished. Thus some logic was copied to onResume().

BUG:28160696
Change-Id: I1906e7ab2202b437b909afc12b7b3628692a00f1

8 years agoMerge "Allow disconnecting always-on VPNs" into nyc-dev
Robin Lee [Thu, 14 Apr 2016 16:58:41 +0000 (16:58 +0000)]
Merge "Allow disconnecting always-on VPNs" into nyc-dev
am: 1932aa9

* commit '1932aa95d45ec05758ca376d89def368dcd3c921':
  Allow disconnecting always-on VPNs

Change-Id: I53d63ecf276210582baf568dd4fc9c5aa607f8b3

8 years agoMerge "Fixed typos "QuiteMode"" into nyc-dev
Bernard Chau [Thu, 14 Apr 2016 16:53:34 +0000 (16:53 +0000)]
Merge "Fixed typos "QuiteMode"" into nyc-dev
am: 78f1e3d

* commit '78f1e3de5ea4872dfe0aca03510b06a6ab8a86db':
  Fixed typos "QuiteMode"

Change-Id: Ib44c4f665e17c011e4c7b90da99780aa058693dd

8 years agoMerge "Allow disconnecting always-on VPNs" into nyc-dev
Robin Lee [Thu, 14 Apr 2016 16:50:42 +0000 (16:50 +0000)]
Merge "Allow disconnecting always-on VPNs" into nyc-dev

8 years agoMerge "Fixed typos "QuiteMode"" into nyc-dev
Bernard Chau [Thu, 14 Apr 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Fixed typos "QuiteMode"" into nyc-dev

8 years agoMerge "Improvements on "App data usage" screen." into nyc-dev
Felipe Leme [Thu, 14 Apr 2016 16:00:23 +0000 (16:00 +0000)]
Merge "Improvements on "App data usage" screen." into nyc-dev
am: 2b131e5

* commit '2b131e58a71278488dd7e8f0bbf32dabe363ef04':
  Improvements on "App data usage" screen.

Change-Id: I6e12bd68820a8fadc4115061774de794a4ee7b9c

8 years agoMerge "Improvements on "App data usage" screen." into nyc-dev
Felipe Leme [Thu, 14 Apr 2016 15:55:17 +0000 (15:55 +0000)]
Merge "Improvements on "App data usage" screen." into nyc-dev

8 years agoAllow disconnecting always-on VPNs
Robin Lee [Thu, 14 Apr 2016 14:41:41 +0000 (15:41 +0100)]
Allow disconnecting always-on VPNs

Bug: 28072644
Change-Id: If7595f7e17747867158368d95db5addf97d3a14c

8 years agoFixed typos "QuiteMode"
Bernard Chau [Thu, 14 Apr 2016 14:08:28 +0000 (15:08 +0100)]
Fixed typos "QuiteMode"

Bug: 28186496
Change-Id: I460509f7fda205711532c290f764d842f07aba49

8 years agoMerge "Don\'t debug log on ConditionManager" into nyc-dev
Jason Monk [Thu, 14 Apr 2016 13:20:28 +0000 (13:20 +0000)]
Merge "Don\'t debug log on ConditionManager" into nyc-dev
am: 452e371

* commit '452e371aa1a83f61ba475689b18ca8c1bc996920':
  Don't debug log on ConditionManager

Change-Id: Ia6e1f1caf9736b7f901ad2641b249bb9317306c2

8 years agoMerge "Don't debug log on ConditionManager" into nyc-dev
Jason Monk [Thu, 14 Apr 2016 13:14:43 +0000 (13:14 +0000)]
Merge "Don't debug log on ConditionManager" into nyc-dev

8 years agoMerge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev
Oleksandr Peletskyi [Thu, 14 Apr 2016 10:53:21 +0000 (10:53 +0000)]
Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev
am: 9abb6b0

* commit '9abb6b01f45bb6fbabf3235f989286783db1a7ae':
  Improved UX for DISALLOW_SET_USER_ICON restriction.

Change-Id: I7ea20af30bb84529cdc971ecdc9f41ac0a188751

8 years agoMerge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev
Oleksandr Peletskyi [Thu, 14 Apr 2016 10:46:08 +0000 (10:46 +0000)]
Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev

8 years agoMerge "Show Physical keyboards only after everything has been loaded" into nyc-dev
Abodunrinwa Toki [Thu, 14 Apr 2016 10:07:51 +0000 (10:07 +0000)]
Merge "Show Physical keyboards only after everything has been loaded" into nyc-dev
am: bbf5df7

* commit 'bbf5df73f9e4318948272b0ca0aba5d55eaca13f':
  Show Physical keyboards only after everything has been loaded

Change-Id: Idcf8d0f5fd4043d42591005a553668864c65d080

8 years agoMerge "Show Physical keyboards only after everything has been loaded" into nyc-dev
Abodunrinwa Toki [Thu, 14 Apr 2016 10:04:16 +0000 (10:04 +0000)]
Merge "Show Physical keyboards only after everything has been loaded" into nyc-dev

8 years agoMerge "Remove the preview screens from Display/Font size settings when the activity...
Noah Wang [Thu, 14 Apr 2016 05:15:02 +0000 (05:15 +0000)]
Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev
am: 7444be6

* commit '7444be6f289f72b09551b4ee865ad6beb157e5e6':
  Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf

Change-Id: Ia5097feabb5da6713634a2466a15b0c809d6ea58

8 years agoMerge "Instantiating background image of preview video in Magnification Gesture scree...
Noah Wang [Thu, 14 Apr 2016 05:15:02 +0000 (05:15 +0000)]
Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev
am: 6e15861

* commit '6e1586150e5e97b4f7f0bdd15b380c99b668770b':
  Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691

Change-Id: I1713e7dc4ba7b17ecbd9bb472e3b3ac72056befb

8 years agoMerge "Remove the preview screens from Display/Font size settings when the activity...
Noah Wang [Thu, 14 Apr 2016 05:10:49 +0000 (05:10 +0000)]
Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev

8 years agoMerge "Instantiating background image of preview video in Magnification Gesture scree...
Noah Wang [Thu, 14 Apr 2016 05:10:34 +0000 (05:10 +0000)]
Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev

8 years agoAdd additional summaries for some restricted switch preferences.
Sudheer Shanka [Wed, 13 Apr 2016 17:13:16 +0000 (10:13 -0700)]
Add additional summaries for some restricted switch preferences.

For some of the switch preferences, we need the new summary
"Enabled/Disabled" so that the user know about the switch state but
we can't replace some existing summaries because they provide
context.

Bug: 27659072
Change-Id: I65aca79184f543ef3fc85634594cad75f516d2fa

8 years agoInstantiating background image of preview video in
Noah Wang [Sat, 9 Apr 2016 00:47:57 +0000 (17:47 -0700)]
Instantiating background image of preview video in
Magnification Gesture screen using ImageView, also
set GlobalLayoutListener to adjust its position.
Bug: 27992162
Bug: 27901691

Change-Id: I9563eb2776bcde3d7edeb4a420a9b3c02481baf8

8 years agoMerge "Notification listeners have full DND access." into nyc-dev
Julia Reynolds [Thu, 14 Apr 2016 01:07:18 +0000 (01:07 +0000)]
Merge "Notification listeners have full DND access." into nyc-dev
am: cc43dd9

* commit 'cc43dd935f654b133e84c3cd745d1e8cf52e3959':
  Notification listeners have full DND access.

Change-Id: I7d968d327cb7d17c130bb7d8945747b6d4d025a3

8 years agoMerge "Notification listeners have full DND access." into nyc-dev
Julia Reynolds [Thu, 14 Apr 2016 00:58:09 +0000 (00:58 +0000)]
Merge "Notification listeners have full DND access." into nyc-dev