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

20265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
cb8d0b59ea am 0682d5a1: am 7c84eecc: am a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev 
* commit '0682d5a1eedce49506246734124efcc6f733e8b0':
  Settings: Calendar event zen rule string updates.
 2015-05-05 19:22:35 +00:00
Zoltan Szatmary-Ban
49898e24bc am 2d9db253: am ffce3b4e: am aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev 
* commit '2d9db253460ba322581fb52e6e77f54b356d440d':
  Forward WiFi settings intents to primary profile
 2015-05-05 19:22:34 +00:00
Casper Bonde
465e9322b2 am 5aa17988: am faadcd60: Settings UI for SIM access profile (1/2) 
* commit '5aa179886c0379ac6647cdaeb1c16634c827f840':
  Settings UI for SIM access profile (1/2)
 2015-05-05 19:00:58 +00:00
Robin Lee
e16702116e am efe5a5c2: am 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev 
* commit 'efe5a5c2d29cec37cb16bec4511a6f7cf8562ff9':
  VPN: Convert current-context IPCs to user context
 2015-05-05 19:00:57 +00:00
Brian Colonna
a26112b952 am 5e8ce3d9: am 229d06a8: Removed some dead Face Unlock code. 
* commit '5e8ce3d9a38e9e6efd6c69915ce5f87aed049252':
  Removed some dead Face Unlock code.
 2015-05-05 19:00:56 +00:00
John Spurlock
c8067c5461 am 604f4b88: am 42ae11d4: Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev 
* commit '604f4b8872a8809b46f944206ec305ad2bd938ec':
  Settings: Remove zenswitch from DND settings page.
 2015-05-05 19:00:55 +00:00
John Spurlock
0682d5a1ee am 7c84eecc: am a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev 
* commit '7c84eecc31972a7366efd4a02741ca29328802a2':
  Settings: Calendar event zen rule string updates.
 2015-05-05 19:00:53 +00:00
Zoltan Szatmary-Ban
2d9db25346 am ffce3b4e: am aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev 
* commit 'ffce3b4eaa55c69710911e0898517f884f3edbff':
  Forward WiFi settings intents to primary profile
 2015-05-05 19:00:52 +00: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
2622c2f572 am 183299d8: am 3c52d38b: am f09497a2: Merge changes from topic \'mwd-merge-050415\' into mnc-dev 
* commit '183299d821ac8fc06dce3fdc809779f44d07f380':
  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:49:19 +00:00
Prerepa Viswanadham
183299d821 am 3c52d38b: am f09497a2: Merge changes from topic \'mwd-merge-050415\' into mnc-dev 
* commit '3c52d38b552ba28ab2981f9c42e131f71437e05e':
  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:32:07 +00:00
Yorke Lee
1186df4315 am 3e460f13: am 61b82ac4: am 3066f832: Merge "Rename default dialer to default phone app" into mnc-dev 
* commit '3e460f1368c12843d345c28be1233618e7bd8bbd':
  Rename default dialer to default phone app
 2015-05-05 01:30:24 +00:00
Yorke Lee
3e460f1368 am 61b82ac4: am 3066f832: Merge "Rename default dialer to default phone app" into mnc-dev 
* commit '61b82ac4cb81acdcad6171ea667809ddc0ff36e4':
  Rename default dialer to default phone app
 2015-05-05 01:17:03 +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
Jason Monk
1c2af85471 am e7c31d34: am ed1bf50d: am 0ab13b83: Merge "Add high power whitelist for apps" into mnc-dev 
* commit 'e7c31d34d0ac6c0d57bfa29ec1c6acadbf18e0b9':
  Add high power whitelist for apps
 2015-05-05 01:03:25 +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
e7c31d34d0 am ed1bf50d: am 0ab13b83: Merge "Add high power whitelist for apps" into mnc-dev 
* commit 'ed1bf50d125739938379d57f207fa62817d9bbef':
  Add high power whitelist for apps
 2015-05-04 19:07:40 +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
3396e14523 am a99b430d: (-s ours) am 8f32538d: (-s ours) am 32ba436b: (-s ours) Import translations. DO NOT MERGE 
* commit 'a99b430df964ba69484a24a11f050f5607690b44':
  Import translations. DO NOT MERGE
 2015-05-04 14:35:42 +00:00
Geoff Mendal
a99b430df9 am 8f32538d: (-s ours) am 32ba436b: (-s ours) Import translations. DO NOT MERGE 
* commit '8f32538d8c2d94a93e1e9f09da0ec59ad2749854':
  Import translations. DO NOT MERGE
 2015-05-04 14:24:46 +00: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
Geoff Mendal
3321e72cb2 Import translations. DO NOT MERGE 
Change-Id: I05ee02c638e4a9152d80b013a97f5e9b84404558
Auto-generated-cl: translation import
 2015-05-04 05:47:44 -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
6b715e4293 am 9e504d5d: am 8585162b: am a283e6e3: Use curly quotes and apostrophes 
* commit '9e504d5d2fd2333ef52fa7049fa0f60e59637d9c':
  Use curly quotes and apostrophes
 2015-05-01 21:06:02 +00:00
Maurice Lam
9e504d5d2f am 8585162b: am a283e6e3: Use curly quotes and apostrophes 
* commit '8585162ba3b0bfea06f297653150d1ad8cba7e6b':
  Use curly quotes and apostrophes
 2015-05-01 20:58:10 +00: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
29a2975826 am 2cb2a700: am 30431a4d: am 0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev 
* commit '2cb2a700cfb6ef5110a47ade840b690b21afe8ab':
  ApnEditor changes to support bearer as a bitmask.
 2015-05-01 17:14:59 +00:00
Sudheer Shanka
a6b606ec86 am eb1a58aa: am 2a549b66: am 0488dc97: Add MDM app name under "Work" in Accounts section of Settings. 
* commit 'eb1a58aa337d12a712ed413920a9e8d9ddea68cb':
  Add MDM app name under "Work" in Accounts section of Settings.
 2015-05-01 17:14:58 +00:00