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

20048 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
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
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
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
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
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
Amit Mahajan
2cb2a700cf am 30431a4d: am 0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev 
* commit '30431a4dbd6985014c87e4a8aca5d04761433e9f':
  ApnEditor changes to support bearer as a bitmask.
 2015-05-01 17:05:19 +00:00
Sudheer Shanka
eb1a58aa33 am 2a549b66: am 0488dc97: Add MDM app name under "Work" in Accounts section of Settings. 
* commit '2a549b66b0af543acf48fabed8e83837e1ea497d':
  Add MDM app name under "Work" in Accounts section of Settings.
 2015-05-01 17:05:18 +00: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
Jorim Jaggi
0ca222c3b0 am dd3324fe: am 6ac9046d: am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev 
* commit 'dd3324fe8a1bcd61046798a1ec21b347a1dd4b07':
  Update fingerprint settings to spec
 2015-05-01 01:34:44 +00:00
Chris Craik
0220e94fb5 am 5364910f: am e391e9c2: am 3401a652: Merge "Increase clip debug string limit" into mnc-dev 
* commit '5364910f2a26688548eb310e4643e8f726ea1d27':
  Increase clip debug string limit
 2015-05-01 01:34:42 +00:00
Fyodor Kupolov
372ecf2f4c am bcc40fe5: am da84bf8d: am 729aa932: Merge "Fixed an issue with back key behavior" into mnc-dev 
* commit 'bcc40fe5d1d6f0052221db216a73d54e8e6ba214':
  Fixed an issue with back key behavior
 2015-05-01 01:34:23 +00:00
Maurice Lam
7971fdb15b am 688319c6: am d4933fa1: am 05a0336b: [WifiSetup] Use bullets in skip dialog 
* commit '688319c6efdd2413cddf6534aba308700a1693b7':
  [WifiSetup] Use bullets in skip dialog
 2015-05-01 01:34:03 +00:00
Amit Mahajan
7e28221640 ApnEditor changes to support bearer as a bitmask. 
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
 2015-04-30 18:03:17 -07:00
Jorim Jaggi
dd3324fe8a am 6ac9046d: am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev 
* commit '6ac9046d84ea736cf7e96da4da6e92dbd1fc624a':
  Update fingerprint settings to spec
 2015-05-01 00:28:28 +00:00
Jorim Jaggi
6ac9046d84 am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev 
* commit 'e8d8af2b464df3815d1a02c370cf44a80cafd8e3':
  Update fingerprint settings to spec
 2015-05-01 00:07:47 +00:00
Chris Craik
5364910f2a am e391e9c2: am 3401a652: Merge "Increase clip debug string limit" into mnc-dev 
* commit 'e391e9c2371a648f5b22141a997426f9c3cc6bc5':
  Increase clip debug string limit
 2015-05-01 00:07:41 +00:00
Chris Craik
e391e9c237 am 3401a652: Merge "Increase clip debug string limit" into mnc-dev 
* commit '3401a652efdaee1558a78659994df262975fd8b4':
  Increase clip debug string limit
 2015-04-30 23:55:37 +00:00