PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,849 Commits 1 Branch 0 Tags
dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c
Commit Graph

17849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
12604519aa Merge "prettify debug informations" into lmp-mr1-dev 
automerge: 10a4cac

* commit '10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
  prettify debug informations
 2014-10-28 19:16:31 +00:00
Paul Lawrence
59717ad3a7 Make emergency button right size 
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
 2014-10-28 19:01:18 +00:00
Jason Monk
496b3f6471 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 2014-10-28 18:45:24 +00:00
vandwalle
10a4cacc0f Merge "prettify debug informations" into lmp-mr1-dev 2014-10-28 18:34:33 +00:00
John Spurlock
89ad293983 am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 
automerge: 22a466a

* commit '22a466a82ebce42ae0b75c80226b10ab97f89321':
  Settings: Follow update to common conditions call.
 2014-10-28 18:07:57 +00:00
Alexandra Gherghina
4da8a5c4ad am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev 
automerge: ffae7de

* commit 'ffae7de1ea79d147fcb30b54d23f4973d330a19b':
  Close account settings if there's no account to show
 2014-10-28 18:02:14 +00:00
Jason Monk
36760c108b Allow QS to launch adding network dialog 
This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid.  It will be used to take users
straight from QS to the password entry, when a secure network is
selected.

Bug: 17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14
 2014-10-28 13:21:12 -04:00
John Spurlock
22a466a82e am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 
* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
  Settings: Follow update to common conditions call.
 2014-10-28 17:12:57 +00:00
John Spurlock
90674e53fc Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 2014-10-28 17:08:51 +00:00
John Spurlock
24791abae1 Settings: Follow update to common conditions call. 
Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
 2014-10-28 12:33:30 -04:00
Alexandra Gherghina
ffae7de1ea am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev 
* commit '9f0bab9bcb756607da99758971207ad833c4608b':
  Close account settings if there's no account to show
 2014-10-28 15:35:36 +00:00
Alexandra Gherghina
9f0bab9bcb Merge "Close account settings if there's no account to show" into lmp-mr1-dev 2014-10-28 15:29:38 +00:00
Wink Saville
bca457c60f am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev 
automerge: cb02b97

* commit 'cb02b97f8dc972e0438492b1cadaa21b34a301b6':
  Change subId to int from long
 2014-10-27 21:36:17 +00:00
Geoff Mendal
2ef9983d4e am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours 
automerge: 967c000  -s ours

* commit '967c000603e40704008a094cce3f3348acab7cf8':
  Import translations. DO NOT MERGE
 2014-10-27 21:36:10 +00:00
Geoff Mendal
134ed71ced am 40f84ca0: (-s ours) Import translations. DO NOT MERGE 
automerge: 9ab85cf  -s ours

* commit '9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
  Import translations. DO NOT MERGE
 2014-10-27 21:35:59 +00:00
Wink Saville
cb02b97f8d am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev 
* commit '4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
  Change subId to int from long
 2014-10-27 20:37:06 +00:00
Geoff Mendal
967c000603 am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours 
* commit '855f0d264343325fb308bd27c509d7f95893d645':
  Import translations. DO NOT MERGE
 2014-10-27 20:37:05 +00:00
Geoff Mendal
9ab85cf0e0 am 40f84ca0: (-s ours) Import translations. DO NOT MERGE 
* commit '40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
  Import translations. DO NOT MERGE
 2014-10-27 20:37:04 +00:00
Geoff Mendal
1dc92b3733 am bf9175c0: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit 'bf9175c03bb47cf85af809a21cd45cbc989ade63':
 2014-10-27 18:53:20 +00:00
Baligh Uddin
6e05caac2c am 5b3f6a3a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '5b3f6a3a6d6f580784f4745d635b2abbe5d47618':
 2014-10-27 18:53:19 +00:00
Jim Miller
d4072bce62 am cd8971a9: am aa037675: Fix bad string in EncryptionInterstitial 
* commit 'cd8971a9e95ec918322e670af93e042c5587ea07':
 2014-10-27 18:53:18 +00:00
Jim Miller
d57be02ad5 am 7b13fe8f: am 47adff0a: Show warning dialog when Accessibility is enabled 
* commit '7b13fe8f907910868c46921e25f481909c80964f':
 2014-10-27 18:53:17 +00:00
Jim Miller
df99f650bd am b72f97c0: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 
* commit 'b72f97c0f18c08972997ddce481b8939566a135c':
 2014-10-27 18:53:16 +00:00
Svetoslav
58d6b51131 am fec94660: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev 
* commit 'fec94660fb1b3ea76b49c52e1a6d0741e19bec2a':
 2014-10-27 18:53:15 +00:00
Amith Yamasani
64aedae130 am 2ae9f8ab: am e52c159c: Fix some strings for the encryption stuff. 
* commit '2ae9f8aba61ce28bb3cdb38c915f2a1ccc33b811':
 2014-10-27 18:53:14 +00:00
