PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,779 Commits 1 Branch 0 Tags
2ad430e74288be0af1db2c7623beebd76e5af20c
Commit Graph

18779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
830f8b347b am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 5e83309  -s ours

* commit '5e833090d82d9c32a62616710c1482129b4f6fd1':
  Import translations. DO NOT MERGE
 2014-12-09 23:16:02 +00:00
Geoff Mendal
2537275ac1 am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE 
automerge: 63f6520  -s ours

* commit '63f6520ce9dacd9c99fb5d5e53c42ca5df869167':
  Import translations. DO NOT MERGE
 2014-12-09 23:15:54 +00:00
Zoltan Szatmary-Ban
77d7e17fba am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
  Make Location Settings multiprofile aware
 2014-12-09 23:15:46 +00:00
Lucky Zhang
a62e42be14 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-09 23:15:37 +00:00
Lucky Zhang
64192c36fa am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-09 23:15:29 +00:00
Maurice Lam
00a89f1439 am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
automerge: 86ed2cf

* commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-09 23:15:21 +00:00
PauloftheWest
bfb8449aea am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 
* commit 'e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
  Fixed a SIM Lock UI issue
 2014-12-09 23:12:52 +00:00
Jeff Davidson
06b65d1c7d resolve merge conflicts of 0c7e4ed to master. 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
 2014-12-09 15:11:44 -08:00
PauloftheWest
aa80060930 Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 2014-12-09 23:10:36 +00:00
PauloftheWest
e6d7b31fc4 Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 2014-12-09 23:04:19 +00:00
Wink Saville
da77fcf428 am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
* commit 'f8c4fe2d3c0281243fd246c00c1d460e891b386e':
  Add debug dataEnable.
 2014-12-09 18:05:56 +00:00
Wink Saville
f8c4fe2d3c am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
* commit '85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
  Add debug dataEnable.
 2014-12-09 17:58:30 +00:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Prem Kumar
5c8dff3e92 am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
* commit '35b3257e078ea2609a2e5ef28019b92349f6b41b':
  Fixed a SIM Cards crash.
 2014-12-09 11:29:22 +00:00
Maurice Lam
a49c7c572f [FRP] Shrink lock screen when keyboard pops up 
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.

Bug: 18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
 2014-12-08 18:43:11 -08:00
Prem Kumar
35b3257e07 am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
* commit '1e1251cc04ee9636721719aa0a13d94e15500258':
  Fixed a SIM Cards crash.
 2014-12-09 02:30:23 +00:00
Prem Kumar
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
Maurice Lam
2a321adc9b am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-09 00:55:49 +00:00
Sanket Padawe
8b8ae61d52 am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit '088a44205d2b4a7c2add44f9109f209b50c0f3b9':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-09 00:55:48 +00:00
Sanket Padawe
ded7054794 am 361681e2: am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '361681e2579f36765c1a75d7898f73b0fd2c1322':
  Change default sim selection text in sim settings ui.
 2014-12-09 00:55:47 +00:00
Justin Harrison
3cb00b23aa am 765bf45f: am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '765bf45f9714f0857bc0de081ed9c938ebf810f5':
  Check remote device uuids for phone book access permission
 2014-12-09 00:55:45 +00:00
Fyodor Kupolov
ed682b7f18 am 2b6c7313: am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit '2b6c7313ede33b40515f41ea97d3bed0532d1518':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-09 00:55:44 +00:00
Shishir Agrawal
5615a1b3b6 am 4d3eb665: am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 
* commit '4d3eb6659eb6626dd3ed5d46b681ddf27845a4fe':
  Settings app - read phone number from TelephonyManager.
 2014-12-09 00:55:43 +00:00
Adrian Roos
19805a3cca am 669dd0a3: am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit '669dd0a3aa916994fb821e7036e7c4bd12a033a1':
  Fix race leading to spuriously disabled trust agents
 2014-12-09 00:55:41 +00:00
Maurice Lam
4dd6de9228 am 5c325c4d: am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit '5c325c4d8cd9a0c1195b3d02b31f6073fbff09a2':
  [FRP] Use setup wizard nav bar buttons
 2014-12-09 00:55:40 +00:00
Justin Harrison
15f8bf6278 am de54a3ae: am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 
* commit 'de54a3aef60f2d3d1f143ba5bb1ecdd4b9cf3a9e':
  Removed the application SIM Cards from application list
 2014-12-09 00:55:39 +00:00
