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
Clara Bayarri
82fd6d8aa7 Merge "Move Profile Security Settings into Security Settings" into nyc-dev am: 9c299734bb 
am: 2ce79425b8

* commit '2ce79425b85e34015256499cab5717da66ce9ff2':
  Move Profile Security Settings into Security Settings
 2016-02-23 17:32:41 +00:00
Clara Bayarri
2ce79425b8 Merge "Move Profile Security Settings into Security Settings" into nyc-dev 
am: 9c299734bb

* commit '9c299734bbe0b1b4772f5967068079d255dc35d5':
  Move Profile Security Settings into Security Settings
 2016-02-23 17:28:12 +00:00
Clara Bayarri
9c299734bb Merge "Move Profile Security Settings into Security Settings" into nyc-dev 2016-02-23 17:25:08 +00:00
Daniel Sandler
72cef3db63 Merge "Enhanced notification details." into nyc-dev am: 712568cd15 
am: 54a644df34

* commit '54a644df34ff0652eafc89b70684ca3787e8bce1':
  Enhanced notification details.
 2016-02-23 15:52:23 +00:00
Daniel Sandler
54a644df34 Merge "Enhanced notification details." into nyc-dev 
am: 712568cd15

* commit '712568cd151158a989e5c75b13ac11d1e53901dc':
  Enhanced notification details.
 2016-02-23 15:48:53 +00:00
Daniel Sandler
712568cd15 Merge "Enhanced notification details." into nyc-dev 2016-02-23 15:44:41 +00:00
Wale Ogunwale
781a2d9741 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev am: 0b485bb523 
am: b075a4b699

* commit 'b075a4b6997121bc4f1e75aa9b519ff426b855b8':
  Revert "Add developer option for freeform window support (2/2)"
 2016-02-23 02:45:43 +00:00
Wale Ogunwale
b075a4b699 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev 
am: 0b485bb523

* commit '0b485bb5233057507d01e4baa02f6ede72ed3306':
  Revert "Add developer option for freeform window support (2/2)"
 2016-02-23 02:38:56 +00:00
Wale Ogunwale
0b485bb523 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev 2016-02-23 02:27:14 +00:00
Clara Bayarri
52681ece04 Move Profile Security Settings into Security Settings 
UX requested that we have the settings directly in Security instead
of having a separate screen as implemented previously.

Bug: 26806582
Change-Id: I55c44848621498afe63d3207a52c974c58f9eb78
 2016-02-22 16:56:50 -08:00
Udam Saini
682b57f328 Merge "Fixes talkback accessibility on learn more link." into nyc-dev am: 1004769135 
am: 37af49083b

* commit '37af49083bad4e2b19c7e1424beef1b5b25613e0':
  Fixes talkback accessibility on learn more link.
 2016-02-23 00:27:34 +00:00
Udam Saini
37af49083b Merge "Fixes talkback accessibility on learn more link." into nyc-dev 
am: 1004769135

* commit '1004769135507b26c6a626af1ca1da9cfc1e811d':
  Fixes talkback accessibility on learn more link.
 2016-02-23 00:20:16 +00:00
Udam Saini
1004769135 Merge "Fixes talkback accessibility on learn more link." into nyc-dev 2016-02-23 00:10:40 +00:00
Wale Ogunwale
a48c78ccfc Revert "Add developer option for freeform window support (2/2)" 
This reverts commit 292b9fd2da.

Will add back later and limit to non-user builds.

Bug: 27295415
Bug: 25276672
Bug: 24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
 2016-02-22 15:41:43 -08:00
Udam Saini
b64427ce07 Merge "Moves the encryption interstitial to use the list layout" into nyc-dev am: 511107c09b 
am: 9b58982210

* commit '9b5898221082e72bd95dceb87311e8fdce437a51':
  Moves the encryption interstitial to use the list layout
 2016-02-22 21:45:07 +00:00
Udam Saini
9b58982210 Merge "Moves the encryption interstitial to use the list layout" into nyc-dev 
am: 511107c09b

* commit '511107c09ba5daf5e674e278ea0d143360b5e449':
  Moves the encryption interstitial to use the list layout
 2016-02-22 21:37:59 +00:00