Jim Miller
7c6185041e am 9a7f7a34: am 4f903c3e: Add strings for upcoming change. 
* commit '9a7f7a34aea8ef49564c160cbc8d9bed43407c9c':
 2014-10-27 18:53:13 +00:00
Svetoslav
b176636853 am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit 'c8a1bb5a4d069ac08196287e4853cb18fd723086':
 2014-10-27 18:53:12 +00:00
Geoff Mendal
4402b04767 am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd33f7d6a6201edb0f15f25511c9c3323b67a295a':
 2014-10-27 18:53:11 +00:00
Jim Miller
c65633eb27 am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\' 
* commit '9afd56e08d872c6786cd622488c926e6b7a5524a':
 2014-10-27 18:53:10 +00:00
Fabrice Di Meglio
c4ea2969f6 am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev 
* commit '84ff9901341c1bad328f6e4d552e308f22d4d3c2':
 2014-10-27 18:53:09 +00:00
Jason Monk
ea9819f4ad am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit '8b1fe3b8e0193748d319d5b0b4a375586bab1379':
 2014-10-27 18:53:08 +00:00
Andres Morales
db4c54b68f am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 
* commit '4a9b3cf50605d8e074e51166c49dbebcdcad1f75':
 2014-10-27 18:53:07 +00:00
vandwalle
9ef7735987 am 60790f7b: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 
* commit '60790f7b2a07c9ae79df6d8f1d02974e676791b7':
 2014-10-27 18:53:06 +00:00
Geoff Mendal
595c3349d8 am a9cd186c: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a9cd186c9491ec56b9c3ea0fe9f7dbad00b8fad1':
 2014-10-27 18:53:05 +00:00
John Spurlock
590f44a2df am b3ce7874: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts. 
* commit 'b3ce7874ff4c887f37532fbff31e4c2659ca9d4c':
 2014-10-27 18:53:04 +00:00
Alan Viverette
061c8b0011 am 673e3c28: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '673e3c28f4c9860f452d421028cc60af08208437':
 2014-10-27 18:53:03 +00:00
Amit Mahajan
b1d81165ce am 6f451050: am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev 
* commit '6f451050a77b8535ed00d06beddaa2eeb2488f2c':
 2014-10-27 18:53:02 +00:00
Dianne Hackborn
88f7a6a7c1 am df8683d2: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit 'df8683d237f3a4b2e82e051d7c794ec3a744a736':
 2014-10-27 18:53:01 +00:00
Zoltan Szatmary-Ban
21b3566dfb am 4ce8802e: am 50263efb: Remove CA Cert UI item from one list only 
* commit '4ce8802e410c8f18d37f20188adab30395ceb440':
 2014-10-27 18:52:59 +00:00
Amith Yamasani
69f5e5ed63 am 195b1583: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '195b15833cb2db872980272d5c75ea33ab8c791d':
 2014-10-27 18:52:58 +00:00
Geoff Mendal
5af09c9d8e am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE 
* commit '185e17221a54f8c201d27d291a30f01f1f7641dd':
 2014-10-27 18:52:57 +00:00
Baligh Uddin
adcf72abda am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE 
* commit 'bbf9927b1bdc3767c73efee1daf0019374ede021':
 2014-10-27 18:52:56 +00:00
Svetoslav
f7b5f424d5 am b792f69e: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit 'b792f69eb416a0c6ac15d81413eef6c6e97fb1eb':
 2014-10-27 18:52:55 +00:00
John Spurlock
b96de5b088 am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev 
* commit '041ebc1bfc669da45eb3a36db1c221b3ce39abb4':
 2014-10-27 18:52:54 +00:00
PauloftheWest
94841dc1e5 am d005440f: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'd005440fa9162f4e7c6e4664ae1db74fb624ec98':
 2014-10-27 18:52:53 +00:00
PauloftheWest
86ac419cad am 324f29c8: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev 
* commit '324f29c86db2e746ec5fc41ddd0b81444e6bf76c':
 2014-10-27 18:52:51 +00:00
Alan Viverette
ffac1ac92f am dc174c85: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev 
* commit 'dc174c8593063aa11a8a3777e6b70a646f0c0ef3':
 2014-10-27 18:52:50 +00:00
Baligh Uddin
0627d066ca am ee3d7127: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ee3d7127cf0e2c6952a75947989378f29db170aa':
 2014-10-27 18:52:49 +00:00
Hui Shu
f3acb3ad2e am bbb8928a: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'bbb8928a4fa0f7b3e344f3d353e7aee13372f00b':
 2014-10-27 18:52:48 +00:00
Zoltan Szatmary-Ban
b8acc5ac4d am 9cb9286d: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit '9cb9286dc246f54743913b1ae20c045e49810c49':
 2014-10-27 18:52:47 +00:00