Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,303 Commits 1 Branch 0 Tags
3803d91abb1e6eb034656b202bbb4aa29afa98ba
Commit Graph

6649 Commits

Author SHA1 Message Date
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
d09be7ed30 Merge "New dialog for ignore battery optimizations" into mnc-dev 2015-06-10 20:06:12 +00:00
Jason Monk
3a90d7cc69 New dialog for ignore battery optimizations 
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
 2015-06-10 15:49:36 -04: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
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +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
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
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
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
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
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
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
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
John Spurlock
9a58361076 Merge "Settings: Update notification listener user prompt strings." into mnc-dev 2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893 Settings: Update notification listener user prompt strings. 
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
 2015-06-08 16:50:36 -04:00
Jorim Jaggi
7e38eea817 Merge "Fix settings overdraw" into mnc-dev 2015-06-08 18:39:25 +00:00
John Spurlock
178d46a9b5 Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 2015-06-08 16:39:33 +00:00
John Spurlock
a00194d998 Settings: Update DND access dialog to new user flow. 
- Only list apps in the DND access list that have included
   the corresponding permission in their manifest.
 - Show a scary user warning before enabling access per app.
 - Update manifest to follow framework intent action rename.

Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
 2015-06-08 12:27:03 -04:00
Geoff Mendal
0053802f23 Import translations. DO NOT MERGE 
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
 2015-06-08 07:59:45 -07:00
Martijn Coenen
1276b21317 Merge "Add NFC payment "how it works" screens." into mnc-dev 2015-06-08 08:02:30 +00:00
Sanket Padawe
547089c376 Merge "Fix wifi network strings shown in Settings." into mnc-dev 2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0 Fix wifi network strings shown in Settings. 
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
 2015-06-05 18:49:12 -07:00
Jorim Jaggi
1fdd4f521c Fix settings overdraw 
Bug: 17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
 2015-06-05 17:42:32 -07:00
Ruben Brunk
e35df2ff3b Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
 2015-06-05 16:05:18 -07:00
Martijn Coenen
cbcc76e8d3 Add NFC payment "how it works" screens. 
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
 2015-06-05 21:35:55 +02:00
Maurice Lam
26a42d1099 Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 2015-06-05 19:13:18 +00:00
Jason Monk
1b93ef1d9b Merge "Settings > Apps list style updates" into mnc-dev 2015-06-05 13:36:27 +00:00
Jason Monk
d7dbe16142 Merge "Fix some dark theme issues (Take 2)" into mnc-dev 2015-06-05 13:23:13 +00:00
Maurice Lam
25e3081575 Update Setup Wizard redaction interstitial styles 
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.

Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
 2015-06-04 17:17:07 -07:00