PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,843 Commits 1 Branch 0 Tags
d27fab15103117ab838aeb1c0eb488a013eeaa83
Commit Graph

27843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
cf1a4b118c Import translations. DO NOT MERGE 
am: 0cb45a495e  -s ours

* commit '0cb45a495e0ea24bd03a4f95f076c130ce46c4f1':
  Import translations. DO NOT MERGE
 2016-02-22 16:26:40 +00: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
Jason Monk
b7e05e4420 Merge "Fix background data setting being backwords" into nyc-dev am: 60df76b169 
am: ea174fd1c7

* commit 'ea174fd1c7c73c22561bcadfe07e752db1aaabea':
  Fix background data setting being backwords
 2016-02-22 15:18:00 +00:00
Jason Monk
ea174fd1c7 Merge "Fix background data setting being backwords" into nyc-dev 
am: 60df76b169

* commit '60df76b169c7d341130265a99a23bbfa63934f9c':
  Fix background data setting being backwords
 2016-02-22 15:11:52 +00: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
60df76b169 Merge "Fix background data setting being backwords" into nyc-dev 2016-02-22 15:04:46 +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
Jason Monk
4062c3932e Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev 2016-02-22 14:57:51 +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
Gustav Sennton
f2f4de4f25 Merge "Don\'t show disabled packages in the WebView implementation Dev setting." into nyc-dev am: b2e8d34359 
am: 5aa4d7b67e

* commit '5aa4d7b67ea1ed5a4dc4383a63744428fec9bde1':
  Don't show disabled packages in the WebView implementation Dev setting.
 2016-02-22 10:16:39 +00:00
Gustav Sennton
5aa4d7b67e Merge "Don\'t show disabled packages in the WebView implementation Dev setting." into nyc-dev 
am: b2e8d34359

* commit 'b2e8d34359f8272f8214d16b09288505e2570d10':
  Don't show disabled packages in the WebView implementation Dev setting.
 2016-02-22 10:12:35 +00:00
Gustav Sennton
b2e8d34359 Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev 2016-02-22 10:10:13 +00:00
Jason Monk
bd5eabe12e Fix background data setting being backwords 
Bug: 27250166
Change-Id: Ia8ef4b0ab860e6c15d972a32c7918b2d54f7743b
 2016-02-21 11:53:36 -05: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
Jason Monk
0bed06f35c Add generic logging to Settings switch bar am: e4ebcd12be 
am: f6d69edaf5

* commit 'f6d69edaf50eb9b2daf28ce86e8c5926338d21ad':
  Add generic logging to Settings switch bar
 2016-02-21 14:44:35 +00:00
Jason Monk
f6d69edaf5 Add generic logging to Settings switch bar 
am: e4ebcd12be

* commit 'e4ebcd12be7baae58a1fabcda6c7544c911c95eb':
  Add generic logging to Settings switch bar
 2016-02-21 14:41:36 +00:00
Jason Monk
e4ebcd12be Add generic logging to Settings switch bar 
Same usage/format as the shared preference logging.

Bug: 27043208
Change-Id: I7a7a5c0a9c92ec6cef50df58313016218cf2f2f7
 2016-02-21 09:37:41 -05:00
Samuel Tan
741e65fdff WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c am: 18d9865388 
am: 688a34defe

* commit '688a34defeccef03cd19a402994bc622a3ce4200':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 01:11:35 +00: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
Samuel Tan
688a34defe WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c 
am: 18d9865388

* commit '18d98653883d4d28f8700588c3f4aad91f47411e':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 00:23:46 +00:00
Samuel Tan
18d9865388 WifiConfigController: set ca_path and ca_cert to null if unused 
am: d147f0090c

* commit 'd147f0090ce28e1ad70f7a9b582dec91161139e8':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 00:12:03 +00: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
Jason Monk
b918d97d5d Rename storage and usb to just storage 
Bug: 23840185
Change-Id: If0ea6be5a43b8aea1b49c46f3f95a92bef05aaf7
 2016-02-19 15:32:33 -05:00
Sudheer Shanka
dd2210f01c Add disabled by policy empty views to more screens. 
am: 7dbbe13168

* commit '7dbbe131683c231f6820bca4d67853649a4836f8':
  Add disabled by policy empty views to more screens.
 2016-02-19 20:30:02 +00:00
Sudheer Shanka
7dbbe13168 Add disabled by policy empty views to more screens. 
Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
 2016-02-19 20:18:43 +00:00
Sudheer Shanka
695c0b3055 Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 5d8e963c83 
am: 2c72056df2

* commit '2c72056df2830045dffa8c0969bc7aacc6b915ae':
  Part3 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:44:33 +00:00
Sudheer Shanka
429f959ef2 Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 1b59691855 
am: 0a685538fc

* commit '0a685538fc91c86f8b37f26ccea27743f58525b6':
  Part2 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:44:20 +00:00
Sudheer Shanka
2c72056df2 Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev 
am: 5d8e963c83

* commit '5d8e963c83fd9198cb66e7fc745f9ff2a1919c44':
  Part3 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:39:21 +00:00
Sudheer Shanka
0a685538fc Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev 
am: 1b59691855

* commit '1b596918554489e4c656d244ce1feed44b53b8a8':
  Part2 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:39:05 +00:00
Julia Reynolds
2a18cc3a5f Merge "Delete Notification Topics." into nyc-dev am: 929c97e6ac 
am: 7c9b814d4a

* commit '7c9b814d4afdb340f6fd56b9c493d1731560b837':
  Delete Notification Topics.
 2016-02-19 19:34:39 +00:00
Sudheer Shanka
5d8e963c83 Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Sudheer Shanka
1b59691855 Merge "Part2 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Julia Reynolds
7c9b814d4a Merge "Delete Notification Topics." into nyc-dev 
am: 929c97e6ac

* commit '929c97e6acf725df87456ad053ee47df47c921aa':
  Delete Notification Topics.
 2016-02-19 19:26:59 +00:00
Sudheer Shanka
29737ad910 Part2 - Don't add padlock if the restriction is not set by admin. 
Bug: 26687435
Change-Id: I85ef42e1ff1216791d1393a975e8559191b3781f
 2016-02-19 19:24:34 +00:00
Julia Reynolds
929c97e6ac Merge "Delete Notification Topics." into nyc-dev 2016-02-19 19:17:24 +00:00
Sudheer Shanka
34de47bd37 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev am: 69c5f2a10f 
am: 305b6b8741

* commit '305b6b87410ed45bc1c88e0ee13e52da2d82b2a3':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
 2016-02-19 19:08:33 +00:00
Sudheer Shanka
305b6b8741 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev 
am: 69c5f2a10f

* commit '69c5f2a10f5ae522557f5a36982daa41da77a122':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
 2016-02-19 19:03:28 +00:00