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
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
Vinit Deshpande
c43f2c3e81
am fdb05f62
: (-s ours) am 0db72add
: am a03f330a
: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev
...
* commit 'fdb05f622135bb75a03d27bc73d95b42b5bee877':
Implement 'Available via Passpoint' feature [DO NOT MERGE]
2015-04-30 00:27:39 +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
Vinit Deshpande
fdb05f6221
am 0db72add
: am a03f330a
: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev
...
* commit '0db72add0ccd1b22b17161fe28c91c6e4671442a':
Implement 'Available via Passpoint' feature [DO NOT MERGE]
2015-04-30 00:16:28 +00:00
Vinit Deshpande
0db72add0c
am a03f330a
: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev
...
* commit 'a03f330af31714e44f67ca09cad66f91a8acbdd2':
Implement 'Available via Passpoint' feature [DO NOT MERGE]
2015-04-30 00:07:44 +00:00
Vinit Deshpande
a03f330af3
Merge "Implement 'Available via Passpoint' feature [DO NOT MERGE]" into mnc-dev
2015-04-29 23:51:57 +00:00
Fabrice Di Meglio
d3b0cafb83
am 3a2f1c53
: am f2536e87
: am b880f142
: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev
...
* commit '3a2f1c53492fb1966bcd17128d0662dcb590692b':
Add user selectable Default Browser feature - part 3
2015-04-29 21:52:09 +00:00
Fabrice Di Meglio
3a2f1c5349
am f2536e87
: am b880f142
: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev
...
* commit 'f2536e87c271b1c0c5eee3c4973d02c5211e6760':
Add user selectable Default Browser feature - part 3
2015-04-29 21:39:57 +00:00
Fabrice Di Meglio
f2536e87c2
am b880f142
: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev
...
* commit 'b880f1424bd743c6e0daa748ad9ba33030b0166c':
Add user selectable Default Browser feature - part 3
2015-04-29 21:27:24 +00:00
Fabrice Di Meglio
b880f1424b
Merge "Add user selectable Default Browser feature - part 3" into mnc-dev
2015-04-29 21:16:18 +00:00
Fabrice Di Meglio
d5f379304c
Add user selectable Default Browser feature - part 3
...
- fix preference summary
See bug #20144393
Change-Id: I4ecf46e69bf6bafda87dbc05b7c2f68bbca725cb
2015-04-29 14:12:19 -07:00
Vinit Deshpande
a2fd307651
Implement 'Available via Passpoint' feature [DO NOT MERGE]
...
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'
Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit 08b5b5d439
)
2015-04-29 19:32:50 +00: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
558dc81551
am afbcbf76
: am 2add7d0d
: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev
...
* commit 'afbcbf76340f5071424ebe079e385ff0904918cd':
[WifiSetup] Use default theme for Wi-Fi dialogs
2015-04-29 18:37:40 +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
Jason Monk
2e17d3f450
am a84e4761
: am d5e533e4
: am 28c3ba15
: Merge "Allow filtering system apps on most app lists" into mnc-dev
...
* commit 'a84e4761c77f95451fd77d9a952c59074f8ac964':
Allow filtering system apps on most app lists
2015-04-29 17:49:02 +00:00
Jason Monk
a84e4761c7
am d5e533e4
: am 28c3ba15
: Merge "Allow filtering system apps on most app lists" into mnc-dev
...
* commit 'd5e533e4bc12cc1db067262cefe35029701fa9b1':
Allow filtering system apps on most app lists
2015-04-29 17:37:34 +00:00
Jason Monk
d5e533e4bc
am 28c3ba15
: Merge "Allow filtering system apps on most app lists" into mnc-dev
...
* commit '28c3ba156f06e8f021ff6eabababe1a8627ff100':
Allow filtering system apps on most app lists
2015-04-29 17:23:35 +00:00
Jason Monk
28c3ba156f
Merge "Allow filtering system apps on most app lists" into mnc-dev
2015-04-29 17:10:35 +00:00
Jason Monk
fbaf4363f6
Allow filtering system apps on most app lists
...
Change-Id: If852adec4122aca3f11b0f894c0c44d12a75cc77
2015-04-29 13:02:08 -04:00
Andrei Kapishnikov
b0d1d2d53e
am ddfe8766
: am 56adc0db
: am 65037654
: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
...
* commit 'ddfe8766f4ee2dbb50859c1d2ab74992f709f596':
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
2015-04-29 14:59:03 +00:00
Andrei Kapishnikov
ddfe8766f4
am 56adc0db
: am 65037654
: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
...
* commit '56adc0db8174f08c33dd596db01aa641d8b63ffb':
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
2015-04-29 14:46:26 +00:00
Geoff Mendal
40e02a8d1c
am 4bf6f2be
: (-s ours) am 07b4d287
: (-s ours) am 623cd8c2
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '4bf6f2bee8f951d7900571694582fe85ab68e4ea':
Import translations. DO NOT MERGE
2015-04-29 14:46:20 +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
Geoff Mendal
4bf6f2bee8
am 07b4d287
: (-s ours) am 623cd8c2
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '07b4d28755fda78f273dc04579a03469df0b5d4f':
Import translations. DO NOT MERGE
2015-04-29 14:32:21 +00:00
John Spurlock
5cd144afc6
am 1e8a9f5f
: am 0423aed7
: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
...
* commit '1e8a9f5fd33a1f3e27921cf2a555c6bb199a9ffe':
Settings: "No interruptions" -> "Total silence"
2015-04-29 14:32:18 +00:00
Andrei Kapishnikov
56adc0db81
am 65037654
: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
...
* commit '65037654623752e2336044390946c59ac8cfa128':
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
2015-04-29 14:29:20 +00:00
Geoff Mendal
07b4d28755
am 623cd8c2
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '623cd8c293f9ea8974efe5caaca16a250bee0b00':
Import translations. DO NOT MERGE
2015-04-29 14:16:15 +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
Andrei Kapishnikov
6503765462
Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
2015-04-29 14:13:40 +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