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

15797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b1e48a531d am 4cd344c7: (-s ours) am 1bed70f0: (-s ours) am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4cd344c72fcf2e97dc5e8b4598fc89f1178e4e09':
  Import translations. DO NOT MERGE
 2014-08-27 17:07:44 +00:00
Baligh Uddin
4cd344c72f am 1bed70f0: (-s ours) am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1bed70f0ea2ed3de38be656f5f6bcf7bf64377d9':
  Import translations. DO NOT MERGE
 2014-08-27 16:43:49 +00:00
Baligh Uddin
1bed70f0ea am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '29b5ef288a77b70b006cd1d3e6cd5738a67d6092':
  Import translations. DO NOT MERGE
 2014-08-27 16:33:40 +00:00
Baligh Uddin
29b5ef288a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:23:20 +00:00
Baligh Uddin
c1fcd57eed Merge "Import translations. DO NOT MERGE" 2014-08-27 16:23:04 +00:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE 
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
 2014-08-26 21:00:49 -07:00
Baligh Uddin
a34ecf41b8 Import translations. DO NOT MERGE 
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
 2014-08-26 20:49:33 -07:00
Sander Alewijnse
76683efa80 am 1f7c91d6: am fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit '1f7c91d61fd4b1d4a9963baa305b9c4040dd7681':
  Add extra to home settings starting intent.
 2014-08-26 17:23:50 +00:00
Sander Alewijnse
1f7c91d61f am fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit 'fbda0b3a81fe35060bbcd9ec121af08d935c07e8':
  Add extra to home settings starting intent.
 2014-08-26 17:14:15 +00:00
Sander Alewijnse
fbda0b3a81 am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit '320dc05125c0db44c1182c4f5568bef440f643c8':
  Add extra to home settings starting intent.
 2014-08-26 17:07:18 +00:00
Sander Alewijnse
320dc05125 Merge "Add extra to home settings starting intent." into lmp-dev 2014-08-26 16:59:24 +00:00
Alan Viverette
1d439572ec am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors
 2014-08-26 10:17:17 +00:00
Amith Yamasani
6ef47af07d am 0f30cbed: am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit '0f30cbed1a36c69b368869ec8178e6645973c9b3':
  Fix toggle button clickability in app restrictions
 2014-08-26 10:17:16 +00:00
Nancy Chen
cf4ef465fd am 791b4ad3: am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit '791b4ad3869a9de4350bb4f61bdc590b946da988':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-26 10:17:15 +00:00
Paul Lawrence
531ed5848b am 64988f9a: am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit '64988f9a5022a3e0458416cc829fbdec267b5edd':
  Honor hide pattern on crypto screen
 2014-08-26 10:17:15 +00:00
Alan Viverette
f6faa4d292 am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'ea7c8dcbdaa7f32d6741125c6701a0a1824a0567':
  Update material colors
 2014-08-26 04:56:08 +00:00
Amith Yamasani
0f30cbed1a am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit '19bcfd6e4380d63521daf74d5bf81a2f849ace40':
  Fix toggle button clickability in app restrictions
 2014-08-26 04:56:07 +00:00
Nancy Chen
791b4ad386 am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit '64e686570c6f71bae6d2bec0c1b72f7732e48a7b':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-26 04:55:35 +00:00
Paul Lawrence
64988f9a50 am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ef0a4938a01f4d553d7513df33fa097c56543b7e':
  Honor hide pattern on crypto screen
 2014-08-26 04:54:05 +00:00
Alan Viverette
ea7c8dcbda am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors
 2014-08-25 23:29:01 +00:00
Amith Yamasani
19bcfd6e43 am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit 'e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
  Fix toggle button clickability in app restrictions
 2014-08-25 23:29:00 +00:00
Alan Viverette
c61aabfa22 Merge "Update material colors" into lmp-dev 2014-08-25 23:18:34 +00:00
Amith Yamasani
e352845eca Merge "Fix toggle button clickability in app restrictions" into lmp-dev 2014-08-25 23:18:33 +00:00
Alan Viverette
4895df355a Update material colors 
BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
 2014-08-25 16:05:50 -07:00
