OSDN Git Service
Alex Chau [Thu, 18 Jun 2015 17:22:23 +0000 (17:22 +0000)]
am
cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
* commit '
cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
Alex Chau [Thu, 18 Jun 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:11:49 +0000 (16:11 +0000)]
am
ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
* commit '
ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
Revert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 15:54:55 +0000 (15:54 +0000)]
Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:44:25 +0000 (15:44 +0000)]
Revert "Accounts -> Account sync"
This reverts commit
43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b.
Bug:
21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
Jason Monk [Thu, 18 Jun 2015 15:41:36 +0000 (15:41 +0000)]
am
1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
* commit '
1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
Remove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 15:41:35 +0000 (15:41 +0000)]
am
58f6728e: Allow give/take in app version/disabled fields
* commit '
58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
Allow give/take in app version/disabled fields
Junda Liu [Thu, 18 Jun 2015 15:41:33 +0000 (15:41 +0000)]
am
2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
* commit '
2c55f738c4336a3f379f94f4142c20a473ae3a9a':
Don't show SIM lock Setting if carrier config hides it.
Jason Monk [Thu, 18 Jun 2015 15:31:22 +0000 (15:31 +0000)]
Merge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:06:18 +0000 (11:06 -0400)]
Remove battery history graph from details screen
Bug:
21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
Alex Chau [Fri, 12 Jun 2015 10:45:08 +0000 (11:45 +0100)]
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug:
19307118
Bug:
17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Jason Monk [Thu, 18 Jun 2015 14:36:39 +0000 (10:36 -0400)]
Allow give/take in app version/disabled fields
Switch to wrap_content so if one view is smaller, the other
can use its space.
Bug:
21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
Junda Liu [Wed, 17 Jun 2015 22:50:59 +0000 (22:50 +0000)]
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 17:15:34 +0000 (10:15 -0700)]
Don't show SIM lock Setting if carrier config hides it.
Bug: b/
19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
Jason Monk [Wed, 17 Jun 2015 20:41:36 +0000 (20:41 +0000)]
am
f8577c68: Merge "Support disabled until used apps" into mnc-dev
* commit '
f8577c68afbf4965211ca99233f7c5e40560e566':
Support disabled until used apps
Jason Monk [Wed, 17 Jun 2015 20:41:34 +0000 (20:41 +0000)]
am
2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
* commit '
2ab427010ae16af8756347cefac6350ce83041e8':
Fix accessibility for empty list on notification access
Jason Monk [Wed, 17 Jun 2015 20:31:26 +0000 (20:31 +0000)]
Merge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:31:16 +0000 (20:31 +0000)]
Merge "Fix accessibility for empty list on notification access" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 19:42:01 +0000 (15:42 -0400)]
Fix accessibility for empty list on notification access
Bug:
21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
Makoto Onuki [Wed, 17 Jun 2015 17:57:56 +0000 (17:57 +0000)]
am
9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
* commit '
9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
Don't crash on NameNotFoundException
Makoto Onuki [Wed, 17 Jun 2015 17:46:49 +0000 (17:46 +0000)]
Merge "Don't crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 17:13:15 +0000 (10:13 -0700)]
Don't crash on NameNotFoundException
Just finish().
Bug
20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
Geoff Mendal [Wed, 17 Jun 2015 15:32:25 +0000 (15:32 +0000)]
am
2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2eb7ad2648e85f2474d271499ec43241264ca148':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 15:23:33 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 14:59:14 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
Jason Monk [Wed, 17 Jun 2015 13:37:31 +0000 (13:37 +0000)]
am
7fdb1478: RIP -night DO NOT MERGE
* commit '
7fdb1478728ed7eaab956da476540b3e9c97b9b3':
RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:17:31 +0000 (09:17 -0400)]
RIP -night DO NOT MERGE
Bug:
21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
Jason Monk [Wed, 17 Jun 2015 13:09:18 +0000 (13:09 +0000)]
am
7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
* commit '
7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
Guard against callbacks when no list view created
Jason Monk [Wed, 17 Jun 2015 13:01:27 +0000 (13:01 +0000)]
Merge "Guard against callbacks when no list view created" into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:31:44 +0000 (03:31 +0000)]
am
74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
* commit '
74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
Actually gracefully finish this time around.
Jeff Sharkey [Wed, 17 Jun 2015 03:23:58 +0000 (03:23 +0000)]
Merge "Actually gracefully finish this time around." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:11:44 +0000 (20:11 -0700)]
Actually gracefully finish this time around.
Also fix tinting on front-door icon.
Bug:
21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
Jim Miller [Wed, 17 Jun 2015 00:09:52 +0000 (00:09 +0000)]
am
4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
* commit '
4b60af78fa8b0c474c9aee0f03171867843d2838':
Fix issue with german translation of lock times
Jim Miller [Tue, 16 Jun 2015 23:59:36 +0000 (23:59 +0000)]
Merge "Fix issue with german translation of lock times" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:56:37 +0000 (23:56 +0000)]
am
4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
* commit '
4e42cbdba386a742b01871010ec8747e07471e29':
Gracefully finish when missing volume.
Jeff Sharkey [Tue, 16 Jun 2015 23:48:06 +0000 (23:48 +0000)]
Merge "Gracefully finish when missing volume." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:46:03 +0000 (16:46 -0700)]
Gracefully finish when missing volume.
Bug:
21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
Jim Miller [Tue, 16 Jun 2015 23:21:27 +0000 (16:21 -0700)]
Fix issue with german translation of lock times
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.
Fixes bug
21602326
Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
Brian Carlstrom [Tue, 16 Jun 2015 23:07:52 +0000 (23:07 +0000)]
am
94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
* commit '
94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
Brian Carlstrom [Tue, 16 Jun 2015 22:59:03 +0000 (22:59 +0000)]
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:36:06 +0000 (22:36 +0000)]
am
95b891af: Merge "Finish storage wizard theming." into mnc-dev
* commit '
95b891af7c77d51f6284e01467bd6323d3749068':
Finish storage wizard theming.
Makoto Onuki [Tue, 16 Jun 2015 22:36:05 +0000 (22:36 +0000)]
am
d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
* commit '
d91ddfeb16f3019807e2d0146f774975acef36bd':
Allow formatting when a partition is corrupt.
Jeff Sharkey [Tue, 16 Jun 2015 22:31:27 +0000 (22:31 +0000)]
Merge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 20:52:10 +0000 (13:52 -0700)]
Finish storage wizard theming.
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently. We're using our own navigation bar
and wholesale replacing the layout from upstream.
Fix text colors in night mode. Tell SystemUI when we're finished
with the wizard flow.
Bug:
21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
Makoto Onuki [Tue, 16 Jun 2015 22:27:08 +0000 (22:27 +0000)]
Merge "Allow formatting when a partition is corrupt." into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 17:40:44 +0000 (10:40 -0700)]
Allow formatting when a partition is corrupt.
Bug
21848166
Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f
Jason Monk [Tue, 16 Jun 2015 21:03:11 +0000 (21:03 +0000)]
am
e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
* commit '
e9ec307a057618ff40b9988684761a778f9301d4':
Remove theme setting DO NOT MERGE
Jason Monk [Tue, 16 Jun 2015 20:49:54 +0000 (20:49 +0000)]
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:45:22 +0000 (20:45 +0000)]
am
254e8aea: Merge "Update for shortcuts" into mnc-dev
* commit '
254e8aea22f36c90587315a58aeefda9683581eb':
Update for shortcuts
Jason Monk [Tue, 16 Jun 2015 20:40:50 +0000 (16:40 -0400)]
Remove theme setting DO NOT MERGE
Because it's just too incredibly useful...
Bug:
21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
Jason Monk [Tue, 16 Jun 2015 20:36:45 +0000 (20:36 +0000)]
Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:00:41 +0000 (15:00 -0400)]
Update for shortcuts
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
Jason Monk [Tue, 16 Jun 2015 20:18:30 +0000 (16:18 -0400)]
Support disabled until used apps
Bug:
21782239
Change-Id: I59bef6689a9efb74f64827026add0cbddc18cf53
Yorke Lee [Tue, 16 Jun 2015 20:08:30 +0000 (20:08 +0000)]
am
610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
* commit '
610413d307f0a65b26d2ffb04f8389c1fe568029':
Send broadcast when default dialer changes
Jason Monk [Tue, 16 Jun 2015 20:08:28 +0000 (20:08 +0000)]
am
d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
* commit '
d0eab40a573bd03aec558615c9f8806848ef11c8':
Don't show work apps in ignore optimizations list
Jason Monk [Tue, 16 Jun 2015 20:07:07 +0000 (20:07 +0000)]
am
455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
* commit '
455cea62ebd137dc1a2089709aa701715fdfe395':
Add warning for disabling usage access on prof owners
Sanket Padawe [Tue, 16 Jun 2015 20:06:46 +0000 (20:06 +0000)]
am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 20:06:44 +0000 (20:06 +0000)]
am
6e613472: Start all help intents as startActivityForResult
* commit '
6e61347242ea8d9ac0645b2669f222696c65eec6':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 20:06:29 +0000 (20:06 +0000)]
am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
744f2adb56ac0077a103c8e6e3b20f421eddc780':
Layout refinement for app lists
Yorke Lee [Tue, 16 Jun 2015 19:30:13 +0000 (19:30 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:26:40 +0000 (19:26 +0000)]
Merge "Don't show work apps in ignore optimizations list" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:11:41 +0000 (15:11 -0400)]
Guard against callbacks when no list view created
Bug:
21762925
Change-Id: If4bdaa6cf107c4b890a8ebeb56ba4ef222a340ad
Jason Monk [Tue, 16 Jun 2015 18:18:26 +0000 (14:18 -0400)]
Don't show work apps in ignore optimizations list
The setting is global, so we only ever need one of each app.
Bug:
21847753
Change-Id: Ib04061d87b9deb81a579ad110451f2f55ec7aeff
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add warning for disabling usage access on prof owners" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 13:10:00 +0000 (09:10 -0400)]
Add warning for disabling usage access on prof owners
Bug:
20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a
Sanket Padawe [Tue, 16 Jun 2015 15:24:04 +0000 (15:24 +0000)]
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 14:31:38 +0000 (10:31 -0400)]
Start all help intents as startActivityForResult
So that the receiver may verify identity if they so desire...
Bug:
21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
Jason Monk [Tue, 16 Jun 2015 13:17:01 +0000 (13:17 +0000)]
Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Fri, 12 Jun 2015 16:32:50 +0000 (12:32 -0400)]
Layout refinement for app lists
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug:
21727125
Bug:
21726922
Bug:
21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
Jeff Sharkey [Tue, 16 Jun 2015 05:16:50 +0000 (05:16 +0000)]
am
9a5550e9: Check new user restriction.
* commit '
9a5550e9e6efe211b03d067eae2689f6ef5eb2d1':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 04:57:43 +0000 (04:57 +0000)]
am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
Jeff Sharkey [Fri, 20 Mar 2015 18:25:22 +0000 (11:25 -0700)]
Check new user restriction.
Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:08:56 +0000 (21:08 -0700)]
More storage UI updates.
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug:
21756698,
20275574,
21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
Jim Miller [Tue, 16 Jun 2015 04:00:37 +0000 (04:00 +0000)]
am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 03:41:02 +0000 (20:41 -0700)]
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug
20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
Sean Francis-Lyon [Tue, 16 Jun 2015 01:32:02 +0000 (01:32 +0000)]
am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Sat, 13 Jun 2015 00:46:41 +0000 (17:46 -0700)]
show old legal text in backup settings if full data backup is disabled
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
Adrian Roos [Mon, 15 Jun 2015 23:56:53 +0000 (23:56 +0000)]
am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
bada978ec3eab48564c29eb4f8169e88975a2da0':
Use AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 20:32:58 +0000 (13:32 -0700)]
Use AssistUtils.getAssistInfo
Use consistent logic with SystemUI for determining
default assist component.
Bug:
21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
Amit Mahajan [Mon, 15 Jun 2015 22:29:00 +0000 (22:29 +0000)]
am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
be1b22e88ee24a9d53c1871da360cf7b56f4da0b':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:49:30 +0000 (19:49 +0000)]
am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
dddd589d8f0de00c192022ea9bd87f32a734343b':
Settings: Remove unreachable "Battery Info" screen.
John Spurlock [Mon, 15 Jun 2015 19:36:45 +0000 (19:36 +0000)]
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:24:16 +0000 (15:24 -0400)]
Settings: Remove unreachable "Battery Info" screen.
Bug:
21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
Dianne Hackborn [Mon, 15 Jun 2015 19:24:10 +0000 (19:24 +0000)]
am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
3f98c0ce510ba95f8ecb3d815a4e722002fcf9f2':
Fix issue #
21813831: Need API for asking to be added to power whitelist
Yorke Lee [Mon, 15 Jun 2015 19:11:05 +0000 (12:11 -0700)]
Send broadcast when default dialer changes
Bug:
21846308
Change-Id: Ic92c3e39fa23dc1f2e08aa5d1dd1b27835c325cf
Dianne Hackborn [Sat, 13 Jun 2015 01:13:54 +0000 (18:13 -0700)]
Fix issue #
21813831: Need API for asking to be added to power whitelist
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.
You can now launch the whitelist without specifying an app to just
get the regular UI.
Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
Geoff Mendal [Mon, 15 Jun 2015 15:48:55 +0000 (15:48 +0000)]
am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f4d7bd4f49077602c7d3fd096fe32b2b17f76797':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:11:59 +0000 (15:11 +0000)]
am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
49ecfcd690a73112024df188924892772408d170':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:05:33 +0000 (15:05 +0000)]
Merge "Fix bad theming on owner-info" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:58:50 +0000 (10:58 -0400)]
Fix bad theming on owner-info
Bug:
21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
Jason Monk [Mon, 15 Jun 2015 15:00:20 +0000 (15:00 +0000)]
am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
Geoff Mendal [Mon, 15 Jun 2015 14:57:05 +0000 (07:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
Jason Monk [Mon, 15 Jun 2015 14:51:28 +0000 (14:51 +0000)]
Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:45:46 +0000 (10:45 -0400)]
Don't auto-focus text fields in hotspot dialog
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.
Bug:
19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
Jason Monk [Mon, 15 Jun 2015 14:23:54 +0000 (14:23 +0000)]
am
6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
* commit '
6f229435367e6b5a775f42552be280fa35df1d56':
Handle switch of ssid to CharSequence (for spans)
OSDN Git Service
