PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,417 Commits 1 Branch 0 Tags
2bbbafdd88bb545af2ade3fcdbd064dcc3d45ae7
Commit Graph

21417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
b5fcfcafac am 2f951024: am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev 
* commit '2f951024e40b9bc2662aa5ef53a4544f769999e9':
  Show list of permissions instead of just numbers
 2015-06-10 17:21:00 +00:00
Lorenzo Colitti
335afcbb6c am 24f48299: am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev 
* commit '24f4829994e047b1674fdf66c1dad51bcaf900d7':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 17:13:29 +00:00
Geoff Mendal
db28ae2743 am 48452195: (-s ours) am f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4845219514add4c4b4cd26b9e503fd3fb2f5ed34':
  Import translations. DO NOT MERGE
 2015-06-10 17:13:28 +00:00
Jason Monk
774ae1cf37 am 8ff3e055: am fba2680e: am f9402321: Fix legal info back button 
* commit '8ff3e055b09c03295b87654d7bf3430e792772ce':
  Fix legal info back button
 2015-06-10 17:13:27 +00:00
Chris Wren
a16c9c73e6 am 5b11ad26: am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit '5b11ad2666227146db5983e7ea0073bc0cc12bd4':
  annoint new constants
 2015-06-10 17:13:02 +00:00
Jason Monk
b73d3a1811 am 68da427f: am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries 
* commit '68da427f481f24c8c0f571f7915620f7c83c6912':
  Remove periods from ignore optimizations summaries
 2015-06-10 17:13:01 +00:00
Jason Monk
ef2dadb7f8 am 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '6dc33a5ac7a2352be62b75edf1afc399821b38af':
  Advanced apps updates (2/2)
 2015-06-10 17:13:00 +00:00
Jason Monk
f0f128c72a am 83fde1b0: am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '83fde1b0336a62193282dc27767c07fb6a71a8fb':
  Add sd card string, just in case
 2015-06-10 17:12:58 +00:00
Neil Fuller
e8408a00b4 am db8d0a9a: am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit 'db8d0a9a370a55010d1d2d4e1efb06b7a02bedb3':
  Modifications for changes to SettingsLib
 2015-06-10 17:12:57 +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
Geoff Mendal
4845219514 am f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f0e5a7550866f6b6f2e385fc56b70c16848206ad':
  Import translations. DO NOT MERGE
 2015-06-10 15:56:35 +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
Geoff Mendal
f0e5a75508 am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '3e0514d7464c8da8fb4ce7fb132410cb53573bef':
  Import translations. DO NOT MERGE
 2015-06-10 15:42:34 +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
Chris Wren
5b11ad2666 am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'fa8889a88c162595b8cac8d2749dff401a5ea39c':
  annoint new constants
 2015-06-10 15:11:55 +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
Neil Fuller
db8d0a9a37 am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit '54786a6adf695dcc1378bdbfc261590c91d0199a':
  Modifications for changes to SettingsLib
 2015-06-10 15:11:47 +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
Chris Wren
fa8889a88c am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
  annoint new constants
 2015-06-10 14:54:38 +00: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
Neil Fuller
54786a6adf am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit 'c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
  Modifications for changes to SettingsLib
 2015-06-10 14:53:56 +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
2593589209 Pass in the netId using intent data, not intent extras. 
This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.

Bug: 20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9
 2015-06-10 23:38:16 +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
Geoff Mendal
3d13289445 Import translations. DO NOT MERGE 
Change-Id: I1443efca13a2db968124615503625164ba2aa0ec
Auto-generated-cl: translation import
 2015-06-10 07:33:59 -07:00
Chris Wren
da6a4904a9 Merge "annoint new constants" into mnc-dev 2015-06-10 14:14:45 +00: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
Neil Fuller
c28330ec3e Merge "Modifications for changes to SettingsLib" into mnc-dev 2015-06-10 12:23:49 +00:00
The Android Automerger
3f94f562c1 merge in mnc-release history after reset to mnc-dev 2015-06-10 01:04:19 -07:00
Jeff Brown
b18130c0df Add simulated 4K display modes. 
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
 2015-06-09 19:52:24 -07:00
Fyodor Kupolov
1f95d23015 am bf25b219: am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit 'bf25b219ab50e658bf90dc6e88b41c0c7e05e4c2':
  Guest option should not be shown for the guest user
 2015-06-09 23:33:40 +00:00
Fyodor Kupolov
bf25b219ab am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit 'af27f96bc61ed23658696d440919b286ea4d747a':
  Guest option should not be shown for the guest user
 2015-06-09 23:23:44 +00:00
Fyodor Kupolov
af27f96bc6 am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit '8e2c47870188c0732a1130b505748f07b23fa66c':
  Guest option should not be shown for the guest user
 2015-06-09 23:06:14 +00:00
Fyodor Kupolov
8e2c478701 Merge "Guest option should not be shown for the guest user" into mnc-dev 2015-06-09 22:57:27 +00:00
Fyodor Kupolov
c478885d8d Guest option should not be shown for the guest user 
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
 2015-06-09 15:55:01 -07:00