Maurice Lam
10a4d5c2de am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
  [FRP] Add illustration to lock screen setup
 2014-12-09 00:55:37 +00:00
Maurice Lam
2e07b9e83e am 5d7cef31: am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 
* commit '5d7cef31bc9aede1ebe2ce64906b2a7766d94c99':
  [FRP] Give pattern lock colors
 2014-12-09 00:55:36 +00:00
John Spurlock
195b9c855a am 8aa3e663: am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
* commit '8aa3e66389e7b66424ca7b4a3c0ef9cc11a00b17':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 00:23:28 +00:00
John Spurlock
8aa3e66389 am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
* commit '1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 00:08:42 +00:00
PauloftheWest
0b8788aae4 Fixed a SIM Lock UI issue 
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.

Bug: 18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
 2014-12-08 13:51:25 -08:00
John Spurlock
1e3be7d9ce Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 2014-12-08 20:27:02 +00:00
PauloftheWest
c29c583536 Fixed a SIM Cards crash. 
+ Added a check if getActiveSubscriptionInfoList returns null.

Bug: 18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
 2014-12-08 12:24:28 -08:00
John Spurlock
aaaa54ec0e Settings: Rebind to volume sliders after returning from stopped. 
Bug: 18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
 2014-12-08 15:20:33 -05:00
Jeff Sharkey
e5c7baec2b am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'e0d9f74d270cc17eb92bea26b3b98eb4c9201ddd':
  Offer to "merge" subscribers for data usage.
 2014-12-08 19:44:34 +00:00
PauloftheWest
d54211c76d am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 
* commit '5acd934b71f9fd96a46a189c3352191c2998883b':
  SIM cards in Setting will only show on Multi-SIM devices
 2014-12-08 19:43:59 +00:00
PauloftheWest
6f55eb72f4 am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev 
* commit '743e825934829be58027afac88c5ab8810c5b29b':
  Fixed a SimSettings issue
 2014-12-08 19:43:57 +00:00
John Spurlock
d88871564f am 65802e5a: am f68bc645: Settings: Hide downtime settings if not supported. 
* commit '65802e5acbbb22f68b7a5c75a34decaa366fe157':
  Settings: Hide downtime settings if not supported.
 2014-12-08 19:43:45 +00:00
Geoff Mendal
5e833090d8 am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2193e589caebd5ea80aa4dda526402ea25230c2f':
  Import translations. DO NOT MERGE
 2014-12-08 19:42:57 +00:00
Geoff Mendal
63f6520ce9 am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE 
* commit 'be183dacbd87671243f328d589b519990c24939f':
  Import translations. DO NOT MERGE
 2014-12-08 19:42:43 +00:00
Zoltan Szatmary-Ban
45f04233c2 am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
* commit '5d653fe85a030b41d7d4d946feca12ea897c4457':
  Make Location Settings multiprofile aware
 2014-12-08 19:42:19 +00:00
Lucky Zhang
44f44a0c54 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
* commit '90ec22bc2c47e01bbf3179ec947fa30f3ab45724':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-08 19:41:45 +00:00
Lucky Zhang
a4df967389 am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
* commit '3e239fe0d8b09b950e87339a1814040bb4208fe2':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-08 19:41:44 +00:00
Maurice Lam
86ed2cf33f am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
* commit '8fcbe816656a61bcb6b5c34e7bd535a5bba9964d':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-08 19:37:12 +00:00
Jeff Davidson
0c7e4ed697 am e2381760: am 9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 
* commit 'e2381760207f3826ed54ecf4f27a7d10eb340166':
  Final platform settings UX for ephemeral networks.
 2014-12-08 19:36:47 +00:00
Maurice Lam
2dded568fe am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '53bfcb526b218758d51ca47e57f71e2e19de4d3c':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-08 19:18:16 +00:00
Sanket Padawe
088a44205d am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit '32fc975534e3a14128f9c9303665c1a4a3fc4937':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-08 19:17:50 +00:00
Sanket Padawe
361681e257 am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '889d3875af9235f8f5330e2fec3e2fd7d7ef22e0':
  Change default sim selection text in sim settings ui.
 2014-12-08 19:17:49 +00:00
Justin Harrison
765bf45f97 am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '07d60e5ec237d5d4e96893bae866215a374f6452':
  Check remote device uuids for phone book access permission
 2014-12-08 19:16:45 +00:00
Fyodor Kupolov
2b6c7313ed am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit 'd7e3f354cc975b4ade2bd5bddfa72dce3099581f':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-08 19:16:06 +00:00