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

20150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jorim Jaggi
e8d8af2b46 Merge "Update fingerprint settings to spec" into mnc-dev 2015-04-30 23:54:33 +00:00
Jorim Jaggi
4dfcb8208c Update fingerprint settings to spec 
- Make it look like a sub settings activity, with back button
- Add disclaimer to describe what your fingerprint can be used for
- Update visuals and text for "Add fingerprint"
- Update related string

Bug: 20594955
Change-Id: I0adfcc743db386e0abf9cfdafff3d068ebc3b4bc
 2015-04-30 16:54:02 -07:00
Chris Craik
3401a652ef Merge "Increase clip debug string limit" into mnc-dev 2015-04-30 23:46:45 +00:00
Chris Craik
b5607c10c3 Increase clip debug string limit 
bug:19189024

Change-Id: I6c9969032d852c6724ceb977705169ec5b8d2a5b
 2015-04-30 16:46:02 -07:00
Fyodor Kupolov
da84bf8d2c am 729aa932: Merge "Fixed an issue with back key behavior" into mnc-dev 
* commit '729aa93255b85e37a1f74c61aecf73759299a20e':
  Fixed an issue with back key behavior
 2015-04-30 22:53:36 +00:00
Fyodor Kupolov
729aa93255 Merge "Fixed an issue with back key behavior" into mnc-dev 2015-04-30 22:41:13 +00:00
Yorke Lee
628a98c1df Rename default dialer to default phone app 
Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3
 2015-04-30 15:07:41 -07:00
Maurice Lam
d4933fa1c3 am 05a0336b: [WifiSetup] Use bullets in skip dialog 
* commit '05a0336bde84489db2700b8adfb8b0e415dc0932':
  [WifiSetup] Use bullets in skip dialog
 2015-04-30 22:04:32 +00:00
Maurice Lam
05a0336bde [WifiSetup] Use bullets in skip dialog 
Use BulletSpan (<li>) to show bullets in the dialog when the user
skips Wi-Fi in setup wizard.

Bug: 20706978
Change-Id: If81bdfad39dd9ffff7543cf531db40d813b57ec8
 2015-04-30 14:29:28 -07:00
Fyodor Kupolov
5654815695 Fixed an issue with back key behavior 
Create mHeaderView and set it as a pinned header, each time onActivityCreated
is called.

Bug: 20652673
Change-Id: Ia0e174f0686ac0abb601c591f3774c9152b785fa
 2015-04-30 12:02:47 -07:00
Maurice Lam
6327c3500b am c5310446: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev 
* commit 'c531044671ee80a1615013518778ddbf2793137a':
  [WifiSettings] Align text in Wi-Fi dialog
 2015-04-30 18:40:26 +00:00
Maurice Lam
d74b5e027d am 0063d51c: Merge "[WifiSetup] Show MAC address in footer" into mnc-dev 
* commit '0063d51ca5c69479cc49467f88bbf0072e0409db':
  [WifiSetup] Show MAC address in footer
 2015-04-30 18:40:25 +00:00
Maurice Lam
c531044671 Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev 2015-04-30 18:25:20 +00:00
Maurice Lam
0063d51ca5 Merge "[WifiSetup] Show MAC address in footer" into mnc-dev 2015-04-30 18:24:25 +00:00
Maurice Lam
40626ede38 am e0bf739d: Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 
* commit 'e0bf739ddf8781024578a879fa94bb5e6a71303b':
  [WifiSettings] Add progress bar when scanning
 2015-04-30 18:06:04 +00:00
Maurice Lam
e0bf739ddf Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 2015-04-30 17:53:20 +00:00