PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,097 Commits 1 Branch 0 Tags
017bdceeb44aa55ec08033d004bba4f071844dc4
Commit Graph

8182 Commits

Author SHA1 Message Date
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
Sudheer Shanka
27ebb62592 am 1684582d: am c50b0424: am 48b1884a: Merge "Add MDM app label string." into mnc-dev 
* commit '1684582dede3dbe932cc2aa484fff25ff1206cd9':
  Add MDM app label string.
 2015-04-30 17:53:23 +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
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
31717d1720 am ca042aa8: am 8d4117fd: am 5982d17a: Merge "Settings: Do not disturb automatic rule updates." into mnc-dev 
* commit 'ca042aa8bda75a0163682c7bcd3c36f64249e3c5':
  Settings: Do not disturb automatic rule updates.
 2015-04-30 16:31:00 +00:00
Jason Monk
4c64d83bc8 am 1a1c7ca9: am f1039a79: am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev 
* commit '1a1c7ca9471df1327f28a850c9f6f523e46b748e':
  Handle no peeking in app info pages
 2015-04-30 16:30:59 +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
Maurice Lam
28c3f6bb71 [WifiSettings] Add progress bar when scanning 
Add a progress bar when the Wi-Fi screen is in a transient state,
like enabling, disabling Wi-Fi and scanning for network. This change
sets the progress bar as a pinned header at the top of the activity.

The pinned header container needs to be match parent so that the
progress bar can occupy the full width of the screen. If the header
view doesn't want to fill the width, then the header view *inside*
the container should be wrap_content.

Added an overloaded setPinnedHeader method that takes a layout
resource ID, and returns the view to the caller. This way the
inflater can set the parent property so that layout params will not
be ignored.

Bug: 17389577
Change-Id: I18d0eb7c72ad31d1c4b35a54789016c32c81fb93
 2015-04-29 22:38:22 -07:00
Jeff Sharkey
e02626c9ee am bc83b5c9: am 0b10650c: am e77f0687: Returning to wizard, enable migration. 
* commit 'bc83b5c9c01d102d65c9d2fbcf188527d48efd7c':
  Returning to wizard, enable migration.
 2015-04-30 01:15:27 +00:00
Maurice Lam
a81f9e4be2 [WifiSettings] Align text in Wi-Fi dialog 
The themes for Wi-Fi dialog in sw600dp is outdated and causing the
labels and text fields to be misaligned. This CL removes all the
related styles except for the one in value/styles.xml, so that all
screens use the same styles (the items and values in the styles were
all the same except for sw600dp which this CL fixes).

Bug: 20663443
Change-Id: I59a079c1a4cc1ae3e99d863cb24816e609e98109
 2015-04-29 17:49:52 -07:00
Jeff Sharkey
0b10650ce5 am e77f0687: Returning to wizard, enable migration. 
* commit 'e77f0687dd424ccfdc2b1061221c6c8ba4d6ac8d':
  Returning to wizard, enable migration.
 2015-04-30 00:48:17 +00:00
Jeff Sharkey
e77f0687dd Returning to wizard, enable migration. 
Bring primary storage migration back into the adoption flow, and
provide a path for long-lived notifications to re-launch into the
Settings app.  Also provide option to initiate migration if skipped
during wizard.  For now, estmiate migration size and time based on
a Class 10 card.

Follow other callback refactoring.

Bug: 19993667
Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91
 2015-04-29 17:24:12 -07:00
Maurice Lam
acd8beb50a am 558dc815: am afbcbf76: am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 
* commit '558dc81551dcece3967a02b1845907d3722bd844':
  [WifiSetup] Use default theme for Wi-Fi dialogs
 2015-04-29 18:57:31 +00:00
Maurice Lam
afbcbf7634 am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 
* commit '2add7d0d0528fd5823471dbe338f4b5b20773efb':
  [WifiSetup] Use default theme for Wi-Fi dialogs
 2015-04-29 18:25:45 +00:00