Udam Saini
511107c09b Merge "Moves the encryption interstitial to use the list layout" into nyc-dev 2016-02-22 21:29:30 +00:00
Alan Viverette
f393c865d7 Merge "Remove night mode from developer settings" into nyc-dev am: f4ace6fe91 
am: 4a24fb99e9

* commit '4a24fb99e96d0be2c229368bd31c93532cb3b0b3':
  Remove night mode from developer settings
 2016-02-22 21:05:32 +00:00
Chris Tate
85e27a8519 Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev am: 7893931a50 
am: 9854ee56e7

* commit '9854ee56e7db609bc1a39df608f8baa6565dc5d0':
  Text: "...and other URLs" rather than "...and related URLs"
 2016-02-22 21:05:20 +00:00
Jason Monk
917b4f57f5 Merge "Fix wallpaper prefs being too tall" into nyc-dev am: 3795d708ce 
am: 02736d1bf2

* commit '02736d1bf2fd53fa7804a88fa5b79aabd03f07dc':
  Fix wallpaper prefs being too tall
 2016-02-22 21:04:55 +00:00
Alan Viverette
4a24fb99e9 Merge "Remove night mode from developer settings" into nyc-dev 
am: f4ace6fe91

* commit 'f4ace6fe91726665715312b0b0ec22a4ba360b61':
  Remove night mode from developer settings
 2016-02-22 20:47:33 +00:00
Chris Tate
9854ee56e7 Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev 
am: 7893931a50

* commit '7893931a505921f700a85bd2668f041d7d86bf1a':
  Text: "...and other URLs" rather than "...and related URLs"
 2016-02-22 20:47:15 +00:00
Alan Viverette
f4ace6fe91 Merge "Remove night mode from developer settings" into nyc-dev 2016-02-22 20:44:00 +00:00
Christopher Tate
0119225372 Text: "...and other URLs" rather than "...and related URLs" 
Bug 26692609

Change-Id: Ibb4f44950f03d66df161aee2e0661b9db57b031f
 2016-02-22 12:30:33 -08:00
Jason Monk
02736d1bf2 Merge "Fix wallpaper prefs being too tall" into nyc-dev 
am: 3795d708ce

* commit '3795d708ce8a6898ef75f5e601f39b34840d80e8':
  Fix wallpaper prefs being too tall
 2016-02-22 20:29:16 +00:00
Jason Monk
3795d708ce Merge "Fix wallpaper prefs being too tall" into nyc-dev 2016-02-22 20:22:37 +00:00
Jason Monk
8d6350385d Fix wallpaper prefs being too tall 
Change-Id: Iddb45c77eb5014a596e9f94e3a2a9065165b2711
 2016-02-22 15:21:45 -05:00
Alan Viverette
686f984384 Remove night mode from developer settings 
It's in SysUI Tuner now.

Change-Id: If1c248bfaa964b4f37155619a4c54f836d33e468
 2016-02-22 13:47:50 -05:00
Geoff Mendal
eb358c233b Merge "Import translations. DO NOT MERGE" 2016-02-22 18:13:49 +00:00
Dan Sandler
7a038ebb1c Enhanced notification details. 
Bug: 26919636
Change-Id: I378dc088a6b51e3b33607937c3a12e8d51a97e5e
 2016-02-22 12:52:38 -05:00
Geoff Mendal
7f987c75a0 Import translations. DO NOT MERGE 
Change-Id: I50559a9a46ebcc59a6b8476b113f6323f84ed1a9
Auto-generated-cl: translation import
 2016-02-22 07:46:55 -08:00
Julia Reynolds
571d443927 Merge "Delete topics." into nyc-dev am: 778957cfac 
am: 5c34618128

* commit '5c34618128be2fec3d8db36963f9475131adac8b':
  Delete topics.
 2016-02-22 15:43:53 +00:00
Julia Reynolds
5c34618128 Merge "Delete topics." into nyc-dev 
am: 778957cfac

* commit '778957cfaca203fffa7e7eb7f891b9661d50d216':
  Delete topics.
 2016-02-22 15:37:24 +00:00