Nancy Chen
64e686570c am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit 'a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-25 22:47:23 +00:00
Nancy Chen
a1ca4ed14d Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 2014-08-25 22:24:15 +00:00
Amith Yamasani
3391321e2f Fix toggle button clickability in app restrictions 
Also fix side padding

Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
 2014-08-25 15:20:34 -07:00
Paul Lawrence
ef0a4938a0 am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
  Honor hide pattern on crypto screen
 2014-08-25 22:09:41 +00:00
Paul Lawrence
ee2a85c7c8 Merge "Honor hide pattern on crypto screen" into lmp-dev 2014-08-25 21:59:27 +00:00
PauloftheWest
3aeb60dc58 am 687d3a58: am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '687d3a589ea6a9a259454ea7e139143d4d988f91':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:18:52 +00:00
PauloftheWest
687d3a589e am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '87d8074a1480d10804ada3507c5536be362b77c1':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:04:47 +00:00
Baligh Uddin
274ca40fd0 am 0a0a0966: (-s ours) am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0a0a0966de99949bbacc8064563714670369bfa2':
  Import translations. DO NOT MERGE
 2014-08-25 16:58:32 +00:00
PauloftheWest
87d8074a14 am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 16:55:21 +00:00
Baligh Uddin
0a0a0966de am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd9960178fda7184223cbc56c5dc11128ab1124b0':
  Import translations. DO NOT MERGE
 2014-08-25 16:51:07 +00:00
PauloftheWest
aa5c7565e4 Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 2014-08-25 16:44:25 +00:00
Baligh Uddin
d9960178fd am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
  Import translations. DO NOT MERGE
 2014-08-25 16:32:55 +00:00
Baligh Uddin
cef6b220d6 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:21:03 +00:00
PauloftheWest
a39ccf6bdb am 79ad7235: am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '79ad7235257bf6e6f04cc4f8f594176c938dc3a0':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 16:19:10 +00:00
PauloftheWest
79ad723525 am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 16:12:08 +00:00
PauloftheWest
1c649f7f9b am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 15:58:29 +00:00
PauloftheWest
7560e22d76 Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 2014-08-25 15:48:16 +00:00
PauloftheWest
656c88cb71 Updated Tethering and portable hotspot to use switches. 
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
 2014-08-25 08:45:05 -07:00
PauloftheWest
893be9cc34 Tapping a connected Bluetooth device now presents its settings dialog. 
Bug: 14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
 2014-08-25 15:40:56 +00:00
Dianne Hackborn
6a6d1d7ee5 am 6d98f8e1: am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit '6d98f8e1cbe23348c43a981d37d6b75fcfe99867':
  Tweak voice settings strings.
 2014-08-25 08:25:08 +00:00
Amith Yamasani
b5ba4afdca am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit 'cb7b83de42b13b55030f5d0207f42fcc9e346968':
  Don't index the ChooseLockGeneric screen
 2014-08-25 08:24:10 +00:00
Jeff Davidson
7cd216144e am 76747ff8: am fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '76747ff8f5bb7981cc3a542095142e59fd72fd00':
  Restore legacy VPN stats dialog.
 2014-08-25 08:23:15 +00:00
Baligh Uddin
aea96bdfb0 Import translations. DO NOT MERGE 
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
 2014-08-24 13:07:11 -07:00
Dianne Hackborn
6d98f8e1cb am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit 'b1391d84fe181e64f486cd176d58d835b0fe6a5e':
  Tweak voice settings strings.
 2014-08-24 19:09:24 +00:00
Dianne Hackborn
b1391d84fe am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit 'c436b159534240c64281447860a81e519bf7c07d':
  Tweak voice settings strings.
 2014-08-24 18:59:46 +00:00
Dianne Hackborn
c436b15953 Merge "Tweak voice settings strings." into lmp-dev 2014-08-24 18:53:17 +00:00