OSDN Git Service
PauloftheWest [Wed, 27 Aug 2014 21:50:03 +0000 (21:50 +0000)]
am
7926eb04: am
caccf27e: am
d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
* commit '
7926eb04d94077d25d08697ea0c60e72eee506ac':
Applied Material Spec to Bluetooth pairing dialog.
PauloftheWest [Wed, 27 Aug 2014 21:50:02 +0000 (21:50 +0000)]
am
0b618179: am
fc4f23f0: am
6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev
* commit '
0b618179acb56e64d205d0aada50dda31889657a':
Changed VPN add icon to white.
Paul West [Wed, 27 Aug 2014 21:50:01 +0000 (21:50 +0000)]
am
cf2c55dd: am
49e2efc0: am
ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
* commit '
cf2c55dd1f0de8b5e91690ab3409fb4e553e8460':
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
PauloftheWest [Wed, 27 Aug 2014 21:36:37 +0000 (21:36 +0000)]
am
caccf27e: am
d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
* commit '
caccf27e3446a0e7029b1860ae4a92ce4142f355':
Applied Material Spec to Bluetooth pairing dialog.
PauloftheWest [Wed, 27 Aug 2014 21:36:36 +0000 (21:36 +0000)]
am
fc4f23f0: am
6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev
* commit '
fc4f23f0e7a9e871bac60d74e504a9696a0b038a':
Changed VPN add icon to white.
Paul West [Wed, 27 Aug 2014 21:36:35 +0000 (21:36 +0000)]
am
49e2efc0: am
ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
* commit '
49e2efc0f74d5ff0a8ec942e5fb3f04bb5f6ab0e':
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
PauloftheWest [Wed, 27 Aug 2014 20:42:57 +0000 (20:42 +0000)]
am
d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
* commit '
d0ec53e33360cfb5cf4c176920917ef109754f22':
Applied Material Spec to Bluetooth pairing dialog.
PauloftheWest [Wed, 27 Aug 2014 20:42:56 +0000 (20:42 +0000)]
am
6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev
* commit '
6213ba0ea107eabb6c9053c843c2c675ac03cfa4':
Changed VPN add icon to white.
Paul West [Wed, 27 Aug 2014 20:42:55 +0000 (20:42 +0000)]
am
ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
* commit '
ad280a9b0952ee8563dac8ee199685ef2de37600':
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
PauloftheWest [Wed, 27 Aug 2014 20:40:37 +0000 (20:40 +0000)]
Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 20:38:55 +0000 (20:38 +0000)]
Merge "Changed VPN add icon to white." into lmp-dev
Paul West [Wed, 27 Aug 2014 20:33:30 +0000 (20:33 +0000)]
Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
Paul West [Wed, 27 Aug 2014 20:31:38 +0000 (20:31 +0000)]
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
This reverts commit
893be9cc34c37cba64856c8034f39dfbda05a459.
Change-Id: Idefe6a1972ca1130a687632f74051e5b5a2e54e1
PauloftheWest [Fri, 15 Aug 2014 13:05:42 +0000 (06:05 -0700)]
Applied Material Spec to Bluetooth pairing dialog.
Bug:
17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
PauloftheWest [Wed, 27 Aug 2014 19:54:50 +0000 (12:54 -0700)]
Changed VPN add icon to white.
Bug:
17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
Jeff Davidson [Wed, 27 Aug 2014 19:14:15 +0000 (19:14 +0000)]
am
c77d11d1: am
d8094bf0: am
ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
* commit '
c77d11d188069848abaa960db4941f4e92f4e604':
Use NetworkScoreManager when disabling scoring.
Jeff Davidson [Wed, 27 Aug 2014 19:01:17 +0000 (19:01 +0000)]
am
d8094bf0: am
ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
* commit '
d8094bf0679bf04a478e26b8199d5a90274a6b5a':
Use NetworkScoreManager when disabling scoring.
Jeff Davidson [Wed, 27 Aug 2014 18:54:25 +0000 (18:54 +0000)]
am
ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
* commit '
ffb76318f997300d0374eea9ee9376d1818860a3':
Use NetworkScoreManager when disabling scoring.
Jeff Davidson [Wed, 27 Aug 2014 18:47:10 +0000 (18:47 +0000)]
Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
Jeff Davidson [Wed, 27 Aug 2014 18:20:09 +0000 (11:20 -0700)]
Use NetworkScoreManager when disabling scoring.
Otherwise previous scores will not be cleared and the SCORER_CHANGED
broadcast will not be sent.
Bug:
17299736
Change-Id: I57b0c44a7972d885cf084aacf74829cf7d391dae
PauloftheWest [Wed, 27 Aug 2014 17:51:39 +0000 (17:51 +0000)]
am
167363e8: am
c27b47ef: am
18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
* commit '
167363e8632f2f7b2c2f03341dfed01f8444ef66':
Entering Bluetooth in Settings will always initiate a scan.
PauloftheWest [Wed, 27 Aug 2014 17:39:00 +0000 (17:39 +0000)]
am
c27b47ef: am
18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
* commit '
c27b47ef609ec31bf44c2a8849d404d26190bb97':
Entering Bluetooth in Settings will always initiate a scan.
Maurice Lam [Wed, 27 Aug 2014 17:32:57 +0000 (17:32 +0000)]
am
ac902002: am
34d81bdb: am
cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
* commit '
ac90200235dc51f18fff55f5b8a6a59a3b1e5e3b':
[WifiSetup] Progress when wifi scanning
PauloftheWest [Wed, 27 Aug 2014 17:32:38 +0000 (17:32 +0000)]
am
18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
* commit '
18fbf724aac345418eba37c656b968f19acd15f7':
Entering Bluetooth in Settings will always initiate a scan.
Maurice Lam [Wed, 27 Aug 2014 17:25:33 +0000 (17:25 +0000)]
am
34d81bdb: am
cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
* commit '
34d81bdb06719928bf060f35ccc0447cd510ef74':
[WifiSetup] Progress when wifi scanning
PauloftheWest [Wed, 27 Aug 2014 17:24:40 +0000 (17:24 +0000)]
Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
Maurice Lam [Wed, 27 Aug 2014 17:11:35 +0000 (17:11 +0000)]
am
cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
* commit '
cf3c9ba291f21058d4c86b31d4368b29b10e1952':
[WifiSetup] Progress when wifi scanning
Baligh Uddin [Wed, 27 Aug 2014 17:07:44 +0000 (17:07 +0000)]
am
4cd344c7: (-s ours) am
1bed70f0: (-s ours) am
29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4cd344c72fcf2e97dc5e8b4598fc89f1178e4e09':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 27 Aug 2014 17:04:46 +0000 (17:04 +0000)]
Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
Baligh Uddin [Wed, 27 Aug 2014 16:43:49 +0000 (16:43 +0000)]
am
1bed70f0: (-s ours) am
29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
1bed70f0ea2ed3de38be656f5f6bcf7bf64377d9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:33:40 +0000 (16:33 +0000)]
am
29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
29b5ef288a77b70b006cd1d3e6cd5738a67d6092':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:23:19 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 27 Aug 2014 16:23:03 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 27 Aug 2014 04:00:49 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 27 Aug 2014 03:49:33 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
Sander Alewijnse [Tue, 26 Aug 2014 17:23:50 +0000 (17:23 +0000)]
am
1f7c91d6: am
fbda0b3a: am
320dc051: Merge "Add extra to home settings starting intent." into lmp-dev
* commit '
1f7c91d61fd4b1d4a9963baa305b9c4040dd7681':
Add extra to home settings starting intent.
Sander Alewijnse [Tue, 26 Aug 2014 17:14:15 +0000 (17:14 +0000)]
am
fbda0b3a: am
320dc051: Merge "Add extra to home settings starting intent." into lmp-dev
* commit '
fbda0b3a81fe35060bbcd9ec121af08d935c07e8':
Add extra to home settings starting intent.
Sander Alewijnse [Tue, 26 Aug 2014 17:07:18 +0000 (17:07 +0000)]
am
320dc051: Merge "Add extra to home settings starting intent." into lmp-dev
* commit '
320dc05125c0db44c1182c4f5568bef440f643c8':
Add extra to home settings starting intent.
Sander Alewijnse [Tue, 26 Aug 2014 16:59:23 +0000 (16:59 +0000)]
Merge "Add extra to home settings starting intent." into lmp-dev
Alan Viverette [Tue, 26 Aug 2014 10:17:17 +0000 (10:17 +0000)]
am
f6faa4d2: am
ea7c8dcb: am
c61aabfa: Merge "Update material colors" into lmp-dev
* commit '
f6faa4d292186bd5927de59f96cfe7a2cb04156c':
Update material colors
Amith Yamasani [Tue, 26 Aug 2014 10:17:16 +0000 (10:17 +0000)]
am
0f30cbed: am
19bcfd6e: am
e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit '
0f30cbed1a36c69b368869ec8178e6645973c9b3':
Fix toggle button clickability in app restrictions
Nancy Chen [Tue, 26 Aug 2014 10:17:15 +0000 (10:17 +0000)]
am
791b4ad3: am
64e68657: am
a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
* commit '
791b4ad3869a9de4350bb4f61bdc590b946da988':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
Paul Lawrence [Tue, 26 Aug 2014 10:17:15 +0000 (10:17 +0000)]
am
64988f9a: am
ef0a4938: am
ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
* commit '
64988f9a5022a3e0458416cc829fbdec267b5edd':
Honor hide pattern on crypto screen
Alan Viverette [Tue, 26 Aug 2014 04:56:08 +0000 (04:56 +0000)]
am
ea7c8dcb: am
c61aabfa: Merge "Update material colors" into lmp-dev
* commit '
ea7c8dcbdaa7f32d6741125c6701a0a1824a0567':
Update material colors
Amith Yamasani [Tue, 26 Aug 2014 04:56:07 +0000 (04:56 +0000)]
am
19bcfd6e: am
e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit '
19bcfd6e4380d63521daf74d5bf81a2f849ace40':
Fix toggle button clickability in app restrictions
Nancy Chen [Tue, 26 Aug 2014 04:55:35 +0000 (04:55 +0000)]
am
64e68657: am
a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
* commit '
64e686570c6f71bae6d2bec0c1b72f7732e48a7b':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
Paul Lawrence [Tue, 26 Aug 2014 04:54:05 +0000 (04:54 +0000)]
am
ef0a4938: am
ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
* commit '
ef0a4938a01f4d553d7513df33fa097c56543b7e':
Honor hide pattern on crypto screen
Alan Viverette [Mon, 25 Aug 2014 23:29:01 +0000 (23:29 +0000)]
am
c61aabfa: Merge "Update material colors" into lmp-dev
* commit '
c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
Update material colors
Amith Yamasani [Mon, 25 Aug 2014 23:29:00 +0000 (23:29 +0000)]
am
e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit '
e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
Fix toggle button clickability in app restrictions
Alan Viverette [Mon, 25 Aug 2014 23:18:33 +0000 (23:18 +0000)]
Merge "Update material colors" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:51:09 +0000 (22:51 +0000)]
Merge "Fix toggle button clickability in app restrictions" into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:05:50 +0000 (16:05 -0700)]
Update material colors
BUG:
17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
Nancy Chen [Mon, 25 Aug 2014 22:47:23 +0000 (22:47 +0000)]
am
a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
* commit '
a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
Nancy Chen [Mon, 25 Aug 2014 22:24:14 +0000 (22:24 +0000)]
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:20:34 +0000 (15:20 -0700)]
Fix toggle button clickability in app restrictions
Also fix side padding
Bug:
17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
Paul Lawrence [Mon, 25 Aug 2014 22:09:41 +0000 (22:09 +0000)]
am
ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
* commit '
ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
Honor hide pattern on crypto screen
Paul Lawrence [Mon, 25 Aug 2014 21:59:26 +0000 (21:59 +0000)]
Merge "Honor hide pattern on crypto screen" into lmp-dev
Maurice Lam [Mon, 25 Aug 2014 01:29:40 +0000 (18:29 -0700)]
[WifiSetup] Progress when wifi scanning
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.
Bug:
17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
PauloftheWest [Mon, 25 Aug 2014 17:18:52 +0000 (17:18 +0000)]
am
687d3a58: am
87d8074a: am
aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
* commit '
687d3a589ea6a9a259454ea7e139143d4d988f91':
Updated Tethering and portable hotspot to use switches.
PauloftheWest [Mon, 25 Aug 2014 17:04:47 +0000 (17:04 +0000)]
am
87d8074a: am
aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
* commit '
87d8074a1480d10804ada3507c5536be362b77c1':
Updated Tethering and portable hotspot to use switches.
Baligh Uddin [Mon, 25 Aug 2014 16:58:32 +0000 (16:58 +0000)]
am
0a0a0966: (-s ours) am
d9960178: (-s ours) am
cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0a0a0966de99949bbacc8064563714670369bfa2':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 25 Aug 2014 16:55:21 +0000 (16:55 +0000)]
am
aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
* commit '
aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
Updated Tethering and portable hotspot to use switches.
Baligh Uddin [Mon, 25 Aug 2014 16:51:07 +0000 (16:51 +0000)]
am
d9960178: (-s ours) am
cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
d9960178fda7184223cbc56c5dc11128ab1124b0':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 25 Aug 2014 16:44:25 +0000 (16:44 +0000)]
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
Baligh Uddin [Mon, 25 Aug 2014 16:32:55 +0000 (16:32 +0000)]
am
cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:21:03 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Mon, 25 Aug 2014 16:19:10 +0000 (16:19 +0000)]
am
79ad7235: am
1c649f7f: am
7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
* commit '
79ad7235257bf6e6f04cc4f8f594176c938dc3a0':
Tapping a connected Bluetooth device now presents its settings dialog.
PauloftheWest [Mon, 25 Aug 2014 16:12:08 +0000 (16:12 +0000)]
am
1c649f7f: am
7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
* commit '
1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
Tapping a connected Bluetooth device now presents its settings dialog.
PauloftheWest [Mon, 25 Aug 2014 15:58:29 +0000 (15:58 +0000)]
am
7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
* commit '
7560e22d7602250172f6e6ca16fdea0063348d15':
Tapping a connected Bluetooth device now presents its settings dialog.
PauloftheWest [Mon, 25 Aug 2014 15:48:15 +0000 (15:48 +0000)]
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
PauloftheWest [Sun, 24 Aug 2014 18:59:35 +0000 (11:59 -0700)]
Updated Tethering and portable hotspot to use switches.
Bug:
17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
PauloftheWest [Sun, 24 Aug 2014 21:04:18 +0000 (14:04 -0700)]
Tapping a connected Bluetooth device now presents its settings dialog.
Bug:
14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
Dianne Hackborn [Mon, 25 Aug 2014 08:25:08 +0000 (08:25 +0000)]
am
6d98f8e1: am
b1391d84: am
c436b159: Merge "Tweak voice settings strings." into lmp-dev
* commit '
6d98f8e1cbe23348c43a981d37d6b75fcfe99867':
Tweak voice settings strings.
Amith Yamasani [Mon, 25 Aug 2014 08:24:10 +0000 (08:24 +0000)]
am
cb7b83de: am
77287101: am
8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
* commit '
cb7b83de42b13b55030f5d0207f42fcc9e346968':
Don't index the ChooseLockGeneric screen
Jeff Davidson [Mon, 25 Aug 2014 08:23:15 +0000 (08:23 +0000)]
am
76747ff8: am
fc24d0a7: am
8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
* commit '
76747ff8f5bb7981cc3a542095142e59fd72fd00':
Restore legacy VPN stats dialog.
Baligh Uddin [Sun, 24 Aug 2014 20:07:11 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 24 Aug 2014 19:09:24 +0000 (19:09 +0000)]
am
b1391d84: am
c436b159: Merge "Tweak voice settings strings." into lmp-dev
* commit '
b1391d84fe181e64f486cd176d58d835b0fe6a5e':
Tweak voice settings strings.
Dianne Hackborn [Sun, 24 Aug 2014 18:59:46 +0000 (18:59 +0000)]
am
c436b159: Merge "Tweak voice settings strings." into lmp-dev
* commit '
c436b159534240c64281447860a81e519bf7c07d':
Tweak voice settings strings.
Dianne Hackborn [Sun, 24 Aug 2014 18:53:16 +0000 (18:53 +0000)]
Merge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sat, 23 Aug 2014 21:11:12 +0000 (14:11 -0700)]
Tweak voice settings strings.
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
Amith Yamasani [Sat, 23 Aug 2014 06:19:09 +0000 (06:19 +0000)]
am
77287101: am
8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
* commit '
7728710183de887be3bb68c4f95509659a950428':
Don't index the ChooseLockGeneric screen
Jeff Davidson [Sat, 23 Aug 2014 02:49:04 +0000 (02:49 +0000)]
am
fc24d0a7: am
8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
* commit '
fc24d0a78071f6e441f236ab69be6642f650f253':
Restore legacy VPN stats dialog.
Amith Yamasani [Sat, 23 Aug 2014 01:21:51 +0000 (01:21 +0000)]
am
8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
* commit '
8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
Don't index the ChooseLockGeneric screen
Jeff Davidson [Sat, 23 Aug 2014 01:12:46 +0000 (01:12 +0000)]
am
8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
* commit '
8e6edba5606fd717a631aabcc4c5702bdd509033':
Restore legacy VPN stats dialog.
Amith Yamasani [Sat, 23 Aug 2014 01:07:02 +0000 (01:07 +0000)]
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Restore legacy VPN stats dialog." into lmp-dev
Jim Miller [Fri, 22 Aug 2014 22:54:40 +0000 (22:54 +0000)]
am
0c5fdd10: am
86e9f7cd: am
1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
* commit '
0c5fdd10dedf7c3671d19addcea270ed945b92d1':
Show trust agent entries as disabled rather than removing them.
Jim Miller [Fri, 22 Aug 2014 22:44:56 +0000 (22:44 +0000)]
am
86e9f7cd: am
1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
* commit '
86e9f7cd668441dff2a35b046a99ebe8fd0548d9':
Show trust agent entries as disabled rather than removing them.
Amith Yamasani [Fri, 22 Aug 2014 22:38:16 +0000 (15:38 -0700)]
Don't index the ChooseLockGeneric screen
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug:
17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
Jim Miller [Fri, 22 Aug 2014 22:34:45 +0000 (22:34 +0000)]
am
1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
* commit '
1351b0fbcddea9cc66941e8af1de148142b92201':
Show trust agent entries as disabled rather than removing them.
Jim Miller [Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)]
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Nancy Chen [Fri, 22 Aug 2014 05:53:05 +0000 (22:53 -0700)]
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug:
16960458
Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
Elliott Hughes [Fri, 22 Aug 2014 21:04:59 +0000 (21:04 +0000)]
am
76211390: am
21fc35c1: am
d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
* commit '
76211390f23e8478327e41591df7b33c03eebe9f':
Settings psuedolocalization fixes.
Elliott Hughes [Fri, 22 Aug 2014 20:57:16 +0000 (20:57 +0000)]
am
21fc35c1: am
d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
* commit '
21fc35c128b126a9052c6dca3fbd61d121d646dc':
Settings psuedolocalization fixes.
Elliott Hughes [Fri, 22 Aug 2014 20:51:00 +0000 (20:51 +0000)]
am
d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
* commit '
d5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
Settings psuedolocalization fixes.
Elliott Hughes [Fri, 22 Aug 2014 20:42:37 +0000 (20:42 +0000)]
Merge "Settings psuedolocalization fixes." into lmp-dev
Jeff Davidson [Fri, 22 Aug 2014 20:12:01 +0000 (13:12 -0700)]
Restore legacy VPN stats dialog.
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.
Bug:
17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
Amith Yamasani [Fri, 22 Aug 2014 19:52:52 +0000 (19:52 +0000)]
am
2cbd9206: am
cf4e004e: am
8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
* commit '
2cbd9206cffcfb3d9deb0aeabdd61e5e0b1b4427':
Switch user on clicking on a user in User Settings
Amith Yamasani [Fri, 22 Aug 2014 19:46:53 +0000 (19:46 +0000)]
am
cf4e004e: am
8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
* commit '
cf4e004e7dda4bace3ffba1ed6fb53f49c23df06':
Switch user on clicking on a user in User Settings
Amith Yamasani [Fri, 22 Aug 2014 19:41:59 +0000 (19:41 +0000)]
am
8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
* commit '
8802ccf853b86ba56816ddd06346812b61e58220':
Switch user on clicking on a user in User Settings
OSDN Git Service
