PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,855 Commits 1 Branch 0 Tags
8d76aaf345b090ba438e362f9510367e9252faef
Commit Graph

8572 Commits

Author SHA1 Message Date
Sudheer Shanka
8d76aaf345 Merge "Adjust restricted lock positions as per new design." into nyc-dev am: 1749d518b7 
am: ace7191046

* commit 'ace7191046ccd4f51cdbdd72000898f67f50e3a4':
  Adjust restricted lock positions as per new design.
 2016-03-10 16:09:13 +00:00
Sudheer Shanka
ace7191046 Merge "Adjust restricted lock positions as per new design." into nyc-dev 
am: 1749d518b7

* commit '1749d518b705a4e0b387b0cd14f02ad9ab05e5a5':
  Adjust restricted lock positions as per new design.
 2016-03-10 16:05:09 +00:00
Sudheer Shanka
1749d518b7 Merge "Adjust restricted lock positions as per new design." into nyc-dev 2016-03-10 15:58:15 +00:00
Sudheer Shanka
115d15763d Adjust restricted lock positions as per new design. 
Bug: 27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
 2016-03-10 07:54:36 -08:00
Udam Saini
afc673635f Merge "Removes duplicated checkbox and fixes text alignment." into nyc-dev am: 22848ac901 
am: 66f1da6a26

* commit '66f1da6a2687eab5f0946c79707a77e8c28df1a1':
  Removes duplicated checkbox and fixes text alignment.
 2016-03-10 00:51:34 +00:00
Udam Saini
66f1da6a26 Merge "Removes duplicated checkbox and fixes text alignment." into nyc-dev 
am: 22848ac901

* commit '22848ac90104bb668b6f2836e39a9ba141ee8a2f':
  Removes duplicated checkbox and fixes text alignment.
 2016-03-10 00:49:21 +00:00
Udam Saini
22848ac901 Merge "Removes duplicated checkbox and fixes text alignment." into nyc-dev 2016-03-10 00:36:27 +00:00
Makoto Onuki
3d949ab8cc Merge "Add "Reset ShortcutManager throttling" to dev options" into nyc-dev am: e263401610 
am: dd9187fcae

* commit 'dd9187fcaea43137b9c4604958f4c4c641fd0776':
  Add "Reset ShortcutManager throttling" to dev options
 2016-03-09 22:25:09 +00:00
Makoto Onuki
dd9187fcae Merge "Add "Reset ShortcutManager throttling" to dev options" into nyc-dev 
am: e263401610

* commit 'e263401610cdcf4b58125aeea5cfc076aa40d1ac':
  Add "Reset ShortcutManager throttling" to dev options
 2016-03-09 22:21:00 +00:00
Makoto Onuki
e263401610 Merge "Add "Reset ShortcutManager throttling" to dev options" into nyc-dev 2016-03-09 22:13:05 +00:00
Makoto Onuki
bdcce70572 Add "Reset ShortcutManager throttling" to dev options 
Bug 27325877

Change-Id: Ib11d670b38055801ce19aea9530ad69907c9bd8e
 2016-03-09 14:08:54 -08:00
Jason Monk
3bd9111998 Merge "Fix paddings to not affect SUW" into nyc-dev am: 1227394a0a 
am: 25a47cd233

* commit '25a47cd23325249f24c8812e0c0dced8404c01f0':
  Fix paddings to not affect SUW
 2016-03-09 22:04:51 +00:00
Jason Monk
25a47cd233 Merge "Fix paddings to not affect SUW" into nyc-dev 
am: 1227394a0a

* commit '1227394a0a480734ad64b1409c4c6dd4051daf98':
  Fix paddings to not affect SUW
 2016-03-09 22:00:20 +00:00
Jason Monk
1227394a0a Merge "Fix paddings to not affect SUW" into nyc-dev 2016-03-09 21:46:16 +00:00
Jason Monk
b1663158e4 Fix paddings to not affect SUW 
Bug: 27061886
Change-Id: I5f4b0d447a2d6c8ae06521250266f1af22e37d1b
 2016-03-09 16:20:31 -05:00
Udam Saini
c8787937f8 Removes duplicated checkbox and fixes text alignment. 
bug:27560337
bug:27534777
Change-Id: I2c4192dedcbcaec36f1bd5b507e984f7bf35b12e
 2016-03-09 12:22:07 -08:00
shwetachahar
793df3dad7 Merge "Add a pitch seekbar for TTS speech output." into nyc-dev am: 7acf807617 
am: ad4e32590e

* commit 'ad4e32590ed71130961dae2325d2f4f9ef57db3d':
  Add a pitch seekbar for TTS speech output.
 2016-03-09 19:00:08 +00:00
shwetachahar
ad4e32590e Merge "Add a pitch seekbar for TTS speech output." into nyc-dev 
am: 7acf807617

* commit '7acf8076179028f5ca97f0f1aa9ba12f0ea2b91a':
  Add a pitch seekbar for TTS speech output.
 2016-03-09 18:57:41 +00:00
Shweta Chahar
7acf807617 Merge "Add a pitch seekbar for TTS speech output." into nyc-dev 2016-03-09 18:46:32 +00:00
shwetachahar
4ac718b7b5 Add a pitch seekbar for TTS speech output. 
Bug: 27137452
Change-Id: I0992333822b4b1cd561dfa2501e47270ff4964b9
 2016-03-09 18:20:19 +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
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
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
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
8ef051e0f4 Import translations. DO NOT MERGE 
Change-Id: I24bd2bff7b3986a1b00841d36e9f316ce208163c
Auto-generated-cl: translation import
 2016-03-09 06:30:58 -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
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
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
3e912e7ea5 Notification summary updates. 
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
 2016-03-08 16:08:12 -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
Ruben Brunk
caab7e72cd Merge "Add settings VR listener service." into nyc-dev 
am: 31a3b770c7

* commit '31a3b770c7f50f9e7038759f189b33761301281d':
  Add settings VR listener service.
 2016-03-08 00:26:36 +00:00
Ruben Brunk
31a3b770c7 Merge "Add settings VR listener service." into nyc-dev 2016-03-08 00:14:56 +00:00
Adrian Roos
b426b627eb Merge "Fix SUW redaction interstitial crash" into nyc-dev am: bd705413ba 
am: d24f3d9fa9

* commit 'd24f3d9fa9b83f1890e996f6ca6a054410bf59dd':
  Fix SUW redaction interstitial crash
 2016-03-07 21:42:37 +00:00
Adrian Roos
d24f3d9fa9 Merge "Fix SUW redaction interstitial crash" into nyc-dev 
am: bd705413ba

* commit 'bd705413babe94c3382598217757d4b95d2dcc6a':
  Fix SUW redaction interstitial crash
 2016-03-07 21:40:29 +00:00
Adrian Roos
bd705413ba Merge "Fix SUW redaction interstitial crash" into nyc-dev 2016-03-07 20:50:05 +00:00
Adrian Roos
0128d6d28b Fix SUW redaction interstitial crash 
Bug: 27518157
Change-Id: Id0c2eae88db41080e35200ee8f94ee74ea0a9a1f
 2016-03-07 12:49:25 -08:00