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

25855 Commits

This Branch
This Branch
All Branches
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
Joe Onorato
3c4e1d6943 Merge "Add method to BatteryStats" into nyc-dev am: 3dbfe1439b 
am: c97e14e679

* commit 'c97e14e679b8b5f8b502e205725ec8efaf534bab':
  Add method to BatteryStats
 2016-03-10 01:03:57 +00:00
Joe Onorato
c97e14e679 Merge "Add method to BatteryStats" into nyc-dev 
am: 3dbfe1439b

* commit '3dbfe1439b34c8ddac32b153bc7bb0f7ebad4f37':
  Add method to BatteryStats
 2016-03-10 01:00:10 +00:00
Joe Onorato
3dbfe1439b Merge "Add method to BatteryStats" into nyc-dev 2016-03-10 00:52:04 +00: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
Joe Onorato
f10a422b54 Add method to BatteryStats 
Change-Id: Ie05a1ff4ea081bed1777882d3ec6fd84fc5ba98f
 2016-03-09 15:27:29 -08: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
Sanket Padawe
4ff9b2c3fa Merge "Support material design for Radio band menu" into nyc-dev am: 0792e2f4ad 
am: 80654814cc

* commit '80654814ccdaa4cb9c193e88d543bfab6b30faa1':
  Support material design for Radio band menu
 2016-03-09 19:31:52 +00:00
Sanket Padawe
80654814cc Merge "Support material design for Radio band menu" into nyc-dev 
am: 0792e2f4ad

* commit '0792e2f4adeb0950932041520ffe173d54982991':
  Support material design for Radio band menu
 2016-03-09 19:28:27 +00:00
Sanket Padawe
0792e2f4ad Merge "Support material design for Radio band menu" into nyc-dev 2016-03-09 19:19:58 +00:00
Sanket Padawe
cf9a07bd20 Support material design for Radio band menu 
Bug: 24892294
Change-Id: I56c8c29165ce88cef2791d89e20ac0cc3249bbb2
 2016-03-09 11:16:23 -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
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