PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,017 Commits 1 Branch 0 Tags
7e8b35411e80fd3a77d27e43233aa03a7c0fc89c
Commit Graph

20017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
d527aa0bf5 am 673db350: Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev 
* commit '673db350c3315df2c3a0ef70092a1d63fd8021c7':
  Settings:  Add setting to mute wireless charging sound.
 2015-05-07 00:11:17 +00:00
Jeff Brown
92d6b09ebb Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. 
Bug: 20641986
Change-Id: Ief6c0d6048abc9411f1e9930cec1edde4a582cf9
 2015-05-06 16:02:22 -07:00
John Spurlock
673db350c3 Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:07 +00:00
Alan Viverette
9b2d47f445 Use theme colors in battery stats widget 
Bug: 20633519
Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc
 2015-05-06 15:17:27 -07:00
Sanket Padawe
7ff3fbd01e am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev 
* commit '39ac24df7913546d8f2db3f17bc3d3dca5638e4a':
  Fix SimStatus crash in Settings.
 2015-05-06 22:14:28 +00:00
Sanket Padawe
39ac24df79 Merge "Fix SimStatus crash in Settings." into mnc-dev 2015-05-06 22:04:12 +00:00
John Spurlock
ae91c0a99a Settings: Add setting to mute wireless charging sound. 
Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
 2015-05-06 17:42:30 -04:00
Sanket Padawe
a19723b4a6 am b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev 
* commit 'b7a1b5c310ccb33b6999041f2ba1f99d98cc0282':
  Saved networks summary strings.
 2015-05-06 21:07:20 +00:00
Sanket Padawe
b7a1b5c310 Merge "Saved networks summary strings." into mnc-dev 2015-05-06 20:59:13 +00:00
Jason Monk
20f464edde Fix app headers in settings 
Use SettingsPreferenceFragment's method for pinned headers where
possible, and add a frame within the fragment for them to live in
otherwise so that this view doesn't end up on the activity.

Bug: 20886475
Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
 2015-05-06 16:00:25 -04:00
Sudheer Shanka
11710005b8 am 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile. 
* commit '5a817c6bcc14033b08ad8ddec10625e4352ef194':
  Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
 2015-05-06 16:54:12 +00:00
Sudheer Shanka
5a817c6bcc Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile. 
Change-Id: I55c169b280d7302c9e387f80be82ef47132798c2
 2015-05-06 16:35:22 +01:00
Sanket Padawe
5a3b91cdbb Fix SimStatus crash in Settings. 
Bug: 20862873
Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
 2015-05-05 19:00:39 -07:00
John Spurlock
496aff371e am 0d2a8d20: Settings: Migrate calls & messages priority settings. 
* commit '0d2a8d204bb7d62834d51393a1d4a6ddaa7753f8':
  Settings: Migrate calls & messages priority settings.
 2015-05-06 00:39:41 +00:00
John Spurlock
0d2a8d204b Settings: Migrate calls & messages priority settings. 
Bug: 18635172
Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd
 2015-05-05 18:50:15 -04:00
Casper Bonde
5aa179886c am faadcd60: Settings UI for SIM access profile (1/2) 
* commit 'faadcd60e7ab8fa6eb9b5be7be907129bd3f8575':
  Settings UI for SIM access profile (1/2)
 2015-05-05 18:46:43 +00:00
Robin Lee
efe5a5c2d2 am 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev 
* commit '3342d762e98996549aa5cae02ccdc3238eb3a33d':
  VPN: Convert current-context IPCs to user context
 2015-05-05 18:45:57 +00:00
Brian Colonna
5e8ce3d9a3 am 229d06a8: Removed some dead Face Unlock code. 
* commit '229d06a83943a2c924d9c06e0f31d71e5e8801b9':
  Removed some dead Face Unlock code.
 2015-05-05 18:45:55 +00:00
John Spurlock
604f4b8872 am 42ae11d4: Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev 
* commit '42ae11d4d58cbe09dbbd377a4c3e2760ffa3034e':
  Settings: Remove zenswitch from DND settings page.
 2015-05-05 18:45:44 +00:00
John Spurlock
7c84eecc31 am a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev 
* commit 'a924f3d6bbd3b304d962a76f75b3f91567ee045b':
  Settings: Calendar event zen rule string updates.
 2015-05-05 18:45:43 +00:00
Zoltan Szatmary-Ban
ffce3b4eaa am aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev 
* commit 'aea57babc0ced100995076caf3284c89a4a2aa11':
  Forward WiFi settings intents to primary profile
 2015-05-05 18:45:40 +00:00
Casper Bonde
faadcd60e7 Settings UI for SIM access profile (1/2) 
Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
 2015-05-05 16:59:17 +00:00
Robin Lee
3342d762e9 Merge "VPN: Convert current-context IPCs to user context" into mnc-dev 2015-05-05 15:34:41 +00:00
Brian Colonna
229d06a839 Removed some dead Face Unlock code. 
I checked to see if any dead Face Unlock code remains in settings.  Most of it
has been removed, but I did find some strings and an xml file that can be
removed.

Bug: 16139545
Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
 2015-05-05 11:23:12 -04:00
John Spurlock
42ae11d4d5 Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev 2015-05-05 14:42:16 +00:00
John Spurlock
a924f3d6bb Merge "Settings: Calendar event zen rule string updates." into mnc-dev 2015-05-05 14:42:05 +00:00
John Spurlock
4b43b72054 Settings: Calendar event zen rule string updates. 
- Remove Attendance option.
 - Use new reply value, tweak wording and summaries.