Maurice Lam
2add7d0d05 Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 2015-04-29 18:17:16 +00:00
John Spurlock
3bdf643a3d am 5cd144af: am 1e8a9f5f: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '5cd144afc66f99b4cd789286160fce38072a7d01':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:46:19 +00:00
John Spurlock
1e8a9f5fd3 am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:16:12 +00:00
Geoff Mendal
623cd8c293 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 14:07:34 +00:00
John Spurlock
0423aed775 Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 2015-04-29 14:02:55 +00:00
Geoff Mendal
185c8fd6da Import translations. DO NOT MERGE 
Change-Id: Ibbdc2e71ca955cc4cfc648b2f54d592cf5285725
Auto-generated-cl: translation import
 2015-04-29 09:01:14 -05:00
Geoff Mendal
3141270a1e Import translations. DO NOT MERGE 
Change-Id: If39a43ecd48ea382144660b0c47e864b014b239e
Auto-generated-cl: translation import
 2015-04-29 08:11:54 -05:00
Martijn Coenen
a570479c71 am 3ef56acd: am a0ee97f1: am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '3ef56acd622778f8f8582bb2fc0c27fcd6973809':
  New Tap & Pay UX.
 2015-04-29 08:04:15 +00:00
Martijn Coenen
a0ee97f196 am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '01d13c043a7d9f2aef357e17f2d6a36c678006e6':
  New Tap & Pay UX.
 2015-04-29 07:41:50 +00:00
Martijn Coenen
01d13c043a Merge "New Tap & Pay UX." into mnc-dev 2015-04-29 07:29:32 +00:00
Jeff Sharkey
033e3af21b am 9fd5ce62: am 6e86616d: am a16257db: Format as public/private; follow refactoring. 
* commit '9fd5ce625a1c85db2269030382da06fe056180a8':
  Format as public/private; follow refactoring.
 2015-04-29 05:52:56 +00:00
Jeff Sharkey
6e86616df7 am a16257db: Format as public/private; follow refactoring. 
* commit 'a16257dbd5599135320f4263a2cb438b7a469084':
  Format as public/private; follow refactoring.
 2015-04-29 05:29:52 +00:00
Jeff Sharkey
a16257dbd5 Format as public/private; follow refactoring. 
Offer to format an empty disk as public/private.

Bug: 19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
 2015-04-28 21:54:54 -07:00
Elliott Hughes
90f9bed6d4 am 28077b9c: Add Pacific/Noumea. 
* commit '28077b9cc86388f9b5dfa29a79a5a42c3d545d29':
  Add Pacific/Noumea.
 2015-04-29 01:43:09 +00:00
Jorim Jaggi
8f476cdace am 441ea80d: Add animation for fingerprint icon 
* commit '441ea80d0ac874955ca7a83ddb8d140ccf87f7ab':
  Add animation for fingerprint icon
 2015-04-29 01:41:14 +00:00
Maurice Lam
c36b61ea44 [WifiSetup] Use default theme for Wi-Fi dialogs 
Just use the default theme as the dialog doesn't require any
additional attributes to be specified. (Theme.Settings is setting
alertDialogTheme to Theme.AlertDialog as well).

This will allow the correct accent colors (among other theme
attributes) to be propagated to the dialog.

Bug: 20663720
Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
 2015-04-28 18:33:50 -07:00
Elliott Hughes
7e1bbeee65 am fae9ca8c: am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'fae9ca8cd505df1b97679f7bafd0621eb9ccf2ec':
  Add Pacific/Noumea.
 2015-04-28 21:53:31 +00:00
Elliott Hughes
fae9ca8cd5 am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'a9657f553d2db21f99f1129cb18490d7e2497b31':
  Add Pacific/Noumea.
 2015-04-28 21:33:52 +00:00
Elliott Hughes
28077b9cc8 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

(cherry-pick of 23ae8827c1bd86ec632eab42d067148f8b3452e8.)

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:59:54 -07:00
Elliott Hughes
23ae8827c1 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:35:25 -07:00
Jorim Jaggi
441ea80d0a Add animation for fingerprint icon 
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.

Bug: 20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
(cherry picked from commit 2c2a41669f)
 2015-04-28 19:20:59 +00:00
Jorim Jaggi
d2931b321c Merge "Add animation for fingerprint icon" 2015-04-28 19:20:50 +00:00
John Spurlock
8881120246 Settings: "No interruptions" -> "Total silence" 
Bug: 20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
 2015-04-28 15:36:50 +00:00
Sudheer Shanka
d188c68094 am f1fa3c7a: am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. 
* commit 'f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
  Update warning dialog on work profile deletion.
 2015-04-28 15:27:25 +00:00