PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,170 Commits 1 Branch 0 Tags
f3cc23524fddcc2d55d17747a901b2090773e429
Commit Graph

7484 Commits

Author SHA1 Message Date
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
2f951024e4 am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev 
* commit 'c81dad78ea6ecf5819f07790126ba7424b7a7499':
  Show list of permissions instead of just numbers
 2015-06-10 17:00:06 +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
Lorenzo Colitti
24f4829994 am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev 
* commit 'a41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 15:56:36 +00:00
Jason Monk
8ff3e055b0 am fba2680e: am f9402321: Fix legal info back button 
* commit 'fba2680ebb63f0195b3267b7dec8d9cc413896fd':
  Fix legal info back button
 2015-06-10 15:56:34 +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
68da427f48 am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries 
* commit '5365a8fd3a2aee18a0d6faecd43ad2994a09951c':
  Remove periods from ignore optimizations summaries
 2015-06-10 15:11:54 +00:00
Jason Monk
6dc33a5ac7 am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '5b23db3ce61e5d2e43bb0f0757cf823c2d8f3d4d':
  Advanced apps updates (2/2)
 2015-06-10 15:11:53 +00:00
Jason Monk
83fde1b033 am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '6c6a212f0351a5711224f684c73123ff81d1504d':
  Add sd card string, just in case
 2015-06-10 15:11:52 +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
fa9fcf119b am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'b94840712e9257e6f38446c7d7a3c4d3d79cf089':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 22:09:38 +00: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
a59d4b9cd1 am 0087749f: am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 
* commit '0087749f66d299f1687475f56f340cf9cc42ef51':
  Top level: "Storage" -> "Storage & USB"
 2015-06-09 20:59:19 +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
40aba9d87c am 8987128d: am 4ab327b0: Merge "Accounts -> Account sync" into mnc-dev 
* commit '8987128dfa186685ac6a4f73993eea68a20da014':
  Accounts -> Account sync
 2015-06-09 20:16:11 +00:00
Jason Monk
2ad9a3ab7d am 3ab21b90: am fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev 
* commit '3ab21b90a7835da0ff6add47cff5edccbfcdbe93':
  Bring back gear icon for advanced app settings
 2015-06-09 20:16:10 +00: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
60142e6230 am 4afe7429: am 86333477: Add strings that will be used for new ignore opt ux 
* commit '4afe7429c7c15e2e5d6d657e02855148346244ba':
  Add strings that will be used for new ignore opt ux
 2015-06-09 19:49:20 +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
Jason Monk
4afe7429c7 am 86333477: Add strings that will be used for new ignore opt ux 
* commit '86333477b7913eccf628b7c0ac081fd7f0634b52':
  Add strings that will be used for new ignore opt ux
 2015-06-09 19:39:02 +00:00
Jason Monk
2b6c3c0f72 Top level: "Storage" -> "Storage & USB" 
Bug: 21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
 2015-06-09 15:32:14 -04:00
Jason Monk
86333477b7 Add strings that will be used for new ignore opt ux 
Bug: 21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
 2015-06-09 15:24:05 -04:00
Jason Monk
43db745ea0 Accounts -> Account sync 
Bug: 21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
 2015-06-09 14:46:57 -04:00
Sudheer Shanka
33696a7e83 am ec547789: am b259b384: Merge "Update some strings." into mnc-dev 
* commit 'ec54778989fa3f04c97770477b4db4728e474324':
  Update some strings.
 2015-06-09 17:02:49 +00:00
Sudheer Shanka
ec54778989 am b259b384: Merge "Update some strings." into mnc-dev 
* commit 'b259b3845739f6b66a77b0fb9a14069cb7ff9122':
  Update some strings.
 2015-06-09 16:35:22 +00:00
Sudheer Shanka
566678a013 Update some strings. 
Bug: 20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
 2015-06-09 14:29:26 +01:00
Makoto Onuki
375c3a080e Show list of permissions instead of just numbers 
Bug 21615746

Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
 2015-06-08 17:48:46 -07:00