PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,322 Commits 1 Branch 0 Tags
0003b29cdac5c7294ce5d2852e2a8121b7e09cfc
Commit Graph

15322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
6dded22257 am e15902d6: am 4325f808: Update NFC to use a SwitchPreference 
* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
  Update NFC to use a SwitchPreference
 2014-08-15 21:42:46 +00:00
Fabrice Di Meglio
e15902d617 am 4325f808: Update NFC to use a SwitchPreference 
* commit '4325f8080888bd3b15246f5bbd9db878aced030c':
  Update NFC to use a SwitchPreference
 2014-08-15 21:37:24 +00:00
Fabrice Di Meglio
4325f80808 Update NFC to use a SwitchPreference 
- do the switch

See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
 2014-08-15 14:28:04 -07:00
Jim Miller
23c76e38ef Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev 2014-08-15 21:23:40 +00:00
Jim Miller
6a0c89743c Remove temporary workaround for GMS TrustAgent while API changed. 
Fixes bug 16401527

Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
 2014-08-15 14:30:01 -07:00
Baligh Uddin
b3b647054e Import translations. DO NOT MERGE 
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
 2014-08-15 14:21:56 -07:00
Glenn Kasten
d0ec634c74 am e89abcc8: am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev 
* commit 'e89abcc8e88bec69e37f11fa051b9b299246a0f3':
  Increase character limit for translation
 2014-08-15 21:17:31 +00:00
arete
e20063fc33 am 4595b470: am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog. 
* commit '4595b470d37a3152d6f76488414e58da3ad516a4':
  Keep SwitchPreference status until user makes choice in confirmation dialog.
 2014-08-15 21:17:29 +00:00
Fabrice Di Meglio
c33bac8254 am 880de9f2: am e3bced2c: Update Airplane mode to use a SwitchPreference 
* commit '880de9f2edd81e1ad09158f07893374053210778':
  Update Airplane mode to use a SwitchPreference
 2014-08-15 21:17:08 +00:00
Maurice Lam
e72e44d099 am 03ec9ff4: am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev 
* commit '03ec9ff4395ea2275e54e40f6ecdaa2721cf26e9':
  [WifiSetup] Use framework AutoMirrored
 2014-08-15 21:17:07 +00:00
Julia Reynolds
9d20b0c089 am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev 
* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
  Disable disable button according to user restrictions.
 2014-08-15 21:16:59 +00:00
Glenn Kasten
e89abcc8e8 am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev 
* commit '2be2a8a47f5ef585301479268752aa3d7d3a9261':
  Increase character limit for translation
 2014-08-15 21:07:10 +00:00
Fabrice Di Meglio
1c6d540646 am 1b1f3d59: am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 
* commit '1b1f3d5949a68967e5cc405d5aed1c357ecb0aa0':
  Fix bug #16703191 APN settings shows back button even when you intent into it
 2014-08-15 20:59:21 +00:00
arete
4595b470d3 am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog. 
* commit '300e920f66c03b390ce738ccf4d4646ffa039d40':
  Keep SwitchPreference status until user makes choice in confirmation dialog.
 2014-08-15 20:56:44 +00:00
arete
300e920f66 Keep SwitchPreference status until user makes choice in confirmation dialog. 
Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
 2014-08-15 20:49:44 +00:00
Fabrice Di Meglio
880de9f2ed am e3bced2c: Update Airplane mode to use a SwitchPreference 
* commit 'e3bced2cdaf70812f658c45c170e4943ed79dfaf':
  Update Airplane mode to use a SwitchPreference
 2014-08-15 20:45:12 +00:00
Maurice Lam
03ec9ff439 am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev 
* commit 'cd93d141302ee374285d5a8dcd97bc7ab61298cc':
  [WifiSetup] Use framework AutoMirrored
 2014-08-15 20:36:35 +00:00
Fabrice Di Meglio
e3bced2cda Update Airplane mode to use a SwitchPreference 
- do the switch

See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
 2014-08-15 20:36:29 +00:00
Julia Reynolds
eb0d3b7cd0 am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev 
* commit 'fad2b09db8cf65478db35f9a8265c948ccffeabc':
  Disable disable button according to user restrictions.
 2014-08-15 20:23:20 +00:00
Julia Reynolds
fad2b09db8 Merge "Disable disable button according to user restrictions." into lmp-dev 2014-08-15 19:14:43 +00:00
Glenn Kasten
2be2a8a47f Merge "Increase character limit for translation" into lmp-dev 2014-08-15 18:56:10 +00:00
Glenn Kasten
042a9a0bab Increase character limit for translation 
Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
 2014-08-15 13:24:45 -07:00
Maurice Lam
cd93d14130 Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev 2014-08-15 18:50:14 +00:00
Maurice Lam
8d449a0e36 [WifiSetup] Use framework AutoMirrored 
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.

Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
 2014-08-15 12:54:33 -07:00