Bug: 20064962
Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3
 2015-05-05 10:12:26 -04:00
John Spurlock
beff087b3a Settings: Remove zenswitch from DND settings page. 
- Remove the ability to view/modify zen mode/condition from
   the Settings app.

Bug: 20064962
Change-Id: I8757780e5e9ef578e05203577871b9f513997798
 2015-05-05 07:32:31 -04:00
Robin Lee
ab6a65c03b VPN: Convert current-context IPCs to user context 
These fetch info for the wrong user, which may be either wrong or worse
wholly nonexistent.

Bug: 20747154
Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
 2015-05-05 10:54:24 +00:00
Zoltan Szatmary-Ban
aea57babc0 Merge "Forward WiFi settings intents to primary profile" into mnc-dev 2015-05-05 10:07:07 +00:00
Prerepa Viswanadham
3c52d38b55 am f09497a2: Merge changes from topic \'mwd-merge-050415\' into mnc-dev 
* commit 'f09497a2a702484a78b9462fc6d10eb3dc5c430d':
  DO NOT MERGE - Disable data sim selection when phone call is going on.
  Bluetooth: HID: Use proper values of connection status
 2015-05-05 01:16:11 +00:00
Sanket Padawe
eb3ff59333 Saved networks summary strings. 
Bug: 20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87
 2015-05-04 18:14:33 -07:00
Prerepa Viswanadham
f09497a2a7 Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'ab489de' into merge_try2
  Merge commit 'dd796e8' into merge_try2
 2015-05-05 01:07:17 +00:00
Yorke Lee
61b82ac4cb am 3066f832: Merge "Rename default dialer to default phone app" into mnc-dev 
* commit '3066f832435af08bbc2ed5fcef45228d5ff86e33':
  Rename default dialer to default phone app
 2015-05-05 01:04:15 +00:00
Yorke Lee
3066f83243 Merge "Rename default dialer to default phone app" into mnc-dev 2015-05-05 00:22:13 +00:00
Jason Monk
ed1bf50d12 am 0ab13b83: Merge "Add high power whitelist for apps" into mnc-dev 
* commit '0ab13b8326d6f31caff922fd95828254cb95a618':
  Add high power whitelist for apps
 2015-05-04 18:59:15 +00:00
Jason Monk
0ab13b8326 Merge "Add high power whitelist for apps" into mnc-dev 2015-05-04 18:50:19 +00:00
Jason Monk
1eb54eb2ff Add high power whitelist for apps 
- Strings not final!
 - New UX for power usage details (more preferency)
 - Add high power apps list shows on/off and screen to
   change (when possible)
 - Link from power usage summary to high power list
 - Link from advanced apps to high power list

Bug: 19991702
Change-Id: I97c927ed82d3b89041e4429b427508545763d66c
 2015-05-04 14:38:01 -04:00
Geoff Mendal
8f32538d8c am 32ba436b: (-s ours) Import translations. DO NOT MERGE 
* commit '32ba436b0b8b955874dd2797a4c317951385fcde':
  Import translations. DO NOT MERGE
 2015-05-04 14:12:37 +00:00
Geoff Mendal
32ba436b0b Import translations. DO NOT MERGE 
Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c
Auto-generated-cl: translation import
 2015-05-04 06:18:18 -07:00
Prerepa Viswanadham
e42416a404 Merge commit 'ab489de' into merge_try2 2015-05-01 18:39:38 -07:00
Prerepa Viswanadham
27d4126fed Merge commit 'dd796e8' into merge_try2 
Change-Id: I7237d936e2eea39f5d4401db06aed6cb3a3dc426
 2015-05-01 18:39:00 -07:00
Maurice Lam
8585162ba3 am a283e6e3: Use curly quotes and apostrophes 
* commit 'a283e6e325aeae794fb04e60c38431721742b622':
  Use curly quotes and apostrophes
 2015-05-01 20:47:05 +00:00
Maurice Lam
a283e6e325 Use curly quotes and apostrophes 
Per UX writing style guide, quotes and apostrophes should be curly
https://spec.googleplex.com/live/style/writing.html#writing-global-writing

Bug: 20706978
Change-Id: Idcbb9014c7c04f6f8336a58d2ff5a0ea9409110a
 2015-05-01 10:29:05 -07:00
Amit Mahajan
30431a4dbd am 0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev 
* commit '0255f595bd5ffbf39601296ac708130fccfc02ed':
  ApnEditor changes to support bearer as a bitmask.
 2015-05-01 16:52:08 +00:00
Sudheer Shanka
2a549b66b0 am 0488dc97: Add MDM app name under "Work" in Accounts section of Settings. 
* commit '0488dc97686051d6cac744edb8a9d9c7ec477009':
  Add MDM app name under "Work" in Accounts section of Settings.
 2015-05-01 16:52:07 +00:00
Amit Mahajan
0255f595bd Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev 2015-05-01 16:50:05 +00:00
Sudheer Shanka
0488dc9768 Add MDM app name under "Work" in Accounts section of Settings. 
Bug: 20024761
Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262
 2015-05-01 14:42:52 +01:00
Erik Kline
54861e124c Add settings for persisting the mobile data connection. 
Change-Id: I9b92104893e860e2beb63ac86d417419699c085b
 2015-05-01 19:27:33 +09:00
Amit Mahajan
7e28221640 ApnEditor changes to support bearer as a bitmask. 
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
 2015-04-30 18:03:17 -07:00