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
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
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
Maurice Lam
b5ba242188 am 7b31110f: am 6327c350: am c5310446: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev 
* commit '7b31110f25440fafe18c21f93a3f97d1d47b5970':
  [WifiSettings] Align text in Wi-Fi dialog
 2015-04-30 19:13:17 +00:00
Maurice Lam
3db807300b am 49a391e0: am d74b5e02: am 0063d51c: Merge "[WifiSetup] Show MAC address in footer" into mnc-dev 
* commit '49a391e03d6c48c34fe859f54b18b25136d7364b':
  [WifiSetup] Show MAC address in footer
 2015-04-30 19:13:15 +00: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
54c25de31d am 28031599: am 40626ede: am e0bf739d: Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev 
* commit '28031599cb71bf9e1bafaf5d82a47aa638c6fb97':
  [WifiSettings] Add progress bar when scanning
 2015-04-30 18:46:28 +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
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
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
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
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
Zoltan Szatmary-Ban
e03d88621c Forward WiFi settings intents to primary profile 
If an implicit WiFi settings intent is sent by a managed profile it is received
by the respective receiver in the primary profile.

Bug: 20005260
Change-Id: Ib46aafe1f5b5ef3acb8ed0d7e53898630ea2cb60
 2015-04-30 14:35:54 +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
Jim Miller
6fa63e1862 am f33e4e54: am 27f6e78a: am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit 'f33e4e54f97dc5bcbb1349dcfaee36840a0fe427':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:37:37 +00:00
Jim Miller
f33e4e54f9 am 27f6e78a: am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit '27f6e78a70b0f86d8e9a2c0a33c64e92ee912c74':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:22:19 +00:00
Jim Miller
27f6e78a70 am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit 'a8e22985d7866fb0528d85d9710a5bc0f482d91a':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:08:18 +00:00
Jim Miller
a8e22985d7 Automatically show IME when showing the fingerprint delete/rename dialog. 
Also a bit of code clean up.

Change-Id: I541a9c9ec031b7075f2812ef938adb9e591757c5
(cherry picked from commit 86ccad0bfd)
 2015-04-30 01:59:43 +00: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
Jeff Sharkey
bc83b5c9c0 am 0b10650c: am e77f0687: Returning to wizard, enable migration. 
* commit '0b10650ce5803eba272f84810fbd3dd15e3569c0':
  Returning to wizard, enable migration.
 2015-04-30 01:01:55 +00:00
Jim Miller
93390bfd11 Merge "Automatically show IME when showing the fingerprint delete/rename dialog." 2015-04-30 00:59:26 +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