PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,026 Commits 1 Branch 0 Tags
e692ec6a12e82fe11af7f7956089265a6090699c
Commit Graph

16026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ef353ea118 am 7a826fc9: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7a826fc99be1cfc299e3b7e86a4d739af639547d':
  Import translations. DO NOT MERGE
 2014-09-04 19:00:45 +00:00
Baligh Uddin
7a826fc99b am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '87c7cec8ea12dba610dcc4ccfe9896470e45f229':
  Import translations. DO NOT MERGE
 2014-09-04 18:50:09 +00:00
Baligh Uddin
19843ad15e am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '87c7cec8ea12dba610dcc4ccfe9896470e45f229':
  Import translations. DO NOT MERGE
 2014-09-04 18:49:53 +00:00
Andres Morales
3902c785b0 Fix issue with wifi passwords >16 chars 
Wasn't calculating their length in hex properly

Bug:17369745
Change-Id: I7652c10a2e0704877ad113fcbc04007845a862e3
 2014-09-04 11:42:53 -07:00
Baligh Uddin
87c7cec8ea Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 18:34:46 +00:00
Baligh Uddin
184a7b4fd3 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-04 18:34:44 +00:00
PauloftheWest
d5dc8b3567 am 8c5140c0: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit '8c5140c0abff4ab2c1002e998760e4a0ed0abb16':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:12:42 +00:00
PauloftheWest
d751cad9f7 am 86fa459e: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit '86fa459e98176039aa6417ec7b10f8ee8e4f0286':
  Fix the truncating of Bluetooth icons.
 2014-09-04 18:03:08 +00:00
PauloftheWest
357e2826e1 am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit '0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:02:06 +00:00
PauloftheWest
8c5140c0ab am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit '0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:00:57 +00:00
PauloftheWest
86fa459e98 am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
 2014-09-04 17:51:01 +00:00
PauloftheWest
0e73c521bd Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 2014-09-04 17:50:00 +00:00
PauloftheWest
0410a1e327 am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
 2014-09-04 17:49:48 +00:00
PauloftheWest
92de681ec3 Merge "Fix the truncating of Bluetooth icons." into lmp-dev 2014-09-04 17:34:17 +00:00
Fabrice Di Meglio
f52f4da309 am b876576a: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit 'b876576a4971b56b8dddb42ce37912e3ec68d821':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:26:12 +00:00
PauloftheWest
e32220eedc Material theme updates for Bluetooth Device picker. 
Bug: 17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
 2014-09-04 10:16:09 -07:00
Fabrice Di Meglio
b876576a49 am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit '5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:11:21 +00:00
Fabrice Di Meglio
e758df576a am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit '5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:10:59 +00:00
Fabrice Di Meglio
5a8a75d98b Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 2014-09-04 17:01:16 +00:00
Chris Wren
3d903185c7 Implement per-app sensitivity settings toggle. 
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
 2014-09-04 11:37:18 -04:00
PauloftheWest
a7aef13fbb Fix the truncating of Bluetooth icons. 
Bug: 17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
 2014-09-04 08:27:32 -07:00
Chris Wren
bd59090fa4 am 0388a7fa: am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit '0388a7fa5401af9a8ed736673096fd9bbc1f6481':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
 2014-09-04 14:08:02 +00:00
Chris Wren
0388a7fa54 am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit 'ee846f8828f9e2988e646af85da55f3d51c02f27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
 2014-09-04 13:57:36 +00:00
Chris Wren
dd95e098f4 am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit 'ee846f8828f9e2988e646af85da55f3d51c02f27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
 2014-09-04 13:57:30 +00:00
Chris Wren
a3dccd0c39 am 264e942c: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '264e942cc26fc7f1c5d56917fe5bbe75908f26ff':
  Implement per-app sensitivity settings toggle.
 2014-09-04 13:56:53 +00:00
Chris Wren
ee846f8828 missing dep. Revert "Implement per-app sensitivity settings toggle." 
This reverts commit 56131de741.

Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
 2014-09-04 15:49:58 +02:00