Geoff Mendal
0cb45a495e Import translations. DO NOT MERGE 
Change-Id: I91a9aabb3a7378e68234fa42fb5ffdb999c8235e
Auto-generated-cl: translation import
 2016-02-22 07:32:39 -08:00
Julia Reynolds
778957cfac Merge "Delete topics." into nyc-dev 2016-02-22 15:23:45 +00:00
Julia Reynolds
fefcdbed42 Delete topics. 
Bug: 23220370
Change-Id: Ib1bc26183f00685b6547d5ffe37ce149c31fe153
 2016-02-22 10:20:01 -05:00
Geoff Mendal
9858b225d8 Merge "Revert "Import translations. DO NOT MERGE"" 2016-02-22 15:11:02 +00:00
Geoff Mendal
31843625d3 Revert "Import translations. DO NOT MERGE" 
This reverts commit 6c223f1d13.

Change-Id: I958bfa40029b0e0a05cdaba8fa4ad050f574407a
 2016-02-22 15:07:22 +00:00
Jason Monk
2078bcc27c Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev am: 4062c3932e 
am: 25f0ca889d

* commit '25f0ca889d930731521fb756b2dd5c9d8cf5f764':
  Convert data usage warning/limit to a edit text + dropdown
 2016-02-22 15:06:04 +00:00
Jason Monk
25f0ca889d Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev 
am: 4062c3932e

* commit '4062c3932e356ebd01ed64ecc1dc6d723f32857f':
  Convert data usage warning/limit to a edit text + dropdown
 2016-02-22 14:59:47 +00:00
Geoff Mendal
6c223f1d13 Import translations. DO NOT MERGE 
Change-Id: I4beb7718801e8c5451db86d8f1fff952c7c1e393
Auto-generated-cl: translation import
 2016-02-22 06:27:10 -08:00
Jason Monk
e4897d939b Convert data usage warning/limit to a edit text + dropdown 
Now choose between MB and GB, then type in the number for the limit.

Bug: 27238018
Change-Id: I049be2be3ded52a9ed87e57348ed87b82dbb819c
 2016-02-21 11:39:42 -05:00
Udam Saini
d553abcb4c Moves the encryption interstitial to use the list layout 
bug:27206957
Change-Id: Ib577440a2696539f44021bb4ba0100e9f1699c6c
 2016-02-19 16:28:34 -08:00
Maurice Lam
e6e5031533 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev am: 9a6aaebc74 
am: 059c0f6e84

* commit '059c0f6e84c0c4223a145e69a28caa717b0e0be6':
  Revert "Revert "Use SetupWizardPreferenceLayout""
 2016-02-19 22:19:43 +00:00
Maurice Lam
059c0f6e84 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev 
am: 9a6aaebc74

* commit '9a6aaebc74f6e88eec2a220f01331d9e32ba9448':
  Revert "Revert "Use SetupWizardPreferenceLayout""
 2016-02-19 22:13:34 +00:00
Maurice Lam
9a6aaebc74 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev 2016-02-19 22:03:41 +00:00
Jason Monk
5f07334b38 Merge "Rename storage and usb to just storage" into nyc-dev am: 6348dac543 
am: 087624719b

* commit '087624719b3244e50a5891c30ba909c40b4406bd':
  Rename storage and usb to just storage
 2016-02-19 21:38:54 +00:00
Jason Monk
087624719b Merge "Rename storage and usb to just storage" into nyc-dev 
am: 6348dac543

* commit '6348dac5436f7d9aa2f54af7a2c077004870bee1':
  Rename storage and usb to just storage
 2016-02-19 21:33:51 +00:00
Jason Monk
6348dac543 Merge "Rename storage and usb to just storage" into nyc-dev 2016-02-19 21:26:00 +00:00
Sudheer Shanka
a9f39671ea Add disabled by policy empty views to more screens. am: 7dbbe13168 
am: dd2210f01c

* commit 'dd2210f01c58d5da7b222f9906af7142517e9019':
  Add disabled by policy empty views to more screens.
 2016-02-19 20:37:47 +00:00