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

15428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a34ecf41b8 Import translations. DO NOT MERGE 
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
 2014-08-26 20:49:33 -07: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
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
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
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
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
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
Dianne Hackborn
7912a76cd2 Tweak voice settings strings. 
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
 2014-08-23 14:11:12 -07:00
Amith Yamasani
cb7b83de42 am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit '7728710183de887be3bb68c4f95509659a950428':
  Don't index the ChooseLockGeneric screen
 2014-08-23 06:19:09 +00:00
Jeff Davidson
76747ff8f5 am fc24d0a7: am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit 'fc24d0a78071f6e441f236ab69be6642f650f253':
  Restore legacy VPN stats dialog.
 2014-08-23 02:49:04 +00:00
Amith Yamasani
7728710183 am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit '8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
  Don't index the ChooseLockGeneric screen
 2014-08-23 01:21:51 +00:00
Jeff Davidson
fc24d0a780 am 8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '8e6edba5606fd717a631aabcc4c5702bdd509033':
  Restore legacy VPN stats dialog.
 2014-08-23 01:12:46 +00:00
Amith Yamasani
8fe710682a Merge "Don't index the ChooseLockGeneric screen" into lmp-dev 2014-08-23 01:07:03 +00:00
Jeff Davidson
8e6edba560 Merge "Restore legacy VPN stats dialog." into lmp-dev 2014-08-23 00:55:40 +00:00
Jim Miller
0c5fdd10de am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '86e9f7cd668441dff2a35b046a99ebe8fd0548d9':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:44:56 +00:00
Amith Yamasani
644907a86f Don't index the ChooseLockGeneric screen 
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.

Instead, add some of the relevant keywords up one level in Security
settings.

Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
 2014-08-22 15:38:16 -07:00
Jim Miller
86e9f7cd66 am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '1351b0fbcddea9cc66941e8af1de148142b92201':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:34:45 +00:00
Jim Miller
1351b0fbcd Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 2014-08-22 22:25:16 +00:00
Nancy Chen
db848a5de6 API Review PhoneManager -> TelecommManager. Rename methods (3/6) 
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
 2014-08-22 15:12:01 -07:00
Elliott Hughes
76211390f2 am 21fc35c1: am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev 
* commit '21fc35c128b126a9052c6dca3fbd61d121d646dc':
  Settings psuedolocalization fixes.
 2014-08-22 20:57:16 +00:00
Elliott Hughes
21fc35c128 am d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev 
* commit 'd5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
  Settings psuedolocalization fixes.
 2014-08-22 20:51:00 +00:00