Chris Wren
264e942cc2 am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
  Implement per-app sensitivity settings toggle.
 2014-09-04 13:46:52 +00:00
Chris Wren
cec4064552 am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
  Implement per-app sensitivity settings toggle.
 2014-09-04 13:46:49 +00:00
Chris Wren
77fdc93bcd Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 13:40:04 +00:00
Dan Sandler
ed4aba0bb8 am bb7d22fb: am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev 
* commit 'bb7d22fb6eddf6206195fb10b75593f87ac96736':
  Don't block notifications from system packages.
 2014-09-04 13:36:06 +00:00
Dan Sandler
bb7d22fb6e am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev 
* commit 'feec34cec83b87f0c9e88b0d5883bd65170398bf':
  Don't block notifications from system packages.
 2014-09-04 13:25:56 +00:00
Dan Sandler
84176e5691 am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev 
* commit 'feec34cec83b87f0c9e88b0d5883bd65170398bf':
  Don't block notifications from system packages.
 2014-09-04 13:25:34 +00:00
Dan Sandler
feec34cec8 Merge "Don't block notifications from system packages." into lmp-dev 2014-09-04 13:15:48 +00:00
PauloftheWest
0564130d2d am 19ae38ad: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit '19ae38adf01e75f5d120042fb30df386ffabba9f':
  Aligned buttons on the Wi-Fi Assistant Card.
 2014-09-04 13:05:15 +00:00
Zoltan Szatmary-Ban
0fff8d13ed am c465867b: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit 'c465867bde16b7e1fe6c6d3e6d33031a266e6aea':
  Put VPN settings under primary profile control
 2014-09-04 12:55:57 +00:00
PauloftheWest
19ae38adf0 am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit 'e1a164bf9be2d32da3c6154eca14230677a49283':
  Aligned buttons on the Wi-Fi Assistant Card.
 2014-09-04 12:55:26 +00:00
PauloftheWest
75b8535f7d am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit 'e1a164bf9be2d32da3c6154eca14230677a49283':
  Aligned buttons on the Wi-Fi Assistant Card.
 2014-09-04 12:55:11 +00:00
PauloftheWest
e1a164bf9b Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 2014-09-04 12:50:04 +00:00
Zoltan Szatmary-Ban
c465867bde am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
 2014-09-04 12:45:17 +00:00
Zoltan Szatmary-Ban
34e537ed27 am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
 2014-09-04 12:45:09 +00:00
Zoltan Szatmary-Ban
c91d2cd082 Merge "Put VPN settings under primary profile control" into lmp-dev 2014-09-04 12:38:48 +00:00
Zoltan Szatmary-Ban
e7e84cd1e7 am 0635a3b9: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '0635a3b9dd3644ef8e96e4cf6c65adfb7bf8eeb4':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:16:20 +00:00
Zoltan Szatmary-Ban
0635a3b9dd am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '1e0ea452635fb3e8fbac733567489a38ee3ed635':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:06:15 +00:00
Zoltan Szatmary-Ban
4c035b8fe4 am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '1e0ea452635fb3e8fbac733567489a38ee3ed635':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:05:48 +00:00
Zoltan Szatmary-Ban
1e0ea45263 Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 2014-09-04 11:55:49 +00:00
Alexandra Gherghina
b062e32921 am 559308d8: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '559308d88c510e636064b366e8cae4bb18dd8757':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:45:51 +00:00
Alexandra Gherghina
c24310c963 am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:36:20 +00:00
Alexandra Gherghina
559308d88c am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:36:02 +00:00
Alexandra Gherghina
9dce0791f8 Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 2014-09-04 09:26:03 +00:00
Baligh Uddin
19083a188b Import translations. DO NOT MERGE 
Change-Id: I5685fd5d261351c45e47723d8167ab8293214aea
Auto-generated-cl: translation import
 2014-09-03 23:15:39 -07:00