PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,210 Commits 1 Branch 0 Tags
b2bf53703095b2fd5eadfcd677b3dbb51a75cb17
Commit Graph

7279 Commits

Author SHA1 Message Date
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Selim Cinek
01dc50f54d am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 
* commit 'ff702a29ab221b67b97b140263af19ebfecc1988':
  Added setting strings for new fingerprint introduction screen
 2015-06-11 01:34:23 +00:00
Jeff Sharkey
d10261eb7b am 3803d91a: New strings! 
* commit '3803d91abb1e6eb034656b202bbb4aa29afa98ba':
  New strings!
 2015-06-11 01:33:32 +00:00
Lajos Molnar
f7192038dc am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit '63504d832672c0738604410d3c309a563114b81e':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 01:32:51 +00:00
Jorim Jaggi
a66b907b16 am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit 'ed76e59e49657e6a49d140bfea8ddd764e5ba731':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 01:32:31 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen 
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
 2015-06-10 18:08:16 -07:00
Jeff Sharkey
3803d91abb New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
 2015-06-10 16:47:52 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2) 
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
 2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings 
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
 2015-06-10 15:00:13 -07:00
Jason Monk
3de2cf4b2f am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit 'd09be7ed30d2ed4f3298c3075f506612b91a5878':
  New dialog for ignore battery optimizations
 2015-06-10 20:14:34 +00:00
Jason Monk
d09be7ed30 Merge "New dialog for ignore battery optimizations" into mnc-dev 2015-06-10 20:06:12 +00:00
Jason Monk
ef77eb2ecc am f8d131e1: Add string for profile owner usage access warning 
* commit 'f8d131e181a273ed8664222e754b10a5824d56ac':
  Add string for profile owner usage access warning
 2015-06-10 19:55:01 +00:00
Jason Monk
3a90d7cc69 New dialog for ignore battery optimizations 
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
 2015-06-10 15:49:36 -04:00
Jeff Brown
f7b9a0217c am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev 
* commit 'f8f9088a6def1186038c35ec3319113262825f20':
  Add simulated 4K display modes.
 2015-06-10 19:33:02 +00:00
Jason Monk
f8d131e181 Add string for profile owner usage access warning 
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
 2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +00:00
Xiyuan Xia
a218ebb090 am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit '9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
  Implement default assist app setting
 2015-06-10 17:21:01 +00:00
Xiyuan Xia
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +00:00
Makoto Onuki
c81dad78ea am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev 
* commit '0bd18745cff354f6994b70e71f3ab6b7e98fe004':
  Show list of permissions instead of just numbers
 2015-06-10 16:51:24 +00:00
Makoto Onuki
0bd18745cf Merge "Show list of permissions instead of just numbers" into mnc-dev 2015-06-10 16:39:07 +00:00
Xiyuan Xia
86a554091d Implement default assist app setting 
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
 2015-06-10 08:43:28 -07:00
Lorenzo Colitti
a41c3580a9 am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev 
* commit '275e6f75208c08eb925048a330ed4aab96e51033':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 15:42:35 +00:00
Jason Monk
fba2680ebb am f9402321: Fix legal info back button 
* commit 'f94023216accd128b06acdc50950e455a60a9c4e':
  Fix legal info back button
 2015-06-10 15:42:16 +00:00
Lorenzo Colitti
275e6f7520 Merge changes from topic 'no-internet-notification' into mnc-dev 
* changes:
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 15:25:27 +00:00
Geoff Mendal
3e0514d746 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 15:25:02 +00:00
Jason Monk
f94023216a Fix legal info back button 
Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
 2015-06-10 11:05:02 -04:00
Geoff Mendal
f61a092711 Import translations. DO NOT MERGE 
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
 2015-06-10 08:04:57 -07:00
Jason Monk
5365a8fd3a am caec03f9: Remove periods from ignore optimizations summaries 
* commit 'caec03f9e51469776242908b4d877d7248c52875':
  Remove periods from ignore optimizations summaries
 2015-06-10 14:54:09 +00:00
Jason Monk
5b23db3ce6 am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit 'cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
  Advanced apps updates (2/2)
 2015-06-10 14:54:08 +00:00
Jason Monk
6c6a212f03 am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '6f9b6e08a80b1d1e114808d1ac42e132888df185':
  Add sd card string, just in case
 2015-06-10 14:54:07 +00:00
Lorenzo Colitti
c6d997271a Add a string for switching to cell when Wi-Fi loses backhaul. 
We have not yet decided whether to surface this setting, but
we need to get it in before string freeze in case we do want to
expose it.

Bug: 20896761
Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
 2015-06-10 23:38:19 +09:00
Lorenzo Colitti
dcc6155426 Reword "no internet access" dialog to conform with mocks. 
Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
 2015-06-10 23:38:09 +09:00
Jason Monk
caec03f9e5 Remove periods from ignore optimizations summaries 
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
 2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2 Merge "Advanced apps updates (2/2)" into mnc-dev 2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8 Merge "Add sd card string, just in case" into mnc-dev 2015-06-10 12:59:30 +00:00
Jeff Brown
b18130c0df Add simulated 4K display modes. 
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
 2015-06-09 19:52:24 -07:00
Casper Bonde
b94840712e am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'e278a208bc8298963080dfb5352acedc65aad083':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 21:56:56 +00:00
Casper Bonde
e278a208bc SAP: Make it possible to enforce a 16-digit pin code (5/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:15 +00:00
Jason Monk
0087749f66 am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 
* commit '51f7c067aac2d9326ff0569027d0dff2aa67f538':
  Top level: "Storage" -> "Storage & USB"
 2015-06-09 20:40:10 +00:00
Jason Monk
51f7c067aa Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 2015-06-09 20:30:35 +00:00
Jason Monk
4da8e84432 Add sd card string, just in case 
Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
 2015-06-09 16:26:07 -04:00
Jason Monk
8987128dfa am 4ab327b0: Merge "Accounts -> Account sync" into mnc-dev 
* commit '4ab327b05fe36d2841a89e3d9ba34d7df4027a91':
  Accounts -> Account sync
 2015-06-09 20:04:36 +00:00
Jason Monk
3ab21b90a7 am fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev 
* commit 'fed12068e0068759870fe9ba9bdff08f76068c12':
  Bring back gear icon for advanced app settings
 2015-06-09 20:04:34 +00:00
Jason Monk
ba0e2c8688 Advanced apps updates (2/2) 
Change the title of the screen, add a category to break things up

Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
 2015-06-09 16:01:28 -04:00
Jason Monk
4ab327b05f Merge "Accounts -> Account sync" into mnc-dev 2015-06-09 19:50:12 +00:00
Jason Monk
fed12068e0 Merge "Bring back gear icon for advanced app settings" into mnc-dev 2015-06-09 19:49:22 +00:00
Jason Monk
32ff4d9bc9 Bring back gear icon for advanced app settings 
Bug: 21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
 2015-06-09 15:45:17 -04:00