Fabrice Di Meglio
1b1f3d5949 am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 
* commit '0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
  Fix bug #16703191 APN settings shows back button even when you intent into it
 2014-08-15 18:46:56 +00:00
John Spurlock
95ab4a537f am 9c979df2: am a7f8addd: Settings: Update to follow NotificationManager aidl change. 
* commit '9c979df2d6a768e909b546dc198f005c17ebeeab':
  Settings: Update to follow NotificationManager aidl change.
 2014-08-15 15:21:49 +00:00
John Spurlock
9c979df2d6 am a7f8addd: Settings: Update to follow NotificationManager aidl change. 
* commit 'a7f8addd0982f599105aeb9611477b149860db83':
  Settings: Update to follow NotificationManager aidl change.
 2014-08-15 15:16:15 +00:00
John Spurlock
a7f8addd09 Settings: Update to follow NotificationManager aidl change. 
Depends on frameworks/base:
  I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7

Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
 2014-08-15 15:06:43 +00:00
Baligh Uddin
5173ab2802 am e403e32a: (-s ours) am 86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e403e32afbfb2db4fcbb32819d7323a8374ed5f8':
  Import translations. DO NOT MERGE
 2014-08-15 11:50:34 +00:00
Maurice Lam
a604bf2385 am 2d57c470: am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit '2d57c4705d73f37e0c7c1b96cc9e1288e4c17306':
  [WifiSetup] Update illustrations
 2014-08-15 11:50:00 +00:00
Jim Miller
23174fc812 am adf93411: am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit 'adf9341125fac14aef7beb272f6371a6aafb4aa3':
  API review - move confirm credential constants from Intent
 2014-08-15 11:49:21 +00:00
Selim Gurun
ce0f007864 am 63b671c8: am ce8d3910: Remove logic to read the key from GServices 
* commit '63b671c84b48703bbc2d554fa378b8c1e853e19c':
  Remove logic to read the key from GServices
 2014-08-15 11:48:32 +00:00
arete
4db6a46ef8 am f1fd6937: am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit 'f1fd693751d73b51e5cdf6a71dccca3884ee125f':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-15 11:36:57 +00:00
Adam Powell
872e957516 am 7660042f: am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit '7660042fa2f5423b9e5d156db0d063e9ffed0fe3':
  Use material alert dialog item view layout
 2014-08-15 11:35:36 +00:00
arete
b2bc75dc50 am 943a1877: am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit '943a1877e6636d6986eadbf7d699356b085c469e':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-15 11:35:30 +00:00
Fabrice Di Meglio
737fc5ec9e am 0147d813: am d83b3c2a: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit '0147d813edb6befc8a1728accc54a70ebcc6bc3d':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:33:21 +00:00
Baligh Uddin
e403e32afb am 86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '86370f5dfd3f78e80b9940c31d73975a46080964':
  Import translations. DO NOT MERGE
 2014-08-15 05:52:16 +00:00
Baligh Uddin
86370f5dfd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-15 04:38:54 +00:00
Fabrice Di Meglio
0ff107e384 Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 2014-08-15 04:37:53 +00:00
Fabrice Di Meglio
61a1fec49f Fix bug #16703191 APN settings shows back button even when you intent into it 
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment

Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
 2014-08-15 11:36:31 -07:00
Maurice Lam
2d57c4705d am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit '3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
  [WifiSetup] Update illustrations
 2014-08-15 02:55:34 +00:00
Jim Miller
adf9341125 am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit 'bbce34d9be421effb055fbf1a945ec49dfeef02d':
  API review - move confirm credential constants from Intent
 2014-08-15 01:37:29 +00:00
Selim Gurun
63b671c84b am ce8d3910: Remove logic to read the key from GServices 
* commit 'ce8d39103f51eb418cad61ee3e0a80445307e46a':
  Remove logic to read the key from GServices
 2014-08-15 00:08:38 +00:00
PauloftheWest
8542d9d27f am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit 'fd002cf07972b29e4ad5980ec12891b7200b8e91':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:34:44 +00:00
Zoltan Szatmary-Ban
308bad0e16 am 327a50e5: am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '327a50e5c01eed62d86187457a206293fb199614':
  Fix app icons on some Settings screens
 2014-08-14 23:34:18 +00:00
Selim Gurun
ce8d39103f Remove logic to read the key from GServices 
Bug: 12492817

The key is now stored in webview apk so remove the logic
to read from GServices.

Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
 2014-08-14 15:44:45 -07:00
arete
f1fd693751 am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit '17224826f896278de0805e6a2fec321701bbb83d':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-14 21:52:22 +00:00
arete
17224826f8 Cannot cancel in the "Warn app installation" dialog in security settings. 
Bug: 16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
 2014-08-14 21:45:04 +00:00
Adam Powell
7660042fa2 am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit 'aa772c9521529d6235aa7be0fb81e75a334c4b82':
  Use material alert dialog item view layout
 2014-08-14 20:29:17 +00:00
arete
943a1877e6 am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit 'ce543836cea5887484026837f0a4181dca04a733':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-14 20:24:39 +00:00