PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,966 Commits 1 Branch 0 Tags
a99b430df964ba69484a24a11f050f5607690b44
Commit Graph

19966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
bcc40fe5d1 am da84bf8d: am 729aa932: Merge "Fixed an issue with back key behavior" into mnc-dev 
* commit 'da84bf8d2ca3c70dd0cd30abc027ebaec758fb5f':
  Fixed an issue with back key behavior
 2015-04-30 23:03:43 +00: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
Maurice Lam
688319c6ef am d4933fa1: am 05a0336b: [WifiSetup] Use bullets in skip dialog 
* commit 'd4933fa1c3131c4a28f84a9eb61943bb9cf92638':
  [WifiSetup] Use bullets in skip dialog
 2015-04-30 22:20:43 +00: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
7b31110f25 am 6327c350: am c5310446: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev 
* commit '6327c3500b5928e0a7438a8a4728f7f2639fcec5':
  [WifiSettings] Align text in Wi-Fi dialog
 2015-04-30 18:58:41 +00:00
Maurice Lam
49a391e03d am d74b5e02: am 0063d51c: Merge "[WifiSetup] Show MAC address in footer" into mnc-dev 
* commit 'd74b5e027d2385e2d47286f4907ed3a0ec02511a':
  [WifiSetup] Show MAC address in footer
 2015-04-30 18:58:39 +00: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
28031599cb am 40626ede: am e0bf739d: Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 
* commit '40626ede38c625a34443a2b8f8634e031ff74118':
  [WifiSettings] Add progress bar when scanning
 2015-04-30 18:30:01 +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
Sudheer Shanka
1684582ded am c50b0424: am 48b1884a: Merge "Add MDM app label string." into mnc-dev 
* commit 'c50b0424e0027615b576c3dc7b122ae49b88f09f':
  Add MDM app label string.
 2015-04-30 17:38:42 +00:00
Sudheer Shanka
c50b0424e0 am 48b1884a: Merge "Add MDM app label string." into mnc-dev 
* commit '48b1884a4ae458b5861b4a063d723ed60edd157c':
  Add MDM app label string.
 2015-04-30 17:25:05 +00:00
Maurice Lam
572eb42e1d [WifiSetup] Show MAC address in footer 
Show the MAC address in footer so that advanced users can configure
their router whitelist etc.

Bug: 6939795
Change-Id: I858d21fb68f67f74e5b7e3a1960ea4d7966acb29
 2015-04-30 10:22:40 -07:00
Sudheer Shanka
48b1884a4a Merge "Add MDM app label string." into mnc-dev 2015-04-30 17:08:50 +00:00
John Spurlock
ca042aa8bd am 8d4117fd: am 5982d17a: Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 
* commit '8d4117fd2f930703a25dcbfb9d3731f7c47d558c':
  Settings: Do not disturb automatic rule updates.
 2015-04-30 16:16:15 +00:00
Jason Monk
1a1c7ca947 am f1039a79: am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev 
* commit 'f1039a7902de7addc1292818e920dbe412ee9c70':
  Handle no peeking in app info pages
 2015-04-30 16:16:03 +00:00
John Spurlock
8d4117fd2f am 5982d17a: Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 
* commit '5982d17a2623aa6ef7597acb43738d92803c7b43':
  Settings: Do not disturb automatic rule updates.
 2015-04-30 16:03:28 +00:00
John Spurlock
5982d17a26 Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 2015-04-30 15:45:57 +00:00
Jason Monk
f1039a7902 am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev 
* commit 'd527f420860e8dfaa7fd87d0c53220fcd87ec5b6':
  Handle no peeking in app info pages
 2015-04-30 15:45:30 +00:00
Jason Monk
d527f42086 Merge "Handle no peeking in app info pages" into mnc-dev 2015-04-30 15:33:39 +00:00
John Spurlock
f57bad7d5b Settings: Do not disturb automatic rule updates. 
- Remove FAB for adding rules, move to last preference.
 - Add first-class event condition type and config sub-page.
 - Always show radio buttons when adding rules.
 - Add new data model for event rules.
 - Add stub condition provider for event rules (always false for now).
 - Add rule-type icons to rule preference rows.

Bug: 20064962
Change-Id: Id5acde371eb2e7d22b1f195459897614db5ba80a
 2015-04-30 11:28:27 -04:00
Jason Monk
25f9e326ab Handle no peeking in app info pages 
Bug: 20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
 2015-04-30 11:27:27 -04:00
Sudheer Shanka
507abf8fc7 Add MDM app label string. 
Bug: 20024761
Change-Id: I05480d36a99864653ba2eceb3561b5da242898e6
 2015-04-30 15:14:30 +01:00