OSDN Git Service
Sanket Padawe [Fri, 8 May 2015 23:41:30 +0000 (23:41 +0000)]
am
d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev
* commit '
d7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25':
Fix Signal strength display issue in Settings.
Sanket Padawe [Fri, 8 May 2015 23:32:48 +0000 (23:32 +0000)]
Merge "Fix Signal strength display issue in Settings." into mnc-dev
Sanket Padawe [Fri, 8 May 2015 23:31:35 +0000 (16:31 -0700)]
Fix Signal strength display issue in Settings.
Bug:
20821065
Change-Id: Ib98e7b80f5ee331ef0adb8df706bb697f9fff008
John Spurlock [Fri, 8 May 2015 22:35:42 +0000 (22:35 +0000)]
am
3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
* commit '
3c4bf826e704a42ce3d460537a0adf6263c2d503':
Settings: Use new EventInfo.ANY_CALENDAR constant.
John Spurlock [Fri, 8 May 2015 22:35:41 +0000 (22:35 +0000)]
am
7b998977: Merge "Settings: New DND access settings page." into mnc-dev
* commit '
7b9989773b1b6ffc415300c095bde51b5c90ff71':
Settings: New DND access settings page.
John Spurlock [Fri, 8 May 2015 22:29:09 +0000 (22:29 +0000)]
Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)]
Merge "Settings: New DND access settings page." into mnc-dev
Chad Brubaker [Fri, 8 May 2015 22:14:04 +0000 (22:14 +0000)]
am
69fb78e2: Merge "Track keystore password method changes" into mnc-dev
* commit '
69fb78e27b61c91d98a9c90a4680e35e72d0e73c':
Track keystore password method changes
Chad Brubaker [Fri, 8 May 2015 21:51:03 +0000 (21:51 +0000)]
Merge "Track keystore password method changes" into mnc-dev
John Spurlock [Fri, 8 May 2015 21:37:23 +0000 (17:37 -0400)]
Settings: Use new EventInfo.ANY_CALENDAR constant.
Bug:
20064962
Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3
Jason Monk [Fri, 8 May 2015 19:58:26 +0000 (19:58 +0000)]
am
173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
* commit '
173d658babe0bcb6add829d1621550cebeed2296':
Button that goes from app info details to app info
Jason Monk [Fri, 8 May 2015 19:47:27 +0000 (19:47 +0000)]
Merge "Button that goes from app info details to app info" into mnc-dev
Jason Monk [Fri, 8 May 2015 19:03:14 +0000 (15:03 -0400)]
Button that goes from app info details to app info
This info button is shown on the header of all app detail pages.
This button is hidden when coming from app info, to avoid allowing
users to go in circles.
Since app notification details had a settings button where the new
info button goes, the app notification settings will move down to
be a preference (this matches the usage access screen UX).
Also fix a bug in launching app notification settings for managed
profiles.
Bug:
20633669
Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0
Jason Monk [Fri, 8 May 2015 18:21:47 +0000 (18:21 +0000)]
am
9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
* commit '
9e1ea4b121d200e4338bf271e832c3f2e3613b20':
Choose correct network template for data history
Jason Monk [Fri, 8 May 2015 18:13:13 +0000 (18:13 +0000)]
Merge "Choose correct network template for data history" into mnc-dev
John Spurlock [Thu, 7 May 2015 21:45:43 +0000 (17:45 -0400)]
Settings: New DND access settings page.
- New advanced notification settings subpage for managing apps
that have requested the ability to manage notification policy.
- Create new "Advanced" section at the bottom of notification settings
for this and the existing Notification access settings page.
Bug:
18298798
Change-Id: Ib415e634980d37d6492799f67a6619700ee2a01c
Jason Monk [Fri, 8 May 2015 17:24:09 +0000 (17:24 +0000)]
am
4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
* commit '
4d1efa0e6da65f20f1baf827abee97df6551c277':
Fix crash on unistalling app
Jason Monk [Fri, 8 May 2015 17:16:41 +0000 (17:16 +0000)]
Merge "Fix crash on unistalling app" into mnc-dev
Jason Monk [Fri, 8 May 2015 15:37:01 +0000 (11:37 -0400)]
Fix crash on unistalling app
Only update the battery info if the app exists.
Bug:
20918104
Change-Id: I61481be53cfc72d49868f14a940a09c83f7a5cc2
Jason Monk [Fri, 8 May 2015 15:24:03 +0000 (11:24 -0400)]
Choose correct network template for data history
Bug:
19921796
Change-Id: I90376ed0314c47fcbee21c81b85f60d3cc3312a6
Jason Monk [Fri, 8 May 2015 14:59:42 +0000 (14:59 +0000)]
am
7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
* commit '
7ef58584e66e077ee7930ae100cc1a1915cd7b1a':
Fix crash in settings -> apps after adding profile
Jason Monk [Fri, 8 May 2015 14:48:54 +0000 (14:48 +0000)]
Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
Jason Monk [Fri, 8 May 2015 14:18:48 +0000 (10:18 -0400)]
Fix crash in settings -> apps after adding profile
Bug:
20652411
Change-Id: I766f99ee520ab106ec2765c77057042ed14e8fed
Erik Kline [Fri, 8 May 2015 09:23:38 +0000 (09:23 +0000)]
am
c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
* commit '
c0df6623a0eb0ebbdb965111269b96d9f4a4b976':
Add settings for persisting the mobile data connection.
Erik Kline [Fri, 8 May 2015 08:12:19 +0000 (08:12 +0000)]
Merge "Add settings for persisting the mobile data connection." into mnc-dev
Yohei Yukawa [Thu, 7 May 2015 23:28:11 +0000 (23:28 +0000)]
am
6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
* commit '
6a03d11328da5f2ce7c685f613d706fbfa589fdd':
Making the behavior deterministic when the IME picker is shown.
Yohei Yukawa [Thu, 7 May 2015 23:20:26 +0000 (23:20 +0000)]
Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
Seigo Nonaka [Tue, 5 May 2015 00:31:00 +0000 (17:31 -0700)]
Making the behavior deterministic when the IME picker is shown.
In the language & input settings, the auxiliary IME subtypes have been
hidden since they should not be a default. With Id156c85535a22, now we
can explicitly control the behavior of input method picker.
Note the this CL should not change any user visible behaviors.
Bug:
20763994
Change-Id: I9f797d07ba02363fab58ceb9aecb3cc11fbc407e
Chad Brubaker [Thu, 7 May 2015 17:29:18 +0000 (10:29 -0700)]
Track keystore password method changes
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
Fabrice Di Meglio [Thu, 7 May 2015 22:47:47 +0000 (22:47 +0000)]
am
99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
* commit '
99245d13e9ac2fabe1300929a3a669f1d186070e':
Add user selectable Default Browser feature - part 4
Fabrice Di Meglio [Thu, 7 May 2015 22:37:05 +0000 (22:37 +0000)]
Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
Fabrice Di Meglio [Thu, 7 May 2015 18:52:04 +0000 (11:52 -0700)]
Add user selectable Default Browser feature - part 4
- refresh Browser list depending on package installation / removal
See bug #
20144393
Change-Id: I529f6e0bd8b5bd4cae1dea9479acfca9cf9a6b26
Raju Yadav [Thu, 7 May 2015 21:09:22 +0000 (21:09 +0000)]
am
92331e51: Avoid SElinux denial accessing IMEI information
* commit '
92331e51eadb717a15626083b52a820c236dc1cd':
Avoid SElinux denial accessing IMEI information
Raju Yadav [Tue, 5 May 2015 07:01:39 +0000 (09:01 +0200)]
Avoid SElinux denial accessing IMEI information
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:
W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
denied { search } for name="com.android.settings" \
dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
op_res=-13 ppid=319 pcomm="main" tgid=1589\
tgcomm="m.android.phone"
Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.
It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.
(cherrypicked from commit
b2ad5bb522e378a7ef63e5e9f6329217d8f2f0c2)
Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
Jason Monk [Thu, 7 May 2015 20:45:40 +0000 (20:45 +0000)]
am
97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
* commit '
97cebec1a0975e1a85a4bbb0024e403c655722a8':
Detect uninstalled apps during resume
Jason Monk [Thu, 7 May 2015 20:36:17 +0000 (20:36 +0000)]
Merge "Detect uninstalled apps during resume" into mnc-dev
Jason Monk [Thu, 7 May 2015 17:41:28 +0000 (13:41 -0400)]
Detect uninstalled apps during resume
Also cleanup disabled apps check while here
Bug:
20651305
Change-Id: I5ba8f6e7aee817842bb2ae2ee825647089bcacd3
Jason Monk [Thu, 7 May 2015 20:07:46 +0000 (20:07 +0000)]
am
f4db340d: Consistently use weight to get average mem usage
* commit '
f4db340daeb50572d7e0ab12f4745affae8b567f':
Consistently use weight to get average mem usage
Jason Monk [Thu, 7 May 2015 19:06:48 +0000 (15:06 -0400)]
Consistently use weight to get average mem usage
Rather than just for the labels...
Also update bg mem to be converted to the same memory scale for
the bars. Also undo some bad average calculations that only made
things worse.
Bug:
20694769
Change-Id: I676803bf76d336355441891e768ba3c228dbfbca
Jason Monk [Thu, 7 May 2015 18:54:51 +0000 (18:54 +0000)]
am
e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
* commit '
e2d63fef3ccbfd3001b7e794b3ee1203fc1c77af':
Updates/fixes to memory settings
Jason Monk [Thu, 7 May 2015 18:54:50 +0000 (18:54 +0000)]
am
68d6d465: Merge "Always start storage list sorting by size" into mnc-dev
* commit '
68d6d465746a6dcec6f7e0a44fadae19b886fa42':
Always start storage list sorting by size
Jason Monk [Thu, 7 May 2015 17:45:39 +0000 (17:45 +0000)]
Merge "Updates/fixes to memory settings" into mnc-dev
Jason Monk [Thu, 7 May 2015 16:44:09 +0000 (12:44 -0400)]
Updates/fixes to memory settings
- Update memory states to be Good performance, Ok performance, etc.
- Update header info to be based on history rather than
instantaneous
- Color memory bar differently based on state
- Fix run frequency bucketing to be correct
- Show dialog for selecting duration, and fix duration selection
- Update process naming to:
- If process name is "anything:xxxx" then show "Xxxx"
- If process name is "com.app.package.interface" then show "Interface"
- If process name is the package name then show the app name
- Otherwise fallback to the process name string
Bug:
20694769
Change-Id: Ic1fab28bfd2422bde84dd10bd305a4cc34be98cf
Jason Monk [Thu, 7 May 2015 17:35:38 +0000 (17:35 +0000)]
Merge "Always start storage list sorting by size" into mnc-dev
Alan Viverette [Thu, 7 May 2015 17:30:02 +0000 (17:30 +0000)]
am
840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
* commit '
840002d66c19af51618489850c7ccea465cd23f8':
Use theme colors in battery stats widget
Jason Monk [Thu, 7 May 2015 17:09:48 +0000 (13:09 -0400)]
Always start storage list sorting by size
Bug:
20075068
Change-Id: I50a39decaa61bf7c3489243924c0d3928c4fe2ce
Alan Viverette [Thu, 7 May 2015 16:57:09 +0000 (16:57 +0000)]
Merge "Use theme colors in battery stats widget" into mnc-dev
Jason Monk [Thu, 7 May 2015 13:17:43 +0000 (13:17 +0000)]
am
59de14e2: Merge "Fix app headers in settings" into mnc-dev
* commit '
59de14e2197e84baf663fa700ee7b2323fbaef6b':
Fix app headers in settings
Jason Monk [Thu, 7 May 2015 13:08:28 +0000 (13:08 +0000)]
Merge "Fix app headers in settings" into mnc-dev
Jeff Brown [Thu, 7 May 2015 01:41:10 +0000 (01:41 +0000)]
am
92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
* commit '
92d6b09ebbb7c810a52f1a69a376d06277820a4b':
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
John Spurlock [Thu, 7 May 2015 00:11:17 +0000 (00:11 +0000)]
am
673db350: Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev
* commit '
673db350c3315df2c3a0ef70092a1d63fd8021c7':
Settings: Add setting to mute wireless charging sound.
Jeff Brown [Tue, 5 May 2015 20:48:46 +0000 (13:48 -0700)]
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug:
20641986
Change-Id: Ief6c0d6048abc9411f1e9930cec1edde4a582cf9
John Spurlock [Wed, 6 May 2015 22:49:03 +0000 (22:49 +0000)]
Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev
Alan Viverette [Wed, 6 May 2015 22:16:51 +0000 (15:16 -0700)]
Use theme colors in battery stats widget
Bug:
20633519
Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc
Sanket Padawe [Wed, 6 May 2015 22:14:28 +0000 (22:14 +0000)]
am
39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev
* commit '
39ac24df7913546d8f2db3f17bc3d3dca5638e4a':
Fix SimStatus crash in Settings.
Sanket Padawe [Wed, 6 May 2015 22:04:11 +0000 (22:04 +0000)]
Merge "Fix SimStatus crash in Settings." into mnc-dev
John Spurlock [Wed, 6 May 2015 21:42:30 +0000 (17:42 -0400)]
Settings: Add setting to mute wireless charging sound.
Bug:
19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
Sanket Padawe [Wed, 6 May 2015 21:07:20 +0000 (21:07 +0000)]
am
b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev
* commit '
b7a1b5c310ccb33b6999041f2ba1f99d98cc0282':
Saved networks summary strings.
Sanket Padawe [Wed, 6 May 2015 20:59:10 +0000 (20:59 +0000)]
Merge "Saved networks summary strings." into mnc-dev
Jason Monk [Wed, 6 May 2015 20:00:25 +0000 (16:00 -0400)]
Fix app headers in settings
Use SettingsPreferenceFragment's method for pinned headers where
possible, and add a frame within the fragment for them to live in
otherwise so that this view doesn't end up on the activity.
Bug:
20886475
Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
Sudheer Shanka [Wed, 6 May 2015 16:54:12 +0000 (16:54 +0000)]
am
5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
* commit '
5a817c6bcc14033b08ad8ddec10625e4352ef194':
Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Sudheer Shanka [Wed, 6 May 2015 15:35:22 +0000 (16:35 +0100)]
Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Change-Id: I55c169b280d7302c9e387f80be82ef47132798c2
Sanket Padawe [Wed, 6 May 2015 02:00:39 +0000 (19:00 -0700)]
Fix SimStatus crash in Settings.
Bug:
20862873
Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
John Spurlock [Wed, 6 May 2015 00:39:41 +0000 (00:39 +0000)]
am
0d2a8d20: Settings: Migrate calls & messages priority settings.
* commit '
0d2a8d204bb7d62834d51393a1d4a6ddaa7753f8':
Settings: Migrate calls & messages priority settings.
John Spurlock [Tue, 5 May 2015 22:31:27 +0000 (18:31 -0400)]
Settings: Migrate calls & messages priority settings.
Bug:
18635172
Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd
Casper Bonde [Tue, 5 May 2015 18:46:43 +0000 (18:46 +0000)]
am
faadcd60: Settings UI for SIM access profile (1/2)
* commit '
faadcd60e7ab8fa6eb9b5be7be907129bd3f8575':
Settings UI for SIM access profile (1/2)
Robin Lee [Tue, 5 May 2015 18:45:57 +0000 (18:45 +0000)]
am
3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev
* commit '
3342d762e98996549aa5cae02ccdc3238eb3a33d':
VPN: Convert current-context IPCs to user context
Brian Colonna [Tue, 5 May 2015 18:45:55 +0000 (18:45 +0000)]
am
229d06a8: Removed some dead Face Unlock code.
* commit '
229d06a83943a2c924d9c06e0f31d71e5e8801b9':
Removed some dead Face Unlock code.
John Spurlock [Tue, 5 May 2015 18:45:44 +0000 (18:45 +0000)]
am
42ae11d4: Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev
* commit '
42ae11d4d58cbe09dbbd377a4c3e2760ffa3034e':
Settings: Remove zenswitch from DND settings page.
John Spurlock [Tue, 5 May 2015 18:45:43 +0000 (18:45 +0000)]
am
a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev
* commit '
a924f3d6bbd3b304d962a76f75b3f91567ee045b':
Settings: Calendar event zen rule string updates.
Zoltan Szatmary-Ban [Tue, 5 May 2015 18:45:40 +0000 (18:45 +0000)]
am
aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev
* commit '
aea57babc0ced100995076caf3284c89a4a2aa11':
Forward WiFi settings intents to primary profile
Casper Bonde [Tue, 5 May 2015 05:04:29 +0000 (22:04 -0700)]
Settings UI for SIM access profile (1/2)
Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
Robin Lee [Tue, 5 May 2015 15:34:41 +0000 (15:34 +0000)]
Merge "VPN: Convert current-context IPCs to user context" into mnc-dev
Brian Colonna [Fri, 1 May 2015 16:18:30 +0000 (12:18 -0400)]
Removed some dead Face Unlock code.
I checked to see if any dead Face Unlock code remains in settings. Most of it
has been removed, but I did find some strings and an xml file that can be
removed.
Bug:
16139545
Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
John Spurlock [Tue, 5 May 2015 14:42:15 +0000 (14:42 +0000)]
Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev
John Spurlock [Tue, 5 May 2015 14:42:01 +0000 (14:42 +0000)]
Merge "Settings: Calendar event zen rule string updates." into mnc-dev
John Spurlock [Tue, 5 May 2015 13:59:26 +0000 (09:59 -0400)]
Settings: Calendar event zen rule string updates.
- Remove Attendance option.
- Use new reply value, tweak wording and summaries.
Bug:
20064962
Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3
John Spurlock [Tue, 5 May 2015 11:32:31 +0000 (07:32 -0400)]
Settings: Remove zenswitch from DND settings page.
- Remove the ability to view/modify zen mode/condition from
the Settings app.
Bug:
20064962
Change-Id: I8757780e5e9ef578e05203577871b9f513997798
Robin Lee [Fri, 1 May 2015 16:42:30 +0000 (17:42 +0100)]
VPN: Convert current-context IPCs to user context
These fetch info for the wrong user, which may be either wrong or worse
wholly nonexistent.
Bug:
20747154
Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
Zoltan Szatmary-Ban [Tue, 5 May 2015 10:07:06 +0000 (10:07 +0000)]
Merge "Forward WiFi settings intents to primary profile" into mnc-dev
Prerepa Viswanadham [Tue, 5 May 2015 01:16:11 +0000 (01:16 +0000)]
am
f09497a2: Merge changes from topic \'mwd-merge-050415\' into mnc-dev
* commit '
f09497a2a702484a78b9462fc6d10eb3dc5c430d':
DO NOT MERGE - Disable data sim selection when phone call is going on.
Bluetooth: HID: Use proper values of connection status
Sanket Padawe [Tue, 5 May 2015 01:14:33 +0000 (18:14 -0700)]
Saved networks summary strings.
Bug:
20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87
Prerepa Viswanadham [Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)]
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
Merge commit '
ab489de' into merge_try2
Merge commit '
dd796e8' into merge_try2
Yorke Lee [Tue, 5 May 2015 01:04:15 +0000 (01:04 +0000)]
am
3066f832: Merge "Rename default dialer to default phone app" into mnc-dev
* commit '
3066f832435af08bbc2ed5fcef45228d5ff86e33':
Rename default dialer to default phone app
Yorke Lee [Tue, 5 May 2015 00:22:12 +0000 (00:22 +0000)]
Merge "Rename default dialer to default phone app" into mnc-dev
Jason Monk [Mon, 4 May 2015 18:59:15 +0000 (18:59 +0000)]
am
0ab13b83: Merge "Add high power whitelist for apps" into mnc-dev
* commit '
0ab13b8326d6f31caff922fd95828254cb95a618':
Add high power whitelist for apps
Jason Monk [Mon, 4 May 2015 18:50:19 +0000 (18:50 +0000)]
Merge "Add high power whitelist for apps" into mnc-dev
Jason Monk [Wed, 29 Apr 2015 16:46:42 +0000 (12:46 -0400)]
Add high power whitelist for apps
- Strings not final!
- New UX for power usage details (more preferency)
- Add high power apps list shows on/off and screen to
change (when possible)
- Link from power usage summary to high power list
- Link from advanced apps to high power list
Bug:
19991702
Change-Id: I97c927ed82d3b89041e4429b427508545763d66c
Geoff Mendal [Mon, 4 May 2015 14:12:37 +0000 (14:12 +0000)]
am
32ba436b: (-s ours) Import translations. DO NOT MERGE
* commit '
32ba436b0b8b955874dd2797a4c317951385fcde':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 13:18:18 +0000 (06:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c
Auto-generated-cl: translation import
Prerepa Viswanadham [Sat, 2 May 2015 01:39:38 +0000 (18:39 -0700)]
Merge commit '
ab489de' into merge_try2
Prerepa Viswanadham [Sat, 2 May 2015 01:39:00 +0000 (18:39 -0700)]
Merge commit '
dd796e8' into merge_try2
Change-Id: I7237d936e2eea39f5d4401db06aed6cb3a3dc426
Maurice Lam [Fri, 1 May 2015 20:47:05 +0000 (20:47 +0000)]
am
a283e6e3: Use curly quotes and apostrophes
* commit '
a283e6e325aeae794fb04e60c38431721742b622':
Use curly quotes and apostrophes
Maurice Lam [Thu, 30 Apr 2015 19:26:39 +0000 (12:26 -0700)]
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
Amit Mahajan [Fri, 1 May 2015 16:52:08 +0000 (16:52 +0000)]
am
0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
* commit '
0255f595bd5ffbf39601296ac708130fccfc02ed':
ApnEditor changes to support bearer as a bitmask.
Sudheer Shanka [Fri, 1 May 2015 16:52:07 +0000 (16:52 +0000)]
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.
Amit Mahajan [Fri, 1 May 2015 16:49:41 +0000 (16:49 +0000)]
Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
Sudheer Shanka [Thu, 30 Apr 2015 11:18:19 +0000 (12:18 +0100)]
Add MDM app name under "Work" in Accounts section of Settings.
Bug:
20024761
Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262
Erik Kline [Thu, 30 Apr 2015 03:58:08 +0000 (12:58 +0900)]
Add settings for persisting the mobile data connection.
Change-Id: I9b92104893e860e2beb63ac86d417419699c085b
Amit Mahajan [Thu, 16 Apr 2015 17:01:25 +0000 (10:01 -0700)]
ApnEditor changes to support bearer as a bitmask.